diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-04-04 15:43:02 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-04-04 15:43:02 -0700 |
| commit | 507812fdf32586a59071efabdfc471402bd589f3 (patch) | |
| tree | 530e01dc8f7c408d1fd4131a8b2caaa7b884578c /activerecord/lib/active_record/associations | |
| parent | f28345858ae523845c888fec29865ef2a8f0a68a (diff) | |
| parent | 261520d91890a6844fc769ecf8bd221e35c8974c (diff) | |
| download | rails-507812fdf32586a59071efabdfc471402bd589f3.tar.gz rails-507812fdf32586a59071efabdfc471402bd589f3.tar.bz2 rails-507812fdf32586a59071efabdfc471402bd589f3.zip | |
Merge pull request #10094 from neerajdotname/fix2
Collection of small fixes. Check individual commits for background.
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -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 |