diff options
| author | Neeraj Singh <neerajdotname@gmail.com> | 2013-04-04 17:59:02 -0400 |
|---|---|---|
| committer | Neeraj Singh <neerajdotname@gmail.com> | 2013-04-04 17:59:02 -0400 |
| commit | 2f0acf6a0a82e60d670b90d39d1278c55fdfe766 (patch) | |
| tree | e1d4150c109aea72bcd63f354cc35d4f83688eee /activerecord/lib | |
| parent | 98e42bc37e866508a671b569d905852c2e6ae17e (diff) | |
| download | rails-2f0acf6a0a82e60d670b90d39d1278c55fdfe766.tar.gz rails-2f0acf6a0a82e60d670b90d39d1278c55fdfe766.tar.bz2 rails-2f0acf6a0a82e60d670b90d39d1278c55fdfe766.zip | |
use | to have more intent revealing code
thanks to @egilburg for suggestion
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/association_scope.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_scope.rb b/activerecord/lib/active_record/associations/association_scope.rb index b62a16ea3f..aa5551fe0c 100644 --- a/activerecord/lib/active_record/associations/association_scope.rb +++ b/activerecord/lib/active_record/associations/association_scope.rb @@ -101,7 +101,7 @@ module ActiveRecord scope.includes! item.includes_values scope.where_values += item.where_values - scope.order_values += (item.order_values - scope.order_values) + scope.order_values |= item.order_values end end |