diff --git a/CHANGELOG.md b/CHANGELOG.md index 50b1512ecb..1afe68ddb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,12 @@ * 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) - * Fix rails 6.0.rc1 email uniqueness validation deprecation error (by @Vasfed) + * Fix rails 6.0.rc1 email uniqueness validation deprecation warning (by @Vasfed) + +* bug fixes + * Add `autocomplete="new-password"` to `password_confirmation` fields (by @ferrl) * Fix rails_51_and_up? method for Rails 6.rc1 (by @igorkasyanchuk) ### 4.6.2 - 2019-03-26 diff --git a/Gemfile.lock b/Gemfile.lock index 5c041167c3..e9632beedf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,7 +10,7 @@ GIT PATH remote: . specs: - devise (4.6.2) + devise (4.7.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) diff --git a/gemfiles/Gemfile.rails-5.0-stable.lock b/gemfiles/Gemfile.rails-5.0-stable.lock index f4a97f8e08..ad11e2cb43 100644 --- a/gemfiles/Gemfile.rails-5.0-stable.lock +++ b/gemfiles/Gemfile.rails-5.0-stable.lock @@ -10,10 +10,10 @@ GIT PATH remote: .. specs: - devise (4.6.2) + devise (4.7.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) + railties (>= 4.1.0) responders warden (~> 1.2.3) @@ -58,7 +58,7 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) arel (7.1.4) - bcrypt (3.1.12) + bcrypt (3.1.13) builder (3.2.3) concurrent-ruby (1.0.5) erubis (2.7.0) diff --git a/gemfiles/Gemfile.rails-5.2-stable.lock b/gemfiles/Gemfile.rails-5.2-stable.lock index c9541696bf..5d33b726fa 100644 --- a/gemfiles/Gemfile.rails-5.2-stable.lock +++ b/gemfiles/Gemfile.rails-5.2-stable.lock @@ -10,10 +10,10 @@ GIT PATH remote: .. specs: - devise (4.6.2) + devise (4.7.0) 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) diff --git a/gemfiles/Gemfile.rails-6.0-stable b/gemfiles/Gemfile.rails-6.0-stable index ce541bf38e..cdef68f66a 100644 --- a/gemfiles/Gemfile.rails-6.0-stable +++ b/gemfiles/Gemfile.rails-6.0-stable @@ -2,7 +2,7 @@ source "https://rubygems.org" gemspec path: ".." -gem 'rails', '>= 6.0.0.rc2', '< 6.1' +gem "rails", '~> 6.0.0' gem "omniauth" gem "omniauth-oauth2" gem "rdoc" @@ -11,7 +11,7 @@ gem "activemodel-serializers-xml", github: "rails/activemodel-serializers-xml" gem "rails-controller-testing" -gem "responders", "~> 2.4" +gem "responders", "~> 3.0" group :test do gem "omniauth-facebook" diff --git a/gemfiles/Gemfile.rails-6.0-stable.lock b/gemfiles/Gemfile.rails-6.0-stable.lock index 8f35d2c1a7..e8f1232be1 100644 --- a/gemfiles/Gemfile.rails-6.0-stable.lock +++ b/gemfiles/Gemfile.rails-6.0-stable.lock @@ -10,7 +10,7 @@ GIT PATH remote: .. specs: - devise (4.6.2) + devise (4.7.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -20,56 +20,56 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (6.0.0.rc2) - actionpack (= 6.0.0.rc2) + actioncable (6.0.0) + actionpack (= 6.0.0) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - 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) + actionmailbox (6.0.0) + actionpack (= 6.0.0) + activejob (= 6.0.0) + activerecord (= 6.0.0) + activestorage (= 6.0.0) + activesupport (= 6.0.0) mail (>= 2.7.1) - actionmailer (6.0.0.rc2) - actionpack (= 6.0.0.rc2) - actionview (= 6.0.0.rc2) - activejob (= 6.0.0.rc2) + actionmailer (6.0.0) + actionpack (= 6.0.0) + actionview (= 6.0.0) + activejob (= 6.0.0) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.0.rc2) - actionview (= 6.0.0.rc2) - activesupport (= 6.0.0.rc2) + actionpack (6.0.0) + actionview (= 6.0.0) + activesupport (= 6.0.0) 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.rc2) - actionpack (= 6.0.0.rc2) - activerecord (= 6.0.0.rc2) - activestorage (= 6.0.0.rc2) - activesupport (= 6.0.0.rc2) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.0) + actionpack (= 6.0.0) + activerecord (= 6.0.0) + activestorage (= 6.0.0) + activesupport (= 6.0.0) nokogiri (>= 1.8.5) - actionview (6.0.0.rc2) - activesupport (= 6.0.0.rc2) + actionview (6.0.0) + activesupport (= 6.0.0) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (6.0.0.rc2) - activesupport (= 6.0.0.rc2) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.0) + activesupport (= 6.0.0) globalid (>= 0.3.6) - 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) + activemodel (6.0.0) + activesupport (= 6.0.0) + activerecord (6.0.0) + activemodel (= 6.0.0) + activesupport (= 6.0.0) + activestorage (6.0.0) + actionpack (= 6.0.0) + activejob (= 6.0.0) + activerecord (= 6.0.0) marcel (~> 0.3.1) - activesupport (6.0.0.rc2) + activesupport (6.0.0) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -87,7 +87,7 @@ GEM hashie (3.6.0) i18n (1.6.0) concurrent-ruby (~> 1.0) - jwt (2.1.0) + jwt (2.2.1) loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -101,13 +101,13 @@ GEM mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.11.3) - mocha (1.8.0) + mocha (1.9.0) metaclass (~> 0.0.1) multi_json (1.13.1) multi_xml (0.6.0) - multipart-post (2.0.0) + multipart-post (2.1.1) nio4r (2.4.0) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) oauth2 (1.4.1) faraday (>= 0.8, < 0.16.0) @@ -133,20 +133,20 @@ GEM ruby-openid (>= 2.1.8) rack-test (1.1.0) rack (>= 1.0, < 3) - 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) + rails (6.0.0) + actioncable (= 6.0.0) + actionmailbox (= 6.0.0) + actionmailer (= 6.0.0) + actionpack (= 6.0.0) + actiontext (= 6.0.0) + actionview (= 6.0.0) + activejob (= 6.0.0) + activemodel (= 6.0.0) + activerecord (= 6.0.0) + activestorage (= 6.0.0) + activesupport (= 6.0.0) bundler (>= 1.3.0) - railties (= 6.0.0.rc2) + railties (= 6.0.0) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.4) actionpack (>= 5.0.1.x) @@ -155,19 +155,19 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.1.0) + rails-html-sanitizer (1.2.0) loofah (~> 2.2, >= 2.2.2) - railties (6.0.0.rc2) - actionpack (= 6.0.0.rc2) - activesupport (= 6.0.0.rc2) + railties (6.0.0) + actionpack (= 6.0.0) + activesupport (= 6.0.0) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rake (12.3.3) rdoc (6.1.1) - responders (2.4.1) - actionpack (>= 4.2.0, < 6.0) - railties (>= 4.2.0, < 6.0) + responders (3.0.0) + actionpack (>= 5.0) + railties (>= 5.0) ruby-openid (2.7.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) @@ -206,10 +206,10 @@ DEPENDENCIES omniauth-facebook omniauth-oauth2 omniauth-openid - rails (>= 6.0.0.rc2, < 6.1) + rails (~> 6.0.0) rails-controller-testing rdoc - responders (~> 2.4) + responders (~> 3.0) sqlite3 (~> 1.4) test_after_commit timecop diff --git a/lib/devise/version.rb b/lib/devise/version.rb index e232ce1823..d18e24e35c 100644 --- a/lib/devise/version.rb +++ b/lib/devise/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Devise - VERSION = "4.6.2".freeze + VERSION = "4.7.0".freeze end