aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/base.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2010-12-18 13:38:05 -0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2010-12-18 13:38:05 -0800
commitbcf4e4f2b02157cecc1f1727a95cdf5bfa471771 (patch)
treeb38232fb127a25817aa25d3b8976d218948119e3 /activerecord/lib/active_record/base.rb
parentd9b732fcadc001b6757e648761acf97833827b58 (diff)
downloadrails-bcf4e4f2b02157cecc1f1727a95cdf5bfa471771.tar.gz
rails-bcf4e4f2b02157cecc1f1727a95cdf5bfa471771.tar.bz2
rails-bcf4e4f2b02157cecc1f1727a95cdf5bfa471771.zip
Added ActiveRecord::Base#has_secure_password (via ActiveModel::SecurePassword) to encapsulate dead-simple password usage with SHA2 encryption and salting
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rw-r--r--activerecord/lib/active_record/base.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index d0f33c1d18..858ccebbfa 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1851,6 +1851,7 @@ MSG
include ActiveModel::MassAssignmentSecurity
include Callbacks, ActiveModel::Observing, Timestamp
include Associations, AssociationPreload, NamedScope
+ include ActiveModel::SecurePassword
# AutosaveAssociation needs to be included before Transactions, because we want
# #save_with_autosave_associations to be wrapped inside a transaction.