diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-11-21 03:30:06 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-11-21 03:30:06 +0100 |
| commit | 6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52 (patch) | |
| tree | 96bd668692b62d3829322232877b70c9011ce446 /actionpack/lib/action_view/railtie.rb | |
| parent | f326221c701e4f9d991e3eadcc793a73795fb218 (diff) | |
| parent | 7c51d1fcf9dc504c2dfd6e7184bbe8186f09819d (diff) | |
| download | rails-6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52.tar.gz rails-6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52.tar.bz2 rails-6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_view/railtie.rb')
| -rw-r--r-- | actionpack/lib/action_view/railtie.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/railtie.rb b/actionpack/lib/action_view/railtie.rb index 33dfcbb803..71cd1a788a 100644 --- a/actionpack/lib/action_view/railtie.rb +++ b/actionpack/lib/action_view/railtie.rb @@ -8,10 +8,10 @@ module ActionView config.action_view.stylesheet_expansions = {} config.action_view.javascript_expansions = { :defaults => ['prototype', 'effects', 'dragdrop', 'controls', 'rails'] } - initializer "action_view.cache_asset_timestamps" do |app| + initializer "action_view.cache_asset_ids" do |app| unless app.config.cache_classes ActiveSupport.on_load(:action_view) do - ActionView::Helpers::AssetTagHelper.cache_asset_timestamps = false + ActionView::Helpers::AssetTagHelper::AssetPaths.cache_asset_ids = false end end end |