diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2012-09-18 12:33:13 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2012-09-18 12:33:13 -0700 |
| commit | c49d959e9d40101f1712a452004695f4ce27d84c (patch) | |
| tree | f87077668c14ed414e3d819212b0813e74551c8f /activemodel/test/models/administrator.rb | |
| parent | ade701045f0f80399d99151e5583d4f86c68678e (diff) | |
| parent | 3919fcd61ef999aab9397332ce3017870b184766 (diff) | |
| download | rails-c49d959e9d40101f1712a452004695f4ce27d84c.tar.gz rails-c49d959e9d40101f1712a452004695f4ce27d84c.tar.bz2 rails-c49d959e9d40101f1712a452004695f4ce27d84c.zip | |
Merge pull request #7251 from rails/integrate-strong_parameters
Integrate strong_parameters in Rails 4
Diffstat (limited to 'activemodel/test/models/administrator.rb')
| -rw-r--r-- | activemodel/test/models/administrator.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activemodel/test/models/administrator.rb b/activemodel/test/models/administrator.rb index 2d6d34b3e2..2f3aff290c 100644 --- a/activemodel/test/models/administrator.rb +++ b/activemodel/test/models/administrator.rb @@ -2,12 +2,10 @@ class Administrator extend ActiveModel::Callbacks include ActiveModel::Validations include ActiveModel::SecurePassword - include ActiveModel::MassAssignmentSecurity - + define_model_callbacks :create attr_accessor :name, :password_digest - attr_accessible :name has_secure_password end |