diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-06-27 11:42:52 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-06-27 11:42:52 -0700 |
| commit | 6d7477e87d637f5dea81c1a0d0fac114bbaa26a2 (patch) | |
| tree | c52cd2183c3686d8e075928662964acaae11a7fe /activemodel/lib | |
| parent | e16ad2db8c6e495fbbe3c11b0dde138b937cb42d (diff) | |
| parent | 468939297db91f8e595a93c94a16e23b26eee61a (diff) | |
| download | rails-6d7477e87d637f5dea81c1a0d0fac114bbaa26a2.tar.gz rails-6d7477e87d637f5dea81c1a0d0fac114bbaa26a2.tar.bz2 rails-6d7477e87d637f5dea81c1a0d0fac114bbaa26a2.zip | |
Merge pull request #11149 from strzalek/remove-protected-attrs
Remove deprecated attr_protected/accessible
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model.rb | 1 | ||||
| -rw-r--r-- | activemodel/lib/active_model/deprecated_mass_assignment_security.rb | 21 |
2 files changed, 0 insertions, 22 deletions
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb index 3bd5531356..ef4f2514be 100644 --- a/activemodel/lib/active_model.rb +++ b/activemodel/lib/active_model.rb @@ -37,7 +37,6 @@ module ActiveModel autoload :ForbiddenAttributesProtection autoload :Lint autoload :Model - autoload :DeprecatedMassAssignmentSecurity autoload :Name, 'active_model/naming' autoload :Naming autoload :SecurePassword diff --git a/activemodel/lib/active_model/deprecated_mass_assignment_security.rb b/activemodel/lib/active_model/deprecated_mass_assignment_security.rb deleted file mode 100644 index 1f409c87b9..0000000000 --- a/activemodel/lib/active_model/deprecated_mass_assignment_security.rb +++ /dev/null @@ -1,21 +0,0 @@ -module ActiveModel - module DeprecatedMassAssignmentSecurity # :nodoc: - extend ActiveSupport::Concern - - module ClassMethods # :nodoc: - def attr_protected(*args) - raise "`attr_protected` is extracted out of Rails into a gem. " \ - "Please use new recommended protection model for params" \ - "(strong_parameters) or add `protected_attributes` to your " \ - "Gemfile to use old one." - end - - def attr_accessible(*args) - raise "`attr_accessible` is extracted out of Rails into a gem. " \ - "Please use new recommended protection model for params" \ - "(strong_parameters) or add `protected_attributes` to your " \ - "Gemfile to use old one." - end - end - end -end |