From e51112c15d1a4b21bef81b48ea6be463e8e3c17c Mon Sep 17 00:00:00 2001 From: Nicholas Seckar Date: Tue, 7 Nov 2006 19:52:27 +0000 Subject: Remove temporary crutch to help ApplicationController be unloaded. Closes #6496. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5454 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/lib/dispatcher.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib') diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index 08afe5dacd..bafc8c28b2 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -101,7 +101,7 @@ class Dispatcher end prepare_breakpoint - Dependencies.require_or_load('application.rb', "ApplicationController") unless Object.const_defined?(:ApplicationController) + Dependencies.require_or_load('application') unless Object.const_defined?(:ApplicationController) ActiveRecord::Base.verify_active_connections! if defined?(ActiveRecord) run_preparation_callbacks end -- cgit v1.2.3