aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/merger.rb
diff options
context:
space:
mode:
authorOscar Del Ben <oscar@oscardelben.com>2012-07-17 16:04:52 -0700
committerOscar Del Ben <oscar@oscardelben.com>2012-07-17 16:04:52 -0700
commit28e534136f1d4a496eb39d752896603f6ef5d6ff (patch)
tree99e1eaf51ce064431987ec12ee647d82c57b291e /activerecord/lib/active_record/relation/merger.rb
parent30bf42b3ef8be104abffba07c3feaa343d882e09 (diff)
downloadrails-28e534136f1d4a496eb39d752896603f6ef5d6ff.tar.gz
rails-28e534136f1d4a496eb39d752896603f6ef5d6ff.tar.bz2
rails-28e534136f1d4a496eb39d752896603f6ef5d6ff.zip
Add nodoc to HashMerger and Merger
Diffstat (limited to 'activerecord/lib/active_record/relation/merger.rb')
-rw-r--r--activerecord/lib/active_record/relation/merger.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb
index 36f98c6480..b04dd7c6a7 100644
--- a/activerecord/lib/active_record/relation/merger.rb
+++ b/activerecord/lib/active_record/relation/merger.rb
@@ -3,7 +3,7 @@ require 'active_support/core_ext/hash/keys'
module ActiveRecord
class Relation
- class HashMerger
+ class HashMerger # :nodoc:
attr_reader :relation, :hash
def initialize(relation, hash)
@@ -28,7 +28,7 @@ module ActiveRecord
end
end
- class Merger
+ class Merger # :nodoc:
attr_reader :relation, :values
def initialize(relation, other)