diff options
author | Matthew Draper <matthew@trebex.net> | 2016-02-18 07:45:22 +1030 |
---|---|---|
committer | Matthew Draper <matthew@trebex.net> | 2016-02-18 07:45:22 +1030 |
commit | 011711ecc9bfe9bdbc1fc17d57d511373954d415 (patch) | |
tree | e6b199519a48eed4894d6bb8a5fda989eb49d4ac /activerecord/lib | |
parent | d50fbe952fa066de6e0de15a7da95402c3497d54 (diff) | |
parent | 91c13624be7106e12f52799ab535302878219120 (diff) | |
download | rails-011711ecc9bfe9bdbc1fc17d57d511373954d415.tar.gz rails-011711ecc9bfe9bdbc1fc17d57d511373954d415.tar.bz2 rails-011711ecc9bfe9bdbc1fc17d57d511373954d415.zip |
Merge pull request #23570 from rthbound/addresses-23568
Addresses #23568, Incorrect error message with accepts_nested_attributes_for / has_many & has_one
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/attribute_assignment.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/attribute_assignment.rb b/activerecord/lib/active_record/attribute_assignment.rb index a6d81c82b4..4c22be8235 100644 --- a/activerecord/lib/active_record/attribute_assignment.rb +++ b/activerecord/lib/active_record/attribute_assignment.rb @@ -29,14 +29,6 @@ module ActiveRecord assign_multiparameter_attributes(multi_parameter_attributes) unless multi_parameter_attributes.empty? end - # Tries to assign given value to given attribute. - # In case of an error, re-raises with the ActiveRecord constant. - def _assign_attribute(k, v) # :nodoc: - super - rescue ActiveModel::UnknownAttributeError - raise UnknownAttributeError.new(self, k) - end - # Assign any deferred nested attributes after the base attributes have been set. def assign_nested_parameter_attributes(pairs) pairs.each { |k, v| _assign_attribute(k, v) } |