diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-10-20 15:30:38 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-10-20 15:30:38 -0200 |
| commit | 2ba92bb8090b676b664c793f45cbe40e51cb1832 (patch) | |
| tree | ba9fe49dc5ff7dd9f53f82520d724375dba85369 /activerecord/lib | |
| parent | d68e81afa0e5b2697755a34e9b1d11b9b5d1df9d (diff) | |
| parent | 209f3b30af1beffbf1cd2fd933c3453661239b07 (diff) | |
| download | rails-2ba92bb8090b676b664c793f45cbe40e51cb1832.tar.gz rails-2ba92bb8090b676b664c793f45cbe40e51cb1832.tar.bz2 rails-2ba92bb8090b676b664c793f45cbe40e51cb1832.zip | |
Merge branch 'fix-21955'
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 a140dc239c..48437a1c9e 100644 --- a/activerecord/lib/active_record/associations/association_scope.rb +++ b/activerecord/lib/active_record/associations/association_scope.rb @@ -147,9 +147,9 @@ module ActiveRecord scope.includes! item.includes_values end + scope.unscope!(*item.unscope_values) scope.where_clause += item.where_clause scope.order_values |= item.order_values - scope.unscope!(*item.unscope_values) end reflection = reflection.next |