From 1437ae2ce313363caf8b38e8c568ca62847a1b27 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:13:53 +0200
Subject: [PATCH] Release v3.1.0.rc2

---
 CHANGELOG.md                      | 3 ++-
 Gemfile.lock                      | 2 +-
 gemfiles/Gemfile.rails-3.2.x.lock | 4 ++--
 lib/devise/version.rb             | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c5ebf08..faefb0e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-== 3.1.0.rc
+== 3.1.0.rc2
 
 * backwards incompatible changes
   * Do not store confirmation, unlock and reset password tokens directly in the database. This means tokens previously stored in the database are no longer valid. You can reenable this temporarily by setting `config.allow_insecure_tokens_lookup = true` in your configuration file. It is recommended to keep this configuration set to true just temporarily in your production servers only to aid migration
@@ -13,6 +13,7 @@
   * Allow easier customization of parameter sanitizer (by @alexpeattie)
 
 * bug fix
+  * Do not confirm e-mail after password reset
   * Do not sign in after confirmation
   * Do not store confirmation, unlock and reset password tokens directly in the database
   * Do not compare directly against confirmation, unlock and reset password tokens
diff --git a/Gemfile.lock b/Gemfile.lock
index 83ffc22e..6850c28c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,7 +12,7 @@ GIT
 PATH
   remote: .
   specs:
-    devise (3.1.0.rc)
+    devise (3.1.0.rc2)
       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 f0a2233c..50b9c18d 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.1.0.rc)
+    devise (3.1.0.rc2)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -39,7 +39,7 @@ GEM
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.2)
-    atomic (1.1.12)
+    atomic (1.1.13)
     bcrypt-ruby (3.1.1)
     builder (3.0.4)
     erubis (2.7.0)
diff --git a/lib/devise/version.rb b/lib/devise/version.rb
index d2fcc77a..f68f1c06 100644
--- a/lib/devise/version.rb
+++ b/lib/devise/version.rb
@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "3.1.0.rc".freeze
+  VERSION = "3.1.0.rc2".freeze
 end