diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-17 19:16:31 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-17 19:27:35 +0100 |
| commit | fcce1f17eaf9993b0210fe8e2a8117b61a1f0f69 (patch) | |
| tree | dcf89fab841f873dd9c26b3f061f7d1c4e378f86 /actionpack/lib | |
| parent | 4b33fae1f52325d22083de2e83d827b924d1c616 (diff) | |
| download | rails-fcce1f17eaf9993b0210fe8e2a8117b61a1f0f69.tar.gz rails-fcce1f17eaf9993b0210fe8e2a8117b61a1f0f69.tar.bz2 rails-fcce1f17eaf9993b0210fe8e2a8117b61a1f0f69.zip | |
BACKWARDS INCOMPATIBLE: Renamed application.rb to application_controller.rb and removed all the special casing that was in place to support the former. You must do this rename in your own application when you upgrade to this version [DHH]
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/dispatcher.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb index 2d5e80f0bb..d93edf067c 100644 --- a/actionpack/lib/action_controller/dispatcher.rb +++ b/actionpack/lib/action_controller/dispatcher.rb @@ -12,14 +12,7 @@ module ActionController after_dispatch :cleanup_application end - # Common callbacks - to_prepare :load_application_controller do - begin - require_dependency 'application' unless defined?(::ApplicationController) - rescue LoadError => error - raise unless error.message =~ /application\.rb/ - end - end + to_prepare(:load_application_controller) { ApplicationController } if defined?(ActiveRecord) after_dispatch :checkin_connections |