From 38af3540ae53b9f2fbdb649a68cde3edf182fe67 Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Tue, 29 May 2012 23:31:27 +0900
Subject: 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.
---
 activerecord/CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'activerecord/CHANGELOG.md')

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
-- 
cgit v1.2.3