diff options
| author | Leonel Galán <leonel@getstealz.com> | 2017-04-03 22:59:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-03 22:59:43 -0400 |
| commit | 8648f289f01656b2258687126108c389127108e0 (patch) | |
| tree | 1ccb15f72f00d8c30497ad4e48f203545dd3383b /activerecord/lib/active_record/querying.rb | |
| parent | 28b3582aa2cd6007c708134b911b3f360ad5d659 (diff) | |
| parent | e8c33349bfabca28996ac74d344d69c7aaffec50 (diff) | |
| download | rails-8648f289f01656b2258687126108c389127108e0.tar.gz rails-8648f289f01656b2258687126108c389127108e0.tar.bz2 rails-8648f289f01656b2258687126108c389127108e0.zip | |
Merge branch 'master' into bug/filtered_parameters_class
Diffstat (limited to 'activerecord/lib/active_record/querying.rb')
| -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 36689f6559..c4a22398f0 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, :merge, to: :all + :having, :create_with, :distinct, :references, :none, :unscope, :merge, to: :all delegate :count, :average, :minimum, :maximum, :sum, :calculate, to: :all delegate :pluck, :ids, to: :all |