aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-10-05 09:17:51 -0500
committerJoshua Peek <josh@joshpeek.com>2009-10-05 09:17:51 -0500
commit76d823677fced041cc52b5b1b63d67a0da5a17bd (patch)
treebaaf5b5795bcf93565e139e907120fa4bf0460c8 /actionpack/lib/action_controller
parent49b52cadc2e66c11a025e7719837ae77b3736046 (diff)
downloadrails-76d823677fced041cc52b5b1b63d67a0da5a17bd.tar.gz
rails-76d823677fced041cc52b5b1b63d67a0da5a17bd.tar.bz2
rails-76d823677fced041cc52b5b1b63d67a0da5a17bd.zip
Revert "Revert "Fix Dispatch.new so passenger works" as it broke the build"
This reverts commit 49b52cadc2e66c11a025e7719837ae77b3736046.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/dispatch/dispatcher.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/dispatch/dispatcher.rb b/actionpack/lib/action_controller/dispatch/dispatcher.rb
index e04da42637..008fb54715 100644
--- a/actionpack/lib/action_controller/dispatch/dispatcher.rb
+++ b/actionpack/lib/action_controller/dispatch/dispatcher.rb
@@ -50,7 +50,7 @@ module ActionController
def new
# DEPRECATE Rails application fallback
- Rails.application
+ Rails.application.new
end
end
end