aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application.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/application.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/application.rb')
-rw-r--r--railties/lib/rails/application.rb11
1 files changed, 11 insertions, 0 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 4f695159ea..2281b9686c 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -154,6 +154,14 @@ module Rails
self
end
+ # Load the application runner and invoke the registered hooks.
+ # Check <tt>Rails::Railtie.runner</tt> for more info.
+ def load_runner(app=self)
+ initialize_runner
+ super
+ self
+ end
+
# Rails.application.env_config stores some of the Rails initial environment parameters.
# Currently stores:
#
@@ -305,6 +313,9 @@ module Rails
require "rails/console/helpers"
end
+ def initialize_runner #:nodoc:
+ end
+
def build_original_fullpath(env)
path_info = env["PATH_INFO"]
query_string = env["QUERY_STRING"]