diff options
| author | Sean Griffin <sean@thoughtbot.com> | 2015-01-24 18:49:49 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@thoughtbot.com> | 2015-01-24 18:49:49 -0700 |
| commit | 4c0a9922d6bc608e330740b4384c418fe69fc587 (patch) | |
| tree | 95e57149f4d84c285e46fa6b5db5326a0ed46159 /activerecord/lib/active_record/relation/merger.rb | |
| parent | 01849a9749a80517b5e00abffedbfe03f6028830 (diff) | |
| download | rails-4c0a9922d6bc608e330740b4384c418fe69fc587.tar.gz rails-4c0a9922d6bc608e330740b4384c418fe69fc587.tar.bz2 rails-4c0a9922d6bc608e330740b4384c418fe69fc587.zip | |
Don't duplicate `Relation::VALUE_METHODS` in `Relation::Merger`
Diffstat (limited to 'activerecord/lib/active_record/relation/merger.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/merger.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index afb0b208c3..4ee37be6be 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -49,8 +49,7 @@ module ActiveRecord @other = other end - NORMAL_VALUES = Relation::SINGLE_VALUE_METHODS + - Relation::MULTI_VALUE_METHODS - + NORMAL_VALUES = Relation::VALUE_METHODS - [:joins, :where, :order, :bind, :reverse_order, :lock, :create_with, :reordering, :from] # :nodoc: def normal_values |