aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-04-29 18:33:19 -0700
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-04-29 18:33:19 -0700
commita834b57b6e6028eebf6ec29c550f5328a527f487 (patch)
tree480cb7ca0aceeacd9a0fbf9c8968c9d907cf644e
parent246a95c140b8515b75b4f799fd2a39573682e24a (diff)
parent1dee54442f2ff1082ff12c837c46a12602a709e6 (diff)
downloadrails-a834b57b6e6028eebf6ec29c550f5328a527f487.tar.gz
rails-a834b57b6e6028eebf6ec29c550f5328a527f487.tar.bz2
rails-a834b57b6e6028eebf6ec29c550f5328a527f487.zip
Merge pull request #10379 from frodsan/fix_nodoc_ar_delegation
add missing :nodoc: marks to ActiveRecord::Delegation [ci skip]
-rw-r--r--activerecord/lib/active_record/relation/delegation.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/relation/delegation.rb b/activerecord/lib/active_record/relation/delegation.rb
index 1b6239eb38..8d6740246c 100644
--- a/activerecord/lib/active_record/relation/delegation.rb
+++ b/activerecord/lib/active_record/relation/delegation.rb
@@ -14,14 +14,14 @@ module ActiveRecord
delegate :table_name, :quoted_table_name, :primary_key, :quoted_primary_key,
:connection, :columns_hash, :to => :klass
- module ClassSpecificRelation
+ module ClassSpecificRelation # :nodoc:
extend ActiveSupport::Concern
included do
@delegation_mutex = Mutex.new
end
- module ClassMethods
+ module ClassMethods # :nodoc:
def name
superclass.name
end
@@ -70,7 +70,7 @@ module ActiveRecord
end
end
- module ClassMethods
+ module ClassMethods # :nodoc:
@@subclasses = ThreadSafe::Cache.new(:initial_capacity => 2)
def new(klass, *args)