diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2009-02-06 12:13:44 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-02-06 12:13:44 +0100 |
| commit | 7a5da7ce785616d79843dfebbb5107be8b46f8c5 (patch) | |
| tree | 355145e59fbf166b8f2cde23dc8a13b188384c7e /actionpack/lib/action_controller/dispatcher.rb | |
| parent | 81c7a5d48d972c9e3973b4c018fafae1dfd9c0de (diff) | |
| parent | be098f840614bbb71fe26f0e2b4c064b6866c076 (diff) | |
| download | rails-7a5da7ce785616d79843dfebbb5107be8b46f8c5.tar.gz rails-7a5da7ce785616d79843dfebbb5107be8b46f8c5.tar.bz2 rails-7a5da7ce785616d79843dfebbb5107be8b46f8c5.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/dispatcher.rb')
| -rw-r--r-- | actionpack/lib/action_controller/dispatcher.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb index 781bc48887..9374a7f060 100644 --- a/actionpack/lib/action_controller/dispatcher.rb +++ b/actionpack/lib/action_controller/dispatcher.rb @@ -7,7 +7,6 @@ module ActionController unless cache_classes # Development mode callbacks before_dispatch :reload_application - after_dispatch :cleanup_application ActionView::Helpers::AssetTagHelper.cache_asset_timestamps = false end @@ -93,11 +92,9 @@ module ActionController run_callbacks :prepare_dispatch Routing::Routes.reload - end - # Cleanup the application by clearing out loaded classes so they can - # be reloaded on the next request without restarting the server. - def cleanup_application + # Cleanup the application by clearing out loaded classes so they can + # be reloaded on the next request without restarting the server. ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord) ActiveSupport::Dependencies.clear ActiveRecord::Base.clear_reloadable_connections! if defined?(ActiveRecord) |