Skip to content

Commit

Permalink
Remove temporary crutch to help ApplicationController be unloaded. Cl…
Browse files Browse the repository at this point in the history
…oses #6496.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5454 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information
seckar committed Nov 7, 2006
1 parent 57a3e44 commit e51112c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion railties/lib/dispatcher.rb
Expand Up @@ -101,7 +101,7 @@ def prepare_application
end end


prepare_breakpoint 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) ActiveRecord::Base.verify_active_connections! if defined?(ActiveRecord)
run_preparation_callbacks run_preparation_callbacks
end end
Expand Down

0 comments on commit e51112c

Please sign in to comment.