diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-08-01 11:32:56 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-08-01 11:32:56 -0700 |
| commit | fb08039cb21134ae51739255486c2f08bd0c3028 (patch) | |
| tree | fd5b247cb9ed965ea8755e728a3303b74c5aba15 /activemodel/lib | |
| parent | 601d9d810b5a79ccc028cb548c6cb0560e74e16c (diff) | |
| parent | ad7f9cdf008e1261fdcdc8e8152462f69b48c20d (diff) | |
| download | rails-fb08039cb21134ae51739255486c2f08bd0c3028.tar.gz rails-fb08039cb21134ae51739255486c2f08bd0c3028.tar.bz2 rails-fb08039cb21134ae51739255486c2f08bd0c3028.zip | |
Merge pull request #7217 from freerobby/no_password_requirement_if_validations_skipped
has_secure_password should not raise a 'digest missing' error if the calling class has specified for validations to be skipped.
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model/secure_password.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb index 3eab745c89..dc89efd2d1 100644 --- a/activemodel/lib/active_model/secure_password.rb +++ b/activemodel/lib/active_model/secure_password.rb @@ -43,9 +43,9 @@ module ActiveModel if options.fetch(:validations, true) validates_confirmation_of :password validates_presence_of :password, :on => :create + + before_create { raise "Password digest missing on new record" if password_digest.blank? } end - - before_create { raise "Password digest missing on new record" if password_digest.blank? } include InstanceMethodsOnActivation |