Release 1.2.1.

CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 1.2.1
+
+* enhancements
+  * better upgrade steps
+
 == 1.2.0
 
 * bug fix

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devise (1.2.rc2)
+    devise (1.2.0)
       bcrypt-ruby (~> 2.1.2)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)

lib/devise/rails.rb

@@ -42,16 +42,18 @@ module Devise
       when :bcrypt
         puts "[DEVISE] From version 1.2, there is no need to set your encryptor to bcrypt " \
           "since encryptors are only enabled if you include :encryptable in your models. " \
-          "With this change, we can integrate better with bcrypt and get rid of the " \
-          "password_salt column (since bcrypt stores the salt with password). " \
-          "Please comment config.encryptor in your initializer to get rid of this warning."
+          "To update your app, please:\n\n" \
+          "1) Remove config.encryptor from your initializer;\n" \
+          "2) Add t.encryptable to your old migrations;\n" \
+          "3) [Optional] Remove password_salt in a new recent migration. Bcrypt does not require it anymore.\n"
       when nil
         # Nothing to say
       else
         puts "[DEVISE] You are using #{Devise.encryptor} as encryptor. From version 1.2, " \
-          "you need to explicitly add `devise :encryptable, :encryptor => :#{Devise.encryptor}` " \
-          "to your models and comment the current value in the config/initializers/devise.rb. " \
-          "You must also add t.encryptable to your existing migrations."
+          "you need to explicitly add encryptable as dependency. To update your app, please:\n\n" \
+          "1) Remove config.encryptor from your initializer;\n" \
+          "2) Add t.encryptable to your old migrations;\n" \
+          "3) Add `devise :encryptable, :encryptor => :#{Devise.encryptor}` to your models.\n"
       end
     end
   end

lib/devise/version.rb

@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "1.2.0".freeze
+  VERSION = "1.2.1".freeze
 end