Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Rails to 5.2.6 #484

Merged
merged 4 commits into from
Oct 12, 2021
Merged

Upgrade Rails to 5.2.6 #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7459cc8
Upgrade Rails to 5.1.7
codemonium Oct 12, 2021
371a7a8
Fix styling
codemonium Oct 12, 2021
96e0cea
Upgrade Rails to 5.2.6
codemonium Oct 12, 2021
74b3276
Merge branch 'master' into upgrade-rails-to-5.2.6
codemonium Oct 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backend/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ruby "2.6.5"
gem "dotenv-rails", groups: [:development, :test]

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem "rails", "~> 5.1.7"
gem "rails", "~> 5.2.6"
gem "rake"

# JSON serializer
Expand All @@ -21,7 +21,7 @@ gem "puma"

# Authentication libraries
gem "devise"
gem "cancancan", "~> 1.10"
gem "cancancan", "~> 2.2.0"
gem "devise_invitable"
gem "omniauth", "~> 1.8.1"
gem "omniauth-facebook", "~> 3.0.0"
Expand Down
98 changes: 52 additions & 46 deletions backend/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,45 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.7)
actionpack (= 5.1.7)
actioncable (5.2.6)
actionpack (= 5.2.6)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.7)
actionpack (= 5.1.7)
actionview (= 5.1.7)
activejob (= 5.1.7)
websocket-driver (>= 0.6.1)
actionmailer (5.2.6)
actionpack (= 5.2.6)
actionview (= 5.2.6)
activejob (= 5.2.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.7)
actionview (= 5.1.7)
activesupport (= 5.1.7)
rack (~> 2.0)
actionpack (5.2.6)
actionview (= 5.2.6)
activesupport (= 5.2.6)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.7)
activesupport (= 5.1.7)
actionview (5.2.6)
activesupport (= 5.2.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
active_model_serializers (0.9.3)
activemodel (>= 3.2)
activejob (5.1.7)
activesupport (= 5.1.7)
activejob (5.2.6)
activesupport (= 5.2.6)
globalid (>= 0.3.6)
activemodel (5.1.7)
activesupport (= 5.1.7)
activerecord (5.1.7)
activemodel (= 5.1.7)
activesupport (= 5.1.7)
arel (~> 8.0)
activesupport (5.1.7)
activemodel (5.2.6)
activesupport (= 5.2.6)
activerecord (5.2.6)
activemodel (= 5.2.6)
activesupport (= 5.2.6)
arel (>= 9.0)
activestorage (5.2.6)
actionpack (= 5.2.6)
activerecord (= 5.2.6)
marcel (~> 1.0.0)
activesupport (5.2.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand All @@ -46,7 +50,7 @@ GEM
annotate (3.1.1)
activerecord (>= 3.2, < 7.0)
rake (>= 10.4, < 14.0)
arel (8.0.0)
arel (9.0.0)
ast (2.4.2)
awesome_print (1.9.2)
bcrypt (3.1.16)
Expand Down Expand Up @@ -74,7 +78,7 @@ GEM
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
byebug (11.1.3)
cancancan (1.17.0)
cancancan (2.2.0)
coderay (1.1.3)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
Expand Down Expand Up @@ -186,6 +190,7 @@ GEM
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (1.0.2)
method_source (1.0.0)
mini_mime (1.1.2)
mini_portile2 (2.6.1)
Expand Down Expand Up @@ -261,9 +266,9 @@ GEM
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (4.0.6)
puma (5.5.0)
puma (5.5.1)
nio4r (~> 2.0)
puma (5.5.0-java)
puma (5.5.1-java)
nio4r (~> 2.0)
pusher (2.0.2)
httpclient (~> 2.8)
Expand All @@ -278,17 +283,18 @@ GEM
rack-test (1.1.0)
rack (>= 1.0, < 3)
rack-timeout (0.6.0)
rails (5.1.7)
actioncable (= 5.1.7)
actionmailer (= 5.1.7)
actionpack (= 5.1.7)
actionview (= 5.1.7)
activejob (= 5.1.7)
activemodel (= 5.1.7)
activerecord (= 5.1.7)
activesupport (= 5.1.7)
rails (5.2.6)
actioncable (= 5.2.6)
actionmailer (= 5.2.6)
actionpack (= 5.2.6)
actionview (= 5.2.6)
activejob (= 5.2.6)
activemodel (= 5.2.6)
activerecord (= 5.2.6)
activestorage (= 5.2.6)
activesupport (= 5.2.6)
bundler (>= 1.3.0)
railties (= 5.1.7)
railties (= 5.2.6)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
Expand All @@ -300,12 +306,12 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (5.1.7)
actionpack (= 5.1.7)
activesupport (= 5.1.7)
railties (5.2.6)
actionpack (= 5.2.6)
activesupport (= 5.2.6)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rake (13.0.6)
redis (3.3.5)
Expand Down Expand Up @@ -356,8 +362,8 @@ GEM
ruby2_keywords (0.0.5)
seedbank (0.5.0)
rake (>= 10.0)
shoulda-matchers (4.5.1)
activesupport (>= 4.2.0)
shoulda-matchers (5.0.0)
activesupport (>= 5.2.0)
sidekiq (4.1.1)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
Expand Down Expand Up @@ -402,9 +408,9 @@ GEM
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
websocket-driver (0.6.5)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-driver (0.6.5-java)
websocket-driver (0.7.5-java)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
yard (0.9.26)
Expand All @@ -425,7 +431,7 @@ DEPENDENCIES
bugsnag (~> 6.22)
bullet
byebug
cancancan (~> 1.10)
cancancan (~> 2.2.0)
colored (~> 1.2)
countries
database_cleaner
Expand Down Expand Up @@ -456,7 +462,7 @@ DEPENDENCIES
pusher
rack-cors
rack-timeout
rails (~> 5.1.7)
rails (~> 5.2.6)
rails_12factor
rake
rspec-rails (~> 4.1.0)
Expand Down