diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2015-01-09 18:33:44 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2015-01-09 18:33:44 -0500 |
| commit | 6907fcd8c72ed81e531ab025b9465cfe1371b1aa (patch) | |
| tree | 2f9f9352e68dd32e6ec3b86a844d1d1aaf849f92 /activemodel/lib | |
| parent | 7e006057e082c4eab7424618b24f330e47be8744 (diff) | |
| parent | e0213f45eacd587fb7c0630dc9eb6288b4337e46 (diff) | |
| download | rails-6907fcd8c72ed81e531ab025b9465cfe1371b1aa.tar.gz rails-6907fcd8c72ed81e531ab025b9465cfe1371b1aa.tar.bz2 rails-6907fcd8c72ed81e531ab025b9465cfe1371b1aa.zip | |
Merge pull request #10690 from robertomiranda/remove_mass_assignment_security
Remove attributes_protected_by_default reference
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model/secure_password.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb index 96e88f1b6c..871031ece4 100644 --- a/activemodel/lib/active_model/secure_password.rb +++ b/activemodel/lib/active_model/secure_password.rb @@ -77,13 +77,6 @@ module ActiveModel validates_length_of :password, maximum: ActiveModel::SecurePassword::MAX_PASSWORD_LENGTH_ALLOWED validates_confirmation_of :password, allow_blank: true end - - # This code is necessary as long as the protected_attributes gem is supported. - if respond_to?(:attributes_protected_by_default) - def self.attributes_protected_by_default #:nodoc: - super + ['password_digest'] - end - end end end |