Merge branch 'master' of git://github.com/plataformatec/devise

lib/devise/models/authenticatable.rb

@@ -94,13 +94,6 @@ module Devise
 
       protected
 
-        # Checks whether a password is needed or not. For validations only.
-        # Passwords are always required if it's a new record, or if the password
-        # or confirmation are being set somewhere.
-        def password_required?
-          new_record? || !password.nil? || !password_confirmation.nil?
-        end
-
         # Digests the password using the configured encryptor.
         def password_digest(password)
           self.class.encryptor_class.digest(password, self.class.stretches, self.password_salt, self.class.pepper)

lib/devise/models/validatable.rb

@@ -34,6 +34,15 @@ module Devise
                 "to the following methods: #{unavailable_validations.to_sentence}."
         end
       end
+
+      protected
+
+        # Checks whether a password is needed or not. For validations only.
+        # Passwords are always required if it's a new record, or if the password
+        # or confirmation are being set somewhere.
+        def password_required?
+          new_record? || !password.nil? || !password_confirmation.nil?
+        end
     end
   end
 end