aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Claghorn <george.claghorn@gmail.com>2017-10-15 20:59:55 -0400
committerGitHub <noreply@github.com>2017-10-15 20:59:55 -0400
commite986cb49c8a475c48819cee451c73dbd005904c4 (patch)
treeba009354cd8b367f990d164ed75d30f9de6bfd67
parent8b52d4cfd26964e7d1b7d462253d399b243ab256 (diff)
parent5ea4cae911604eb879f68f66fad4e83121d1b072 (diff)
downloadrails-e986cb49c8a475c48819cee451c73dbd005904c4.tar.gz
rails-e986cb49c8a475c48819cee451c73dbd005904c4.tar.bz2
rails-e986cb49c8a475c48819cee451c73dbd005904c4.zip
Merge pull request #30899 from eugeneius/rm_force_reload_docs
Remove association(true) references from docs [ci skip]
-rw-r--r--activerecord/lib/active_record/associations.rb2
-rw-r--r--activerecord/lib/active_record/associations/collection_proxy.rb4
2 files changed, 1 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index ef26f4a20c..91f915183a 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -850,7 +850,7 @@ module ActiveRecord
# project.milestones # fetches milestones from the database
# project.milestones.size # uses the milestone cache
# project.milestones.empty? # uses the milestone cache
- # project.milestones(true).size # fetches milestones from the database
+ # project.milestones.reload.size # fetches milestones from the database
# project.milestones # uses the milestone cache
#
# == Eager loading of associations
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb
index 412e89255d..07f7303f8d 100644
--- a/activerecord/lib/active_record/associations/collection_proxy.rb
+++ b/activerecord/lib/active_record/associations/collection_proxy.rb
@@ -1072,7 +1072,6 @@ module ActiveRecord
end
# Reloads the collection from the database. Returns +self+.
- # Equivalent to <tt>collection(true)</tt>.
#
# class Person < ActiveRecord::Base
# has_many :pets
@@ -1086,9 +1085,6 @@ module ActiveRecord
#
# person.pets.reload # fetches pets from the database
# # => [#<Pet id: 1, name: "Snoop", group: "dogs", person_id: 1>]
- #
- # person.pets(true) # fetches pets from the database
- # # => [#<Pet id: 1, name: "Snoop", group: "dogs", person_id: 1>]
def reload
proxy_association.reload
reset_scope