diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-10-21 02:30:57 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-10-21 02:30:57 +0200 |
| commit | 68d84e259346c1bc3d8fd546162e5a93caf0bbdc (patch) | |
| tree | 60f6e71fcb669eb0f9b6b0bc70fa5c2a81a103f6 /actionpack/lib/action_controller | |
| parent | 9acb88e666269204821b78bec7b72d3d16597096 (diff) | |
| parent | 326030a1e843245ae493fbdfb1b5eb72d1e59f26 (diff) | |
| download | rails-68d84e259346c1bc3d8fd546162e5a93caf0bbdc.tar.gz rails-68d84e259346c1bc3d8fd546162e5a93caf0bbdc.tar.bz2 rails-68d84e259346c1bc3d8fd546162e5a93caf0bbdc.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/dispatcher.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb index 90c8400c11..28f8ce3d53 100644 --- a/actionpack/lib/action_controller/dispatcher.rb +++ b/actionpack/lib/action_controller/dispatcher.rb @@ -39,7 +39,7 @@ module ActionController # Add a preparation callback. Preparation callbacks are run before every # request in development mode, and before the first request in production # mode. - # + # # An optional identifier may be supplied for the callback. If provided, # to_prepare may be called again with the same identifier to replace the # existing callback. Passing an identifier is a suggested practice if the @@ -144,6 +144,7 @@ module ActionController Routing::Routes.reload ActionController::Base.view_paths.reload! + ActionView::Helpers::AssetTagHelper::AssetTag::Cache.clear end # Cleanup the application by clearing out loaded classes so they can |