diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e89a2bb54..335aa356f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ### unreleased * enhancements - * Add support for Rails 7.0 rc. + * Add support for Rails 7.0 ### 4.8.0 - 2021-04-29 diff --git a/Gemfile b/Gemfile index 3188bc667d..985e37f974 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" gemspec -gem "rails", "~> 7.0.0.rc1" +gem "rails", "~> 7.0.0" gem "omniauth" gem "omniauth-oauth2" gem "rdoc" diff --git a/Gemfile.lock b/Gemfile.lock index 47fbcbc72e..9270ac6d7b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,61 +20,61 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (7.0.0.rc1) - actionpack (= 7.0.0.rc1) - activesupport (= 7.0.0.rc1) + actioncable (7.0.0) + actionpack (= 7.0.0) + activesupport (= 7.0.0) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.0.rc1) - actionpack (= 7.0.0.rc1) - activejob (= 7.0.0.rc1) - activerecord (= 7.0.0.rc1) - activestorage (= 7.0.0.rc1) - activesupport (= 7.0.0.rc1) + actionmailbox (7.0.0) + actionpack (= 7.0.0) + activejob (= 7.0.0) + activerecord (= 7.0.0) + activestorage (= 7.0.0) + activesupport (= 7.0.0) mail (>= 2.7.1) - actionmailer (7.0.0.rc1) - actionpack (= 7.0.0.rc1) - actionview (= 7.0.0.rc1) - activejob (= 7.0.0.rc1) - activesupport (= 7.0.0.rc1) + actionmailer (7.0.0) + actionpack (= 7.0.0) + actionview (= 7.0.0) + activejob (= 7.0.0) + activesupport (= 7.0.0) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (7.0.0.rc1) - actionview (= 7.0.0.rc1) - activesupport (= 7.0.0.rc1) + actionpack (7.0.0) + actionview (= 7.0.0) + activesupport (= 7.0.0) rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.0.rc1) - actionpack (= 7.0.0.rc1) - activerecord (= 7.0.0.rc1) - activestorage (= 7.0.0.rc1) - activesupport (= 7.0.0.rc1) + actiontext (7.0.0) + actionpack (= 7.0.0) + activerecord (= 7.0.0) + activestorage (= 7.0.0) + activesupport (= 7.0.0) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.0.rc1) - activesupport (= 7.0.0.rc1) + actionview (7.0.0) + activesupport (= 7.0.0) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.0.rc1) - activesupport (= 7.0.0.rc1) + activejob (7.0.0) + activesupport (= 7.0.0) globalid (>= 0.3.6) - activemodel (7.0.0.rc1) - activesupport (= 7.0.0.rc1) - activerecord (7.0.0.rc1) - activemodel (= 7.0.0.rc1) - activesupport (= 7.0.0.rc1) - activestorage (7.0.0.rc1) - actionpack (= 7.0.0.rc1) - activejob (= 7.0.0.rc1) - activerecord (= 7.0.0.rc1) - activesupport (= 7.0.0.rc1) + activemodel (7.0.0) + activesupport (= 7.0.0) + activerecord (7.0.0) + activemodel (= 7.0.0) + activesupport (= 7.0.0) + activestorage (7.0.0) + actionpack (= 7.0.0) + activejob (= 7.0.0) + activerecord (= 7.0.0) + activesupport (= 7.0.0) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.0.rc1) + activesupport (7.0.0) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -109,7 +109,7 @@ GEM i18n (1.8.11) concurrent-ruby (~> 1.0) jwt (2.3.0) - loofah (2.12.0) + loofah (2.13.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -118,7 +118,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) mini_portile2 (2.6.1) - minitest (5.14.4) + minitest (5.15.0) mocha (1.13.0) multi_json (1.15.0) multi_xml (0.6.0) @@ -155,28 +155,28 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (7.0.0.rc1) - actioncable (= 7.0.0.rc1) - actionmailbox (= 7.0.0.rc1) - actionmailer (= 7.0.0.rc1) - actionpack (= 7.0.0.rc1) - actiontext (= 7.0.0.rc1) - actionview (= 7.0.0.rc1) - activejob (= 7.0.0.rc1) - activemodel (= 7.0.0.rc1) - activerecord (= 7.0.0.rc1) - activestorage (= 7.0.0.rc1) - activesupport (= 7.0.0.rc1) + rails (7.0.0) + actioncable (= 7.0.0) + actionmailbox (= 7.0.0) + actionmailer (= 7.0.0) + actionpack (= 7.0.0) + actiontext (= 7.0.0) + actionview (= 7.0.0) + activejob (= 7.0.0) + activemodel (= 7.0.0) + activerecord (= 7.0.0) + activestorage (= 7.0.0) + activesupport (= 7.0.0) bundler (>= 1.15.0) - railties (= 7.0.0.rc1) + railties (= 7.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - railties (7.0.0.rc1) - actionpack (= 7.0.0.rc1) - activesupport (= 7.0.0.rc1) + railties (7.0.0) + actionpack (= 7.0.0) + activesupport (= 7.0.0) method_source rake (>= 12.2) thor (~> 1.0) @@ -215,7 +215,7 @@ DEPENDENCIES omniauth-facebook omniauth-oauth2 omniauth-openid - rails (~> 7.0.0.rc1) + rails (~> 7.0.0) rails-controller-testing! rdoc responders (~> 3.0)