diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-05-24 15:34:28 -0700 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-05-24 15:34:28 -0700 |
| commit | ce37f747cd37a480025fbe69c3b1e44cb6a6e3af (patch) | |
| tree | 964e684400b32788cf620958702ab1d2e56a9a10 /activerecord/lib/active_record | |
| parent | a000ff7a503158cc95bee9cd4b15ff9089f6828a (diff) | |
| parent | d8bd19f6abd1f8cb344ff5c77971a357c4f5b3ec (diff) | |
| download | rails-ce37f747cd37a480025fbe69c3b1e44cb6a6e3af.tar.gz rails-ce37f747cd37a480025fbe69c3b1e44cb6a6e3af.tar.bz2 rails-ce37f747cd37a480025fbe69c3b1e44cb6a6e3af.zip | |
Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scope
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 |