diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-07-20 02:11:17 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-07-20 02:11:17 -0300 |
| commit | 9c6f348d7968dc544c29152f41bd5116449bf7ca (patch) | |
| tree | 9ceec854e372f7ea85458bd60533ca1d09ee19e1 /activerecord/lib/active_record | |
| parent | b25e18007b4dc139c86cb027552c007658a6fbfa (diff) | |
| parent | cf2574b1c9921377cbb5c7da38433b90fdc4a68c (diff) | |
| download | rails-9c6f348d7968dc544c29152f41bd5116449bf7ca.tar.gz rails-9c6f348d7968dc544c29152f41bd5116449bf7ca.tar.bz2 rails-9c6f348d7968dc544c29152f41bd5116449bf7ca.zip | |
Merge pull request #25849 from suginoy/fix_merge_in_scope
Fix the calling `merge` method at first in a scope
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/querying.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/querying.rb b/activerecord/lib/active_record/querying.rb index 53ddd95bb0..f8dd35df0f 100644 --- a/activerecord/lib/active_record/querying.rb +++ b/activerecord/lib/active_record/querying.rb @@ -9,7 +9,7 @@ module ActiveRecord delegate :find_each, :find_in_batches, :in_batches, to: :all delegate :select, :group, :order, :except, :reorder, :limit, :offset, :joins, :left_joins, :left_outer_joins, :or, :where, :rewhere, :preload, :eager_load, :includes, :from, :lock, :readonly, - :having, :create_with, :uniq, :distinct, :references, :none, :unscope, to: :all + :having, :create_with, :uniq, :distinct, :references, :none, :unscope, :merge, to: :all delegate :count, :average, :minimum, :maximum, :sum, :calculate, to: :all delegate :pluck, :ids, to: :all |