diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2011-05-24 07:21:32 +0100 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2011-05-24 07:21:32 +0100 |
| commit | d8bd19f6abd1f8cb344ff5c77971a357c4f5b3ec (patch) | |
| tree | ba5c02da9a8625b031e45424240097f368121ce1 /activerecord/lib/active_record | |
| parent | a47a65f105bc7bac5fe7995a664f8f6afaa339c1 (diff) | |
| download | rails-d8bd19f6abd1f8cb344ff5c77971a357c4f5b3ec.tar.gz rails-d8bd19f6abd1f8cb344ff5c77971a357c4f5b3ec.tar.bz2 rails-d8bd19f6abd1f8cb344ff5c77971a357c4f5b3ec.zip | |
Ignore :includes on through associations
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/through_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/through_association.rb b/activerecord/lib/active_record/associations/through_association.rb index 53c5c3cedf..81172179e0 100644 --- a/activerecord/lib/active_record/associations/through_association.rb +++ b/activerecord/lib/active_record/associations/through_association.rb @@ -16,7 +16,7 @@ module ActiveRecord chain[1..-1].each do |reflection| scope = scope.merge( reflection.klass.scoped.with_default_scope. - except(:select, :create_with) + except(:select, :create_with, :includes) ) end scope |