aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-01-03 09:09:59 -0800
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-01-03 09:09:59 -0800
commitcb2bd4aa619d9329c42aaf6d9f8eacc616ce53f4 (patch)
tree409db16994e4a96c8ac08a04a0a37dd34df7c2cb /activerecord/lib/active_record/associations
parentb4a23edc106f0c74aaa71fc605b76429064e3436 (diff)
parentd826f14443a8030068324b1fcab8dc0f1fc87c9d (diff)
downloadrails-cb2bd4aa619d9329c42aaf6d9f8eacc616ce53f4.tar.gz
rails-cb2bd4aa619d9329c42aaf6d9f8eacc616ce53f4.tar.bz2
rails-cb2bd4aa619d9329c42aaf6d9f8eacc616ce53f4.zip
Merge pull request #8705 from amparo-luna/change_update_attributes_to_update
Rename update_attributes method to update
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r--activerecord/lib/active_record/associations/has_one_through_association.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_one_through_association.rb b/activerecord/lib/active_record/associations/has_one_through_association.rb
index fdf8ae1453..08e0ec691f 100644
--- a/activerecord/lib/active_record/associations/has_one_through_association.rb
+++ b/activerecord/lib/active_record/associations/has_one_through_association.rb
@@ -23,7 +23,7 @@ module ActiveRecord
attributes = construct_join_attributes(record)
if through_record
- through_record.update_attributes(attributes)
+ through_record.update(attributes)
elsif owner.new_record?
through_proxy.build(attributes)
else