diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-04-19 06:26:13 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-04-19 06:26:13 -0700 |
| commit | b9e5c5aca3313bd67b35a608c504175f99172d7f (patch) | |
| tree | 5075061b731f1203dca6551cb1b696a246c916b6 /activerecord/CHANGELOG.md | |
| parent | 1166d49f62ccab789be208112163ad13183224e2 (diff) | |
| parent | ebfa58abc895c0639211cb896a47b04e424322c8 (diff) | |
| download | rails-b9e5c5aca3313bd67b35a608c504175f99172d7f.tar.gz rails-b9e5c5aca3313bd67b35a608c504175f99172d7f.tar.bz2 rails-b9e5c5aca3313bd67b35a608c504175f99172d7f.zip | |
Merge pull request #5898 from benedikt/3-2-stable
Readds the fix for #5667 and back ports the regression fix from #5718
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* |