diff options
| author | Claudio B. <claudiob@users.noreply.github.com> | 2015-03-15 01:19:46 -0700 |
|---|---|---|
| committer | Claudio B. <claudiob@users.noreply.github.com> | 2015-03-15 01:19:46 -0700 |
| commit | 823508b2f4742179edbc152d9dee697f1656dad8 (patch) | |
| tree | 4f04206fe399d15f784fa67c98a8b61529ed539d | |
| parent | 5f6dab2270ef11081b2ceb70c630910cf071eede (diff) | |
| parent | a862a576839848e56582387f8254a96003a99633 (diff) | |
| download | rails-823508b2f4742179edbc152d9dee697f1656dad8.tar.gz rails-823508b2f4742179edbc152d9dee697f1656dad8.tar.bz2 rails-823508b2f4742179edbc152d9dee697f1656dad8.zip | |
Merge pull request #19340 from keepcosmos/association-doc-fix
[ci skip]Doc fix about association hierarchy
| -rw-r--r-- | activerecord/lib/active_record/associations/association.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb index 0d8e4ba870..930f678ae8 100644 --- a/activerecord/lib/active_record/associations/association.rb +++ b/activerecord/lib/active_record/associations/association.rb @@ -8,12 +8,12 @@ module ActiveRecord # # Association # SingularAssociation - # HasOneAssociation + # HasOneAssociation + ForeignAssociation # HasOneThroughAssociation + ThroughAssociation # BelongsToAssociation # BelongsToPolymorphicAssociation # CollectionAssociation - # HasManyAssociation + # HasManyAssociation + ForeignAssociation # HasManyThroughAssociation + ThroughAssociation class Association #:nodoc: attr_reader :owner, :target, :reflection |