Officially support Rails 6.0
Also remove upper bound on railties so people can try devise with new versions without having to wait us to change the gem and report bugs.
This commit is contained in:
parent
44f7325a91
commit
54fb582269
14
.travis.yml
14
.travis.yml
|
@ -11,7 +11,7 @@ rvm:
|
||||||
|
|
||||||
gemfile:
|
gemfile:
|
||||||
- Gemfile
|
- Gemfile
|
||||||
- gemfiles/Gemfile.rails-6.0-rc1
|
- gemfiles/Gemfile.rails-6.0-stable
|
||||||
- gemfiles/Gemfile.rails-5.2-stable
|
- gemfiles/Gemfile.rails-5.2-stable
|
||||||
- gemfiles/Gemfile.rails-5.0-stable
|
- gemfiles/Gemfile.rails-5.0-stable
|
||||||
- gemfiles/Gemfile.rails-4.2-stable
|
- gemfiles/Gemfile.rails-4.2-stable
|
||||||
|
@ -22,7 +22,7 @@ matrix:
|
||||||
- rvm: 2.1.10
|
- rvm: 2.1.10
|
||||||
gemfile: Gemfile
|
gemfile: Gemfile
|
||||||
- rvm: 2.1.10
|
- rvm: 2.1.10
|
||||||
gemfile: gemfiles/Gemfile.rails-6.0-rc1
|
gemfile: gemfiles/Gemfile.rails-6.0-stable
|
||||||
- rvm: 2.1.10
|
- rvm: 2.1.10
|
||||||
gemfile: gemfiles/Gemfile.rails-5.2-stable
|
gemfile: gemfiles/Gemfile.rails-5.2-stable
|
||||||
- rvm: 2.1.10
|
- rvm: 2.1.10
|
||||||
|
@ -30,15 +30,15 @@ matrix:
|
||||||
- rvm: 2.2.10
|
- rvm: 2.2.10
|
||||||
gemfile: Gemfile
|
gemfile: Gemfile
|
||||||
- rvm: 2.2.10
|
- rvm: 2.2.10
|
||||||
gemfile: gemfiles/Gemfile.rails-6.0-rc1
|
gemfile: gemfiles/Gemfile.rails-6.0-stable
|
||||||
- rvm: 2.2.10
|
- rvm: 2.2.10
|
||||||
gemfile: gemfiles/Gemfile.rails-5.2-stable
|
gemfile: gemfiles/Gemfile.rails-5.2-stable
|
||||||
- rvm: 2.3.8
|
- rvm: 2.3.8
|
||||||
gemfile: gemfiles/Gemfile.rails-6.0-rc1
|
gemfile: gemfiles/Gemfile.rails-6.0-stable
|
||||||
- rvm: 2.4.5
|
- rvm: 2.4.5
|
||||||
gemfile: gemfiles/Gemfile.rails-4.1-stable
|
gemfile: gemfiles/Gemfile.rails-4.1-stable
|
||||||
- rvm: 2.4.5
|
- rvm: 2.4.5
|
||||||
gemfile: gemfiles/Gemfile.rails-6.0-rc1
|
gemfile: gemfiles/Gemfile.rails-6.0-stable
|
||||||
- rvm: 2.5.3
|
- rvm: 2.5.3
|
||||||
gemfile: gemfiles/Gemfile.rails-4.1-stable
|
gemfile: gemfiles/Gemfile.rails-4.1-stable
|
||||||
- rvm: 2.6.0
|
- rvm: 2.6.0
|
||||||
|
@ -56,10 +56,10 @@ matrix:
|
||||||
- env: DEVISE_ORM=mongoid
|
- env: DEVISE_ORM=mongoid
|
||||||
gemfile: gemfiles/Gemfile.rails-5.2-stable
|
gemfile: gemfiles/Gemfile.rails-5.2-stable
|
||||||
- env: DEVISE_ORM=mongoid
|
- env: DEVISE_ORM=mongoid
|
||||||
gemfile: gemfiles/Gemfile.rails-6.0-rc1
|
gemfile: gemfiles/Gemfile.rails-6.0-stable
|
||||||
allow_failures:
|
allow_failures:
|
||||||
- rvm: ruby-head
|
- rvm: ruby-head
|
||||||
- gemfile: gemfiles/Gemfile.rails-6.0-rc1
|
- gemfile: gemfiles/Gemfile.rails-6.0-stable
|
||||||
|
|
||||||
services:
|
services:
|
||||||
- mongodb
|
- mongodb
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
### Unreleased
|
### Unreleased
|
||||||
|
|
||||||
* enhancements
|
* enhancements
|
||||||
|
* Support Rails 6.0
|
||||||
* Add `autocomplete="new-password"` to `password_confirmation` fields (by @ferrl)
|
* Add `autocomplete="new-password"` to `password_confirmation` fields (by @ferrl)
|
||||||
* Update CI to rails 6.0.0.beta3 (by @tunnes)
|
* Update CI to rails 6.0.0.beta3 (by @tunnes)
|
||||||
* refactor method name to be more consistent (by @saiqulhaq)
|
* refactor method name to be more consistent (by @saiqulhaq)
|
||||||
|
|
|
@ -13,7 +13,7 @@ PATH
|
||||||
devise (4.6.2)
|
devise (4.6.2)
|
||||||
bcrypt (~> 3.0)
|
bcrypt (~> 3.0)
|
||||||
orm_adapter (~> 0.1)
|
orm_adapter (~> 0.1)
|
||||||
railties (>= 4.1.0, < 6.0)
|
railties (>= 4.1.0)
|
||||||
responders
|
responders
|
||||||
warden (~> 1.2.3)
|
warden (~> 1.2.3)
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ GEM
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
arel (9.0.0)
|
arel (9.0.0)
|
||||||
bcrypt (3.1.12)
|
bcrypt (3.1.13)
|
||||||
builder (3.2.3)
|
builder (3.2.3)
|
||||||
concurrent-ruby (1.0.5)
|
concurrent-ruby (1.0.5)
|
||||||
crass (1.0.4)
|
crass (1.0.4)
|
||||||
|
@ -201,4 +201,4 @@ DEPENDENCIES
|
||||||
webrat (= 0.7.3)
|
webrat (= 0.7.3)
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
1.17.1
|
1.17.3
|
||||||
|
|
|
@ -22,6 +22,6 @@ Gem::Specification.new do |s|
|
||||||
s.add_dependency("warden", "~> 1.2.3")
|
s.add_dependency("warden", "~> 1.2.3")
|
||||||
s.add_dependency("orm_adapter", "~> 0.1")
|
s.add_dependency("orm_adapter", "~> 0.1")
|
||||||
s.add_dependency("bcrypt", "~> 3.0")
|
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")
|
s.add_dependency("responders")
|
||||||
end
|
end
|
||||||
|
|
|
@ -2,7 +2,7 @@ source "https://rubygems.org"
|
||||||
|
|
||||||
gemspec path: ".."
|
gemspec path: ".."
|
||||||
|
|
||||||
gem 'rails', '~> 6.0.0.rc1'
|
gem 'rails', '>= 6.0.0.rc1', '< 6.1'
|
||||||
gem "omniauth"
|
gem "omniauth"
|
||||||
gem "omniauth-oauth2"
|
gem "omniauth-oauth2"
|
||||||
gem "rdoc"
|
gem "rdoc"
|
Loading…
Reference in New Issue