aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/merger.rb
diff options
context:
space:
mode:
authorAnshul Sharma <justanshulsharma@gmail.com>2014-10-20 00:23:33 +0530
committerAnshul Sharma <justanshulsharma@gmail.com>2014-10-20 00:23:33 +0530
commit3db24161e2e04d152dc2be030cf73438e1a1319e (patch)
treec2c54bc77edae5327905cfffd255d9f261f10509 /activerecord/lib/active_record/relation/merger.rb
parent38148903fb23c0983497cf5b300bddfe9de1c251 (diff)
downloadrails-3db24161e2e04d152dc2be030cf73438e1a1319e.tar.gz
rails-3db24161e2e04d152dc2be030cf73438e1a1319e.tar.bz2
rails-3db24161e2e04d152dc2be030cf73438e1a1319e.zip
[ci skip] Make merge method nodoc
Diffstat (limited to 'activerecord/lib/active_record/relation/merger.rb')
-rw-r--r--activerecord/lib/active_record/relation/merger.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb
index fa968ac5af..545bf5debc 100644
--- a/activerecord/lib/active_record/relation/merger.rb
+++ b/activerecord/lib/active_record/relation/merger.rb
@@ -13,14 +13,7 @@ module ActiveRecord
@hash = hash
end
- # It allows to do a join, and filter by a scope on the joined model:
- # class Account < ActiveRecord::Base
- # # Returns all the accounts that have unread messages.
- # def self.with_unread_messages
- # joins(:messages).merge( Message.unread )
- # end
- # end
- def merge
+ def merge #:nodoc:
Merger.new(relation, other).merge
end