From c97c31b096e627480b64403d1460065738941c3e Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sun, 4 Oct 2009 12:45:53 -0500 Subject: Fix Dispatch.new so passenger works --- actionpack/lib/action_controller/dispatch/dispatcher.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller/dispatch/dispatcher.rb') 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 -- cgit v1.2.3 From 49b52cadc2e66c11a025e7719837ae77b3736046 Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Mon, 5 Oct 2009 17:23:37 +1300 Subject: Revert "Fix Dispatch.new so passenger works" as it broke the build This reverts commit c97c31b096e627480b64403d1460065738941c3e. --- actionpack/lib/action_controller/dispatch/dispatcher.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller/dispatch/dispatcher.rb') diff --git a/actionpack/lib/action_controller/dispatch/dispatcher.rb b/actionpack/lib/action_controller/dispatch/dispatcher.rb index 008fb54715..e04da42637 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.new + Rails.application end end end -- cgit v1.2.3 From 76d823677fced041cc52b5b1b63d67a0da5a17bd Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Mon, 5 Oct 2009 09:17:51 -0500 Subject: Revert "Revert "Fix Dispatch.new so passenger works" as it broke the build" This reverts commit 49b52cadc2e66c11a025e7719837ae77b3736046. --- actionpack/lib/action_controller/dispatch/dispatcher.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller/dispatch/dispatcher.rb') 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 -- cgit v1.2.3