aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Rodriguez <lrodriguezsanc@gmail.com>2012-05-25 23:09:47 -0500
committerFrancesco Rodriguez <lrodriguezsanc@gmail.com>2012-05-25 23:09:47 -0500
commit7a323e2ed15e06f468d783340c4680c5ad235e87 (patch)
tree5dc31516a12548a47e80cefd287085cfc53206ea
parentbb55f52ee8ae0eb932eec4eace8adb81b05d13ad (diff)
downloadrails-7a323e2ed15e06f468d783340c4680c5ad235e87.tar.gz
rails-7a323e2ed15e06f468d783340c4680c5ad235e87.tar.bz2
rails-7a323e2ed15e06f468d783340c4680c5ad235e87.zip
add :nodoc: to CollectionProxy#initialize
-rw-r--r--activerecord/lib/active_record/associations/collection_proxy.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb
index 44f5041bd8..7408428493 100644
--- a/activerecord/lib/active_record/associations/collection_proxy.rb
+++ b/activerecord/lib/active_record/associations/collection_proxy.rb
@@ -828,7 +828,7 @@ module ActiveRecord
:any?, :many?, :include?,
:to => :@association
- def initialize(association)
+ def initialize(association) #:nodoc:
@association = association
super association.klass, association.klass.arel_table
merge! association.scoped