aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorkennyj <kennyj@gmail.com>2012-05-29 23:31:27 +0900
committerBen Holley <benolee@gmail.com>2012-12-16 00:06:43 -0600
commit38af3540ae53b9f2fbdb649a68cde3edf182fe67 (patch)
tree98ce599950855ef8e08d8aef7f7cf2769f478a8f /activerecord/CHANGELOG.md
parentdf048b574b5ab5a449a3b1dfc50dbf3baa18869e (diff)
downloadrails-38af3540ae53b9f2fbdb649a68cde3edf182fe67.tar.gz
rails-38af3540ae53b9f2fbdb649a68cde3edf182fe67.tar.bz2
rails-38af3540ae53b9f2fbdb649a68cde3edf182fe67.zip
backport runner fixes to 3-2-stable
Add a runner hook to Rails::Application and Rails::Engine that requires ActiveRecord::Base to avoid circular constant loading when using observers. This commit backports cc7dd66, c0ba0f0 and 8d01c61.
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 0b22939884..3f91c0549e 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,8 @@
## Rails 3.2.10 (unreleased)
+* Require ActiveRecord::Base in railtie hooks for rake_tasks, console and runner to
+ avoid circular constant loading issues. [Backport #7695] [Fixes #7683 and #882] *Ben Holley*
+
* Recognize migrations placed in directories containing numbers and 'rb'.
Fix #8492
Backport of #8500