aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/builder/association.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-11-05 13:35:26 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-11-05 13:35:26 -0200
commit5a011409a46811a9bd46400cc0147d4a85fa02e9 (patch)
tree05a05a01459dc36ca060705e9dccf7ccab4d0da9 /activerecord/lib/active_record/associations/builder/association.rb
parent679902b916098667dec04e3a47011d244af3056a (diff)
parent8e814a0ac0768816974d2bfd68d33d931592751e (diff)
downloadrails-5a011409a46811a9bd46400cc0147d4a85fa02e9.tar.gz
rails-5a011409a46811a9bd46400cc0147d4a85fa02e9.tar.bz2
rails-5a011409a46811a9bd46400cc0147d4a85fa02e9.zip
Merge pull request #12390 from kennyj/rename_to_association_methods
Renamed generated_feature_methods to generated_association_methods. Conflicts: activerecord/lib/active_record/associations/builder/association.rb activerecord/lib/active_record/associations/builder/singular_association.rb activerecord/test/cases/base_test.rb
Diffstat (limited to 'activerecord/lib/active_record/associations/builder/association.rb')
-rw-r--r--activerecord/lib/active_record/associations/builder/association.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb
index d8d68eb908..37ba1c73b1 100644
--- a/activerecord/lib/active_record/associations/builder/association.rb
+++ b/activerecord/lib/active_record/associations/builder/association.rb
@@ -88,7 +88,7 @@ module ActiveRecord::Associations::Builder
#
# Post.first.comments and Post.first.comments= methods are defined by this method...
def self.define_accessors(model, reflection)
- mixin = model.generated_feature_methods
+ mixin = model.generated_association_methods
name = reflection.name
define_readers(mixin, name)
define_writers(mixin, name)