diff options
| author | Benedikt Deicke <benedikt@synatic.net> | 2012-04-19 10:04:24 +0200 |
|---|---|---|
| committer | Benedikt Deicke <benedikt@synatic.net> | 2012-04-19 10:04:24 +0200 |
| commit | 2c21a2f7eb9f8cc50a3e957784105e187f63d5f3 (patch) | |
| tree | 92f54fe136e36b836b8f1e8bbff8f64d5fd389a7 /activerecord/CHANGELOG.md | |
| parent | 8491740ca5361ba9df20e1c8b906c709f5bfbc12 (diff) | |
| download | rails-2c21a2f7eb9f8cc50a3e957784105e187f63d5f3.tar.gz rails-2c21a2f7eb9f8cc50a3e957784105e187f63d5f3.tar.bz2 rails-2c21a2f7eb9f8cc50a3e957784105e187f63d5f3.zip | |
Revert "Revert "Fix #5667. Preloading should ignore scoping.""
This reverts commit 1166d49f62ccab789be208112163ad13183224e2.
Conflicts:
activerecord/test/cases/associations/eager_test.rb
Diffstat (limited to 'activerecord/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 16c525d211..ffd74893be 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,9 @@ +## Rails 3.2.4 (unreleased) ## + +* Association preloading shouldn't be affected by the current scoping. + This could cause infinite recursion and potentially other problems. + See GH #5667. *Jon Leighton* + ## Rails 3.2.3 (unreleased) ## * Added find_or_create_by_{attribute}! dynamic method. *Andrew White* |