Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Remove temporary crutch to help ApplicationController be unloaded. Cl…

…oses #6496.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5458 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit cbffafb497a4cedead9356d8c696eb52e0dc3de4 1 parent 84668af
@seckar seckar authored
Showing with 3 additions and 1 deletion.
  1. +2 −0  railties/CHANGELOG
  2. +1 −1  railties/lib/dispatcher.rb
View
2  railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Remove temporary crutch to help ApplicationController be unloaded. Closes #6496. [Nicholas Seckar]
+
* scaffold_resource generator uses _path named routes and head instead of render :nothing => true. #6545 [Josh Susser]
* Generator can show diff on file collision to help you decide whether to skip or overwrite. #6364 [jeffw, Jeremy Kemper]
View
2  railties/lib/dispatcher.rb
@@ -101,7 +101,7 @@ def prepare_application
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
Please sign in to comment.
Something went wrong with that request. Please try again.