Merge pull request #5086 from plataformatec/rm-officially-support-6.0

Officially support Rails 6.0
heartcombo · Jun 18, 2019 · 81cb5b0 · 81cb5b0
2 parents 44f7325 + 54fb582
commit 81cb5b0
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ rvm:
 
 gemfile:
   - Gemfile
-  - gemfiles/Gemfile.rails-6.0-rc1
+  - gemfiles/Gemfile.rails-6.0-stable
   - gemfiles/Gemfile.rails-5.2-stable
   - gemfiles/Gemfile.rails-5.0-stable
   - gemfiles/Gemfile.rails-4.2-stable
@@ -22,23 +22,23 @@ matrix:
     - rvm: 2.1.10
       gemfile: Gemfile
     - rvm: 2.1.10
-      gemfile: gemfiles/Gemfile.rails-6.0-rc1
+      gemfile: gemfiles/Gemfile.rails-6.0-stable
     - rvm: 2.1.10
       gemfile: gemfiles/Gemfile.rails-5.2-stable
     - rvm: 2.1.10
       gemfile: gemfiles/Gemfile.rails-5.0-stable
     - rvm: 2.2.10
       gemfile: Gemfile
     - rvm: 2.2.10
-      gemfile: gemfiles/Gemfile.rails-6.0-rc1
+      gemfile: gemfiles/Gemfile.rails-6.0-stable
     - rvm: 2.2.10
       gemfile: gemfiles/Gemfile.rails-5.2-stable
     - rvm: 2.3.8
-      gemfile: gemfiles/Gemfile.rails-6.0-rc1
+      gemfile: gemfiles/Gemfile.rails-6.0-stable
     - rvm: 2.4.5
       gemfile: gemfiles/Gemfile.rails-4.1-stable
     - rvm: 2.4.5
-      gemfile: gemfiles/Gemfile.rails-6.0-rc1
+      gemfile: gemfiles/Gemfile.rails-6.0-stable
     - rvm: 2.5.3
       gemfile: gemfiles/Gemfile.rails-4.1-stable
     - rvm: 2.6.0
@@ -56,10 +56,10 @@ matrix:
     - env: DEVISE_ORM=mongoid
       gemfile: gemfiles/Gemfile.rails-5.2-stable
     - env: DEVISE_ORM=mongoid
-      gemfile: gemfiles/Gemfile.rails-6.0-rc1
+      gemfile: gemfiles/Gemfile.rails-6.0-stable
   allow_failures:
     - rvm: ruby-head
-    - gemfile: gemfiles/Gemfile.rails-6.0-rc1
+    - gemfile: gemfiles/Gemfile.rails-6.0-stable
 
 services:
   - mongodb

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ### Unreleased
 
 * enhancements
+  * Support Rails 6.0
   * Add `autocomplete="new-password"` to `password_confirmation` fields (by @ferrl)
   * Update CI to rails 6.0.0.beta3 (by @tunnes)
   * refactor method name to be more consistent (by @saiqulhaq)

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -13,7 +13,7 @@ PATH
     devise (4.6.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 6.0)
+      railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
 
@@ -62,7 +62,7 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
-    bcrypt (3.1.12)
+    bcrypt (3.1.13)
     builder (3.2.3)
     concurrent-ruby (1.0.5)
     crass (1.0.4)
@@ -201,4 +201,4 @@ DEPENDENCIES
   webrat (= 0.7.3)
 
 BUNDLED WITH
-   1.17.1
+   1.17.3
diff --git a/devise.gemspec b/devise.gemspec
@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
   s.add_dependency("warden", "~> 1.2.3")
   s.add_dependency("orm_adapter", "~> 0.1")
   s.add_dependency("bcrypt", "~> 3.0")
-  s.add_dependency("railties", ">= 4.1.0", "< 6.0")
+  s.add_dependency("railties", ">= 4.1.0")
   s.add_dependency("responders")
 end
diff --git a/gemfiles/Gemfile.rails-6.0-rc1 → gemfiles/Gemfile.rails-6.0-stable b/gemfiles/Gemfile.rails-6.0-rc1 → gemfiles/Gemfile.rails-6.0-stable
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec path: ".."
 
-gem 'rails', '~> 6.0.0.rc1'
+gem 'rails', '>= 6.0.0.rc1', '< 6.1'
 gem "omniauth"
 gem "omniauth-oauth2"
 gem "rdoc"

diff --git a/gemfiles/Gemfile.rails-6.0-rc1.lock → gemfiles/Gemfile.rails-6.0-stable.lock b/gemfiles/Gemfile.rails-6.0-rc1.lock → gemfiles/Gemfile.rails-6.0-stable.lock
diff --git a/lib/devise.rb b/lib/devise.rb
diff --git a/lib/generators/templates/devise.rb b/lib/generators/templates/devise.rb
diff --git a/test/devise_test.rb b/test/devise_test.rb