diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-05-17 13:39:44 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-05-17 13:39:55 -0500 |
| commit | 092089015b79752c5e9d664b3eeefef9e2223e36 (patch) | |
| tree | 69887f3ae3dbc479cb4f2571930f0a46024bbb46 /railties | |
| parent | edc9c226d11e6104d191ceeb6416c7062ceda54a (diff) | |
| download | rails-092089015b79752c5e9d664b3eeefef9e2223e36.tar.gz rails-092089015b79752c5e9d664b3eeefef9e2223e36.tar.bz2 rails-092089015b79752c5e9d664b3eeefef9e2223e36.zip | |
Extract generic callbacks middleware from dispatcher
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/console_app.rb | 5 | ||||
| -rw-r--r-- | railties/lib/initializer.rb | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/railties/lib/console_app.rb b/railties/lib/console_app.rb index c944d49205..42bf50e01e 100644 --- a/railties/lib/console_app.rb +++ b/railties/lib/console_app.rb @@ -26,8 +26,7 @@ end #reloads the environment def reload! puts "Reloading..." - dispatcher = ActionController::Dispatcher.new - dispatcher.cleanup_application - dispatcher.reload_application + ActionController::Dispatcher.new + ActionController::Dispatcher.router.reload true end diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index b16f42b8a0..4c6de48a65 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -632,7 +632,6 @@ Run `rake gems:install` to install the missing gems. return unless configuration.frameworks.include?(:action_controller) require 'dispatcher' unless defined?(::Dispatcher) Dispatcher.define_dispatcher_callbacks(configuration.cache_classes) - Dispatcher.run_prepare_callbacks end def disable_dependency_loading |