diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-06 09:03:52 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-06 09:03:52 -0700 |
| commit | 1e61f2603caaa2e608294b6e563fd2251e349eda (patch) | |
| tree | 5dddfae98642005d859350e56bdeba923fb31f3d /actionpack/lib/sprockets | |
| parent | 9bde73ff72812f6f3c59ad97be6ca6c628e109ea (diff) | |
| parent | 6fc518e2ec59ec00076aaca08b9e3df3baee54a3 (diff) | |
| download | rails-1e61f2603caaa2e608294b6e563fd2251e349eda.tar.gz rails-1e61f2603caaa2e608294b6e563fd2251e349eda.tar.bz2 rails-1e61f2603caaa2e608294b6e563fd2251e349eda.zip | |
Merge pull request #2889 from guilleiguaran/perform-caching-assets
config.action_controller.perform_caching isn't used anymore in asset pipeline
Diffstat (limited to 'actionpack/lib/sprockets')
| -rw-r--r-- | actionpack/lib/sprockets/railtie.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb index 7927b7bc2c..dc991636a1 100644 --- a/actionpack/lib/sprockets/railtie.rb +++ b/actionpack/lib/sprockets/railtie.rb @@ -71,7 +71,7 @@ module Sprockets mount app.assets => config.assets.prefix end - if config.action_controller.perform_caching + if config.assets.digest app.assets = app.assets.index end end |