Skip to content

Bump rails from 5.1.7 to 6.0.4 #331

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Bump rails from 5.1.7 to 6.0.4 #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ git_source(:github) do |repo_name|
end

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.6'
gem 'rails', '~> 6.0.4'

gem 'browser'
gem 'devise'
Expand Down
134 changes: 78 additions & 56 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,63 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.7)
actionpack (= 5.1.7)
actioncable (6.0.4)
actionpack (= 6.0.4)
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)
actionmailbox (6.0.4)
actionpack (= 6.0.4)
activejob (= 6.0.4)
activerecord (= 6.0.4)
activestorage (= 6.0.4)
activesupport (= 6.0.4)
mail (>= 2.7.1)
actionmailer (6.0.4)
actionpack (= 6.0.4)
actionview (= 6.0.4)
activejob (= 6.0.4)
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 (6.0.4)
actionview (= 6.0.4)
activesupport (= 6.0.4)
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)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.4)
actionpack (= 6.0.4)
activerecord (= 6.0.4)
activestorage (= 6.0.4)
activesupport (= 6.0.4)
nokogiri (>= 1.8.5)
actionview (6.0.4)
activesupport (= 6.0.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.7)
activesupport (= 5.1.7)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.4)
activesupport (= 6.0.4)
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 (6.0.4)
activesupport (= 6.0.4)
activerecord (6.0.4)
activemodel (= 6.0.4)
activesupport (= 6.0.4)
activestorage (6.0.4)
actionpack (= 6.0.4)
activejob (= 6.0.4)
activerecord (= 6.0.4)
marcel (~> 1.0.0)
activesupport (6.0.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
arel (8.0.0)
ast (2.4.0)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
Expand All @@ -55,7 +72,7 @@ GEM
debug_inspector (>= 0.0.1)
brakeman (4.7.1)
browser (2.6.1)
builder (3.2.3)
builder (3.2.4)
bullet (6.0.2)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
Expand All @@ -67,7 +84,7 @@ GEM
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
colorize (0.8.1)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.9)
connection_pool (2.2.2)
coveralls (0.8.23)
json (>= 1.8, < 3)
Expand All @@ -77,7 +94,7 @@ GEM
tins (~> 1.6)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.5)
crass (1.0.6)
debug_inspector (0.0.3)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
Expand All @@ -90,7 +107,7 @@ GEM
diff-lcs (1.3)
docile (1.3.2)
equalizer (0.0.11)
erubi (1.9.0)
erubi (1.10.0)
erubis (2.7.0)
faker (2.10.0)
i18n (>= 1.6, < 1.8)
Expand Down Expand Up @@ -138,7 +155,7 @@ GEM
httparty (0.17.1)
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
i18n (1.7.0)
i18n (1.7.1)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
interception (0.5)
Expand All @@ -148,24 +165,25 @@ GEM
listen (3.2.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.3.1)
loofah (2.10.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (1.0.1)
memory_profiler (0.9.14)
method_source (0.9.2)
mime-types (3.3)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0904)
mini_mime (1.0.2)
mini_mime (1.1.0)
mini_portile2 (2.4.0)
minitest (5.13.0)
minitest (5.14.4)
multi_xml (0.6.0)
multipart-post (2.1.1)
nenv (0.3.0)
nio4r (2.5.2)
nio4r (2.5.7)
nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
notiffany (0.1.3)
Expand Down Expand Up @@ -225,7 +243,7 @@ GEM
public_suffix (4.0.1)
puma (4.3.1)
nio4r (~> 2.0)
rack (2.0.8)
rack (2.2.3)
rack-cors (1.0.3)
rack-mini-profiler (1.1.3)
rack (>= 1.2.0)
Expand All @@ -235,31 +253,34 @@ GEM
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
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 (6.0.4)
actioncable (= 6.0.4)
actionmailbox (= 6.0.4)
actionmailer (= 6.0.4)
actionpack (= 6.0.4)
actiontext (= 6.0.4)
actionview (= 6.0.4)
activejob (= 6.0.4)
activemodel (= 6.0.4)
activerecord (= 6.0.4)
activestorage (= 6.0.4)
activesupport (= 6.0.4)
bundler (>= 1.3.0)
railties (= 5.1.7)
railties (= 6.0.4)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.1.7)
actionpack (= 5.1.7)
activesupport (= 5.1.7)
railties (6.0.4)
actionpack (= 6.0.4)
activesupport (= 6.0.4)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
thor (>= 0.20.3, < 2.0)
rainbow (3.0.0)
rake (13.0.0)
rake (13.0.3)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
Expand Down Expand Up @@ -349,10 +370,10 @@ GEM
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (4.0.0)
sprockets (4.0.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
Expand All @@ -368,7 +389,7 @@ GEM
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.5)
tzinfo (1.2.9)
thread_safe (~> 0.1)
tzinfo-data (1.2019.3)
tzinfo (>= 1.0.0)
Expand All @@ -394,10 +415,11 @@ GEM
activesupport (>= 4.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)
websocket-driver (0.6.5)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
websocket-extensions (0.1.5)
yard (0.9.20)
zeitwerk (2.4.2)

PLATFORMS
ruby
Expand Down Expand Up @@ -439,7 +461,7 @@ DEPENDENCIES
puma (~> 4.3)
rack-cors
rack-mini-profiler
rails (~> 5.1.6)
rails (~> 6.0.4)
rspec-benchmark
rspec-rails (~> 3.9)
rspec-sidekiq
Expand Down