Skip to content

Commit 36fe52a

Browse files
committed
Merge branch 'master' into rails-6.1
2 parents f874ad0 + 89cf300 commit 36fe52a

File tree

81 files changed

+2309
-1120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+2309
-1120
lines changed

Gemfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ ruby "~> 2.7"
33

44
# Server
55
gem 'rails'
6-
gem 'puma', '~> 5.3'
6+
gem 'puma', '~> 5.5'
77
gem 'puma-heroku'
88
# gem 'bootsnap', require: false
99
gem 'sprockets', '~> 3.7.2'
1010

1111
# Storage
12-
gem 'aws-sdk', '~> 3.0'
12+
gem 'aws-sdk', '~> 3.1'
1313
gem 'aws-sdk-s3'
1414
gem 'filesize'
1515

@@ -42,7 +42,6 @@ gem 'paranoia'
4242
# Javascript
4343
gem 'coffee-rails'
4444
gem 'rails-jquery-autocomplete'
45-
gem 'animate-rails'
4645
gem 'webpacker'
4746
gem 'react-rails'
4847

@@ -91,7 +90,7 @@ gem 'redis'
9190
gem 'csv'
9291

9392
# Admin
94-
gem 'rails_admin', '~> 2.1'
93+
gem 'rails_admin', '~> 2.2'
9594

9695
# Tech debt & hacks
9796
gem 'binding_of_caller' # see has_changelog.rb

0 commit comments

Comments
 (0)