aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-04-18 19:27:04 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-04-18 19:27:04 -0700
commit1166d49f62ccab789be208112163ad13183224e2 (patch)
tree1ccdc4cda401e9fab970999324307e66082ea688 /activerecord/CHANGELOG.md
parent39861395ffeaed6a164da5011f427f4184626b49 (diff)
downloadrails-1166d49f62ccab789be208112163ad13183224e2.tar.gz
rails-1166d49f62ccab789be208112163ad13183224e2.tar.bz2
rails-1166d49f62ccab789be208112163ad13183224e2.zip
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.
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md6
1 files changed, 0 insertions, 6 deletions
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*