Skip to content
This repository has been archived by the owner on May 10, 2021. It is now read-only.

Commit

Permalink
Merge pull request #709 from y-yagi/rails_600rc2
Browse files Browse the repository at this point in the history 
Bump to Rails 6.0.0.rc2
  • Loading branch information
@y-yagi
y-yagi committed Jul 22, 2019
2 parents 45482eb + d6fa4a5 commit bfc33ae
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 56 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ruby '2.6.2'
source 'https://rubygems.org'
gem 'rails', '>= 6.0.0.rc1'
gem 'rails', '>= 6.0.0.rc2'

gem 'active_decorator'
gem 'array_form_helper'
Expand Down
110 changes: 55 additions & 55 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,62 +1,62 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (6.0.0.rc1)
actionpack (= 6.0.0.rc1)
actioncable (6.0.0.rc2)
actionpack (= 6.0.0.rc2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.0.rc1)
actionpack (= 6.0.0.rc1)
activejob (= 6.0.0.rc1)
activerecord (= 6.0.0.rc1)
activestorage (= 6.0.0.rc1)
activesupport (= 6.0.0.rc1)
actionmailbox (6.0.0.rc2)
actionpack (= 6.0.0.rc2)
activejob (= 6.0.0.rc2)
activerecord (= 6.0.0.rc2)
activestorage (= 6.0.0.rc2)
activesupport (= 6.0.0.rc2)
mail (>= 2.7.1)
actionmailer (6.0.0.rc1)
actionpack (= 6.0.0.rc1)
actionview (= 6.0.0.rc1)
activejob (= 6.0.0.rc1)
actionmailer (6.0.0.rc2)
actionpack (= 6.0.0.rc2)
actionview (= 6.0.0.rc2)
activejob (= 6.0.0.rc2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.0.rc1)
actionview (= 6.0.0.rc1)
activesupport (= 6.0.0.rc1)
actionpack (6.0.0.rc2)
actionview (= 6.0.0.rc2)
activesupport (= 6.0.0.rc2)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actiontext (6.0.0.rc1)
actionpack (= 6.0.0.rc1)
activerecord (= 6.0.0.rc1)
activestorage (= 6.0.0.rc1)
activesupport (= 6.0.0.rc1)
actiontext (6.0.0.rc2)
actionpack (= 6.0.0.rc2)
activerecord (= 6.0.0.rc2)
activestorage (= 6.0.0.rc2)
activesupport (= 6.0.0.rc2)
nokogiri (>= 1.8.5)
actionview (6.0.0.rc1)
activesupport (= 6.0.0.rc1)
actionview (6.0.0.rc2)
activesupport (= 6.0.0.rc2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
active_decorator (1.3.0)
activejob (6.0.0.rc1)
activesupport (= 6.0.0.rc1)
activejob (6.0.0.rc2)
activesupport (= 6.0.0.rc2)
globalid (>= 0.3.6)
activemodel (6.0.0.rc1)
activesupport (= 6.0.0.rc1)
activerecord (6.0.0.rc1)
activemodel (= 6.0.0.rc1)
activesupport (= 6.0.0.rc1)
activestorage (6.0.0.rc1)
actionpack (= 6.0.0.rc1)
activejob (= 6.0.0.rc1)
activerecord (= 6.0.0.rc1)
activemodel (6.0.0.rc2)
activesupport (= 6.0.0.rc2)
activerecord (6.0.0.rc2)
activemodel (= 6.0.0.rc2)
activesupport (= 6.0.0.rc2)
activestorage (6.0.0.rc2)
actionpack (= 6.0.0.rc2)
activejob (= 6.0.0.rc2)
activerecord (= 6.0.0.rc2)
marcel (~> 0.3.1)
activesupport (6.0.0.rc1)
activesupport (6.0.0.rc2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.1, >= 2.1.4)
zeitwerk (~> 2.1, >= 2.1.8)
activesupport-testing-metadata (0.1.0)
activesupport (>= 4.0)
addressable (2.6.0)
Expand Down Expand Up @@ -206,7 +206,7 @@ GEM
multi_xml (0.6.0)
multipart-post (2.1.1)
netrc (0.11.0)
nio4r (2.3.1)
nio4r (2.4.0)
nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
oauth (0.5.4)
Expand Down Expand Up @@ -249,33 +249,33 @@ GEM
rack (>= 1.2.0)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.0.0.rc1)
actioncable (= 6.0.0.rc1)
actionmailbox (= 6.0.0.rc1)
actionmailer (= 6.0.0.rc1)
actionpack (= 6.0.0.rc1)
actiontext (= 6.0.0.rc1)
actionview (= 6.0.0.rc1)
activejob (= 6.0.0.rc1)
activemodel (= 6.0.0.rc1)
activerecord (= 6.0.0.rc1)
activestorage (= 6.0.0.rc1)
activesupport (= 6.0.0.rc1)
rails (6.0.0.rc2)
actioncable (= 6.0.0.rc2)
actionmailbox (= 6.0.0.rc2)
actionmailer (= 6.0.0.rc2)
actionpack (= 6.0.0.rc2)
actiontext (= 6.0.0.rc2)
actionview (= 6.0.0.rc2)
activejob (= 6.0.0.rc2)
activemodel (= 6.0.0.rc2)
activerecord (= 6.0.0.rc2)
activestorage (= 6.0.0.rc2)
activesupport (= 6.0.0.rc2)
bundler (>= 1.3.0)
railties (= 6.0.0.rc1)
railties (= 6.0.0.rc2)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (6.0.0.rc1)
actionpack (= 6.0.0.rc1)
activesupport (= 6.0.0.rc1)
railties (6.0.0.rc2)
actionpack (= 6.0.0.rc2)
activesupport (= 6.0.0.rc2)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
rake (12.3.2)
rake (12.3.3)
rambulance (1.0.2)
actionpack
activesupport
Expand Down Expand Up @@ -389,7 +389,7 @@ GEM
websocket-extensions (0.1.4)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.1.8)
zeitwerk (2.1.9)

PLATFORMS
ruby
Expand Down Expand Up @@ -434,7 +434,7 @@ DEPENDENCIES
pghero
puma
rack-mini-profiler
rails (>= 6.0.0.rc1)
rails (>= 6.0.0.rc2)
rambulance
rinku
rollbar
Expand Down

0 comments on commit bfc33ae

Please sign in to comment.