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/commands | |
| 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/commands')
| -rw-r--r-- | railties/lib/rails/commands/runner.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb index e8cc5d9e3b..a694218695 100644 --- a/railties/lib/rails/commands/runner.rb +++ b/railties/lib/rails/commands/runner.rb @@ -42,6 +42,7 @@ ENV["RAILS_ENV"] = options[:environment] require APP_PATH Rails.application.require_environment! + Rails.application.load_runner if code_or_file.nil? $stderr.puts "Run '#{$0} -h' for help." |