diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-03-30 16:18:39 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-03-30 16:24:41 +0100 |
| commit | dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e (patch) | |
| tree | 12d52e67f25c017fb96a1f116f757d6742ef8173 /activerecord/CHANGELOG.md | |
| parent | 13fe1903d89fa9345a9f0b17de2d31e8b7ef2b1d (diff) | |
| download | rails-dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e.tar.gz rails-dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e.tar.bz2 rails-dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e.zip | |
Fix #5667. Preloading should ignore scoping.
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* |