From 1166d49f62ccab789be208112163ad13183224e2 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 18 Apr 2012 19:27:04 -0700 Subject: Revert "Fix #5667. Preloading should ignore scoping." Causes a subtle regression where record.reload includes the default scope. Hard to reproduce in isolation. Seems like the relation is getting infected by some previous usage. This reverts commit dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e. --- activerecord/CHANGELOG.md | 6 ------ 1 file changed, 6 deletions(-) (limited to 'activerecord/CHANGELOG.md') diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index ffd74893be..16c525d211 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,9 +1,3 @@ -## 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