diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-11-05 13:35:26 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-11-05 13:35:26 -0200 |
| commit | 5a011409a46811a9bd46400cc0147d4a85fa02e9 (patch) | |
| tree | 05a05a01459dc36ca060705e9dccf7ccab4d0da9 /activerecord/lib/active_record/associations/builder/singular_association.rb | |
| parent | 679902b916098667dec04e3a47011d244af3056a (diff) | |
| parent | 8e814a0ac0768816974d2bfd68d33d931592751e (diff) | |
| download | rails-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/singular_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/singular_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/builder/singular_association.rb b/activerecord/lib/active_record/associations/builder/singular_association.rb index 2a4b1c441f..66b03c0301 100644 --- a/activerecord/lib/active_record/associations/builder/singular_association.rb +++ b/activerecord/lib/active_record/associations/builder/singular_association.rb @@ -8,7 +8,7 @@ module ActiveRecord::Associations::Builder def self.define_accessors(model, reflection) super - define_constructors(model.generated_feature_methods, reflection.name) if reflection.constructable? + define_constructors(model.generated_association_methods, reflection.name) if reflection.constructable? end # Defines the (build|create)_association methods for belongs_to or has_one association |