diff options
| author | kennyj <kennyj@gmail.com> | 2012-05-29 23:31:27 +0900 |
|---|---|---|
| committer | Ben Holley <benolee@gmail.com> | 2012-12-16 00:06:43 -0600 |
| commit | 38af3540ae53b9f2fbdb649a68cde3edf182fe67 (patch) | |
| tree | 98ce599950855ef8e08d8aef7f7cf2769f478a8f /railties/lib/rails/engine.rb | |
| parent | df048b574b5ab5a449a3b1dfc50dbf3baa18869e (diff) | |
| download | rails-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 'railties/lib/rails/engine.rb')
| -rw-r--r-- | railties/lib/rails/engine.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 993dfe43ee..77f335e45f 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -430,6 +430,11 @@ module Rails super end + def load_runner(app=self) + railties.all { |r| r.load_runner(app) } + super + end + def eager_load! railties.all(&:eager_load!) |