aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model/secure_password.rb
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-05-18 17:13:00 +0200
committerYves Senn <yves.senn@gmail.com>2014-05-18 17:13:00 +0200
commit1963aa3e88c7cebf8bc5f9850caf85c9391849c2 (patch)
tree90192ad76e7e470f50081f39730fa989b93afa28 /activemodel/lib/active_model/secure_password.rb
parent4d8c6c558fa08109f97ae9e8055a5fb1be388697 (diff)
parent8dd801d6cad9cb690f58746850ccf25139629909 (diff)
downloadrails-1963aa3e88c7cebf8bc5f9850caf85c9391849c2.tar.gz
rails-1963aa3e88c7cebf8bc5f9850caf85c9391849c2.tar.bz2
rails-1963aa3e88c7cebf8bc5f9850caf85c9391849c2.zip
Merge pull request #15157 from msgehard/remove_cruft_in_has_secure_password
Remove cruft now that strong_parameters is default [ci skip]
Diffstat (limited to 'activemodel/lib/active_model/secure_password.rb')
-rw-r--r--activemodel/lib/active_model/secure_password.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb
index 826e89bf9d..0c3ed9e8ca 100644
--- a/activemodel/lib/active_model/secure_password.rb
+++ b/activemodel/lib/active_model/secure_password.rb
@@ -68,6 +68,7 @@ module ActiveModel
validates_confirmation_of :password, if: ->{ password.present? }
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']