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 /activerecord/lib/active_record | |
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 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/attribute_assignment.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/attribute_assignment.rb b/activerecord/lib/active_record/attribute_assignment.rb index 75377bba57..4f06955406 100644 --- a/activerecord/lib/active_record/attribute_assignment.rb +++ b/activerecord/lib/active_record/attribute_assignment.rb @@ -3,7 +3,6 @@ require 'active_model/forbidden_attributes_protection' module ActiveRecord module AttributeAssignment extend ActiveSupport::Concern - include ActiveModel::DeprecatedMassAssignmentSecurity include ActiveModel::ForbiddenAttributesProtection # Allows you to set all the attributes by passing in a hash of attributes with |