aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAbdelkader Boudih <terminale@gmail.com>2015-05-10 16:59:27 +0100
committerAbdelkader Boudih <terminale@gmail.com>2015-05-10 16:59:27 +0100
commit3aca4dd1afd3f618ea7a6b2a34af15f86b0ad7b7 (patch)
tree7dca973c1e0e05091a478149f21fac31c0e24d6a /activerecord
parent9f0c5107c728bdff97d11f6343bf931e40fd6776 (diff)
parenta60793ff73272f1e07d267a9cf800657be557c7c (diff)
downloadrails-3aca4dd1afd3f618ea7a6b2a34af15f86b0ad7b7.tar.gz
rails-3aca4dd1afd3f618ea7a6b2a34af15f86b0ad7b7.tar.bz2
rails-3aca4dd1afd3f618ea7a6b2a34af15f86b0ad7b7.zip
Merge pull request #20099 from yui-knk/fix/comment_association_cache
[ci skip] Fix comment of `ActiveRecord::Associations#association_inst…
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/associations.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 7deb15b047..94f59f9e95 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -185,7 +185,7 @@ module ActiveRecord
super
end
- # Returns the specified association instance if it responds to :loaded?, nil otherwise.
+ # Returns the specified association instance if it exists, nil otherwise.
def association_instance_get(name)
@association_cache[name]
end