From dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Fri, 30 Mar 2012 16:18:39 +0100 Subject: Fix #5667. Preloading should ignore scoping. Conflicts: activerecord/test/cases/associations/eager_test.rb --- activerecord/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'activerecord/CHANGELOG.md') 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* -- cgit v1.2.3