aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/commands/runner.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-12 15:13:47 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-12 15:13:47 -0300
commit442b7c8ccfe107e05b309e1ef72b760716fa4cba (patch)
treec2d1e318f1c1716ee3b770dd0508624447e67995 /railties/lib/rails/commands/runner.rb
parent5919a552e4e4203b8d5eb5234428bc00dd462c49 (diff)
parent38af3540ae53b9f2fbdb649a68cde3edf182fe67 (diff)
downloadrails-442b7c8ccfe107e05b309e1ef72b760716fa4cba.tar.gz
rails-442b7c8ccfe107e05b309e1ef72b760716fa4cba.tar.bz2
rails-442b7c8ccfe107e05b309e1ef72b760716fa4cba.zip
Merge pull request #7695 from benolee/backport_cc7dd66_and_c0ba0f0
backport runner fixes to 3-2-stable Conflicts: railties/CHANGELOG.md
Diffstat (limited to 'railties/lib/rails/commands/runner.rb')
-rw-r--r--railties/lib/rails/commands/runner.rb1
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."