From 8563f106a18d4e755b0290fff0cdb509197f68e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Sun, 18 Aug 2013 10:37:31 +0200 Subject: [PATCH] Release 2.1.4 --- CHANGELOG.rdoc | 5 +++++ Gemfile.lock | 6 +++--- gemfiles/Gemfile.rails-3.1.x.lock | 12 ++++++------ lib/devise/models/confirmable.rb | 5 ----- lib/devise/version.rb | 2 +- test/integration/recoverable_test.rb | 9 --------- 6 files changed, 15 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc index 6b89ace8..589cc0e5 100644 --- a/CHANGELOG.rdoc +++ b/CHANGELOG.rdoc @@ -1,3 +1,8 @@ +== 2.1.4 + +* bug fix + * Do not confirm account after reset password + == 2.1.3 * bug fix diff --git a/Gemfile.lock b/Gemfile.lock index 1834c45b..a6c4f0db 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - devise (2.1.3) + devise (2.1.4) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) railties (~> 3.1) @@ -39,7 +39,7 @@ GEM multi_json (~> 1.0) addressable (2.2.6) arel (3.0.2) - bcrypt-ruby (3.0.1) + bcrypt-ruby (3.1.1) bson (1.5.1) bson_ext (1.3.1) builder (3.0.0) @@ -135,7 +135,7 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.33) - warden (1.2.1) + warden (1.2.3) rack (>= 1.0) webrat (0.7.2) nokogiri (>= 1.2.0) diff --git a/gemfiles/Gemfile.rails-3.1.x.lock b/gemfiles/Gemfile.rails-3.1.x.lock index 1dd424e0..6d627bcb 100644 --- a/gemfiles/Gemfile.rails-3.1.x.lock +++ b/gemfiles/Gemfile.rails-3.1.x.lock @@ -1,11 +1,11 @@ PATH remote: .. specs: - devise (2.1.0.rc2) + devise (2.1.4) bcrypt-ruby (~> 3.0) - orm_adapter (~> 0.0.7) + orm_adapter (~> 0.1) railties (~> 3.1) - warden (~> 1.1.1) + warden (~> 1.2.1) GEM remote: http://rubygems.org/ @@ -40,7 +40,7 @@ GEM multi_json (~> 1.0) addressable (2.2.7) arel (2.2.3) - bcrypt-ruby (3.0.1) + bcrypt-ruby (3.1.1) bson (1.5.2) bson_ext (1.3.1) builder (3.0.0) @@ -87,7 +87,7 @@ GEM omniauth-openid (1.0.1) omniauth (~> 1.0) rack-openid (~> 1.3.1) - orm_adapter (0.0.7) + orm_adapter (0.4.0) polyglot (0.3.3) rack (1.3.6) rack-cache (1.2) @@ -137,7 +137,7 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.33) - warden (1.1.1) + warden (1.2.3) rack (>= 1.0) webrat (0.7.2) nokogiri (>= 1.2.0) diff --git a/lib/devise/models/confirmable.rb b/lib/devise/models/confirmable.rb index afcda349..8fb7732d 100644 --- a/lib/devise/models/confirmable.rb +++ b/lib/devise/models/confirmable.rb @@ -177,11 +177,6 @@ module Devise generate_confirmation_token && save(:validate => false) end - def after_password_reset - super - confirm! unless confirmed? - end - def postpone_email_change_until_confirmation @reconfirmation_required = true self.unconfirmed_email = self.email diff --git a/lib/devise/version.rb b/lib/devise/version.rb index b23e1c01..f7f44768 100644 --- a/lib/devise/version.rb +++ b/lib/devise/version.rb @@ -1,3 +1,3 @@ module Devise - VERSION = "2.1.3".freeze + VERSION = "2.1.4".freeze end diff --git a/test/integration/recoverable_test.rb b/test/integration/recoverable_test.rb index 9dbadd0a..164690e3 100644 --- a/test/integration/recoverable_test.rb +++ b/test/integration/recoverable_test.rb @@ -201,15 +201,6 @@ class PasswordTest < ActionController::IntegrationTest assert !warden.authenticated?(:user) end - test 'sign in user automatically and confirm after changing its password if it\'s not confirmed' do - user = create_user(:confirm => false) - request_forgot_password - reset_password :reset_password_token => user.reload.reset_password_token - - assert warden.authenticated?(:user) - assert user.reload.confirmed? - end - test 'reset password request with valid E-Mail in XML format should return valid response' do create_user post user_password_path(:format => 'xml'), :user => {:email => "user@test.com"}