From d559a32646193f066077c033ec4bf089eb85e628 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@plataformatec.com.br>
Date: Sun, 18 Aug 2013 10:26:26 +0200
Subject: [PATCH] Release 3.0.3

---
 CHANGELOG.rdoc                                | 5 +++++
 Gemfile.lock                                  | 2 +-
 gemfiles/Gemfile.rails-3.2.x.lock             | 2 +-
 lib/devise/models/confirmable.rb              | 5 -----
 lib/devise/version.rb                         | 2 +-
 test/controllers/passwords_controller_test.rb | 2 +-
 test/integration/recoverable_test.rb          | 9 ---------
 7 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index f7f740c6..42614f8e 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,3 +1,8 @@
+== 3.0.3
+
+* bug fix
+  * Do not confirm account after reset password
+
 == 3.0.2
 
 * bug fix
diff --git a/Gemfile.lock b/Gemfile.lock
index 0f49f32e..f9f69e3b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,7 +12,7 @@ GIT
 PATH
   remote: .
   specs:
-    devise (3.0.2)
+    devise (3.0.3)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
diff --git a/gemfiles/Gemfile.rails-3.2.x.lock b/gemfiles/Gemfile.rails-3.2.x.lock
index 9a5bd5aa..04d46e55 100644
--- a/gemfiles/Gemfile.rails-3.2.x.lock
+++ b/gemfiles/Gemfile.rails-3.2.x.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    devise (3.0.2)
+    devise (3.0.3)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
diff --git a/lib/devise/models/confirmable.rb b/lib/devise/models/confirmable.rb
index 5803d8d3..d77ba6e3 100644
--- a/lib/devise/models/confirmable.rb
+++ b/lib/devise/models/confirmable.rb
@@ -241,11 +241,6 @@ module Devise
           regenerate_confirmation_token && save(:validate => false)
         end
 
-        def after_password_reset
-          super
-          confirm! unless confirmed?
-        end
-
         def postpone_email_change_until_confirmation_and_regenerate_confirmation_token
           @reconfirmation_required = true
           self.unconfirmed_email = self.email
diff --git a/lib/devise/version.rb b/lib/devise/version.rb
index c214501a..65f65515 100644
--- a/lib/devise/version.rb
+++ b/lib/devise/version.rb
@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "3.0.2".freeze
+  VERSION = "3.0.3".freeze
 end
diff --git a/test/controllers/passwords_controller_test.rb b/test/controllers/passwords_controller_test.rb
index 4d3dfc0b..4d8dbdcd 100644
--- a/test/controllers/passwords_controller_test.rb
+++ b/test/controllers/passwords_controller_test.rb
@@ -7,7 +7,7 @@ class PasswordsControllerTest < ActionController::TestCase
   def setup
     request.env["devise.mapping"] = Devise.mappings[:user]
 
-    @user = create_user
+    @user = create_user.tap(&:confirm!)
     @user.send_reset_password_instructions
   end
 
diff --git a/test/integration/recoverable_test.rb b/test/integration/recoverable_test.rb
index 2ed0bafa..aac6485e 100644
--- a/test/integration/recoverable_test.rb
+++ b/test/integration/recoverable_test.rb
@@ -230,15 +230,6 @@ class PasswordTest < ActionDispatch::IntegrationTest
     end
   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"}