diff options
| author | Zachary Scott <e@zzak.io> | 2014-10-19 18:58:19 -0700 |
|---|---|---|
| committer | Zachary Scott <e@zzak.io> | 2014-10-19 18:58:19 -0700 |
| commit | 0dd8a2762a92339a68f955d0c5beb036091afb87 (patch) | |
| tree | a9611c2f2966474924cde97d33d5d8d26d0f9d12 | |
| parent | cbaf2190c15346f2304e79e26a6c05cfd51c236e (diff) | |
| parent | 3db24161e2e04d152dc2be030cf73438e1a1319e (diff) | |
| download | rails-0dd8a2762a92339a68f955d0c5beb036091afb87.tar.gz rails-0dd8a2762a92339a68f955d0c5beb036091afb87.tar.bz2 rails-0dd8a2762a92339a68f955d0c5beb036091afb87.zip | |
Merge branch 'activerecord-merge-docs' of https://github.com/justanshulsharma/rails into justanshulsharma-activerecord-merge-docs
| -rw-r--r-- | activerecord/lib/active_record/relation/merger.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index ac41d0aa80..545bf5debc 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -13,7 +13,7 @@ module ActiveRecord @hash = hash end - def merge + def merge #:nodoc: Merger.new(relation, other).merge end |