diff options
| author | José Valim <jose.valim@gmail.com> | 2011-07-06 17:59:56 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-07-06 17:59:56 -0700 |
| commit | 86e2f888e7a3b96f880ab33bfcf4fbf275a40544 (patch) | |
| tree | a402ee672d1c9fc10554e6fef8d8491362af7a54 /actionpack | |
| parent | 2f6e3895a8ea2a39e43525aba91a6dbca977ef6a (diff) | |
| download | rails-86e2f888e7a3b96f880ab33bfcf4fbf275a40544.tar.gz rails-86e2f888e7a3b96f880ab33bfcf4fbf275a40544.tar.bz2 rails-86e2f888e7a3b96f880ab33bfcf4fbf275a40544.zip | |
Give higher priority to assets.cache_store.
Diffstat (limited to 'actionpack')
| -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 970773c6a4..2020f8f095 100644 --- a/actionpack/lib/sprockets/railtie.rb +++ b/actionpack/lib/sprockets/railtie.rb @@ -62,7 +62,7 @@ module Sprockets env.logger = Rails.logger if env.respond_to?(:cache) - env.cache = Rails.cache + env.cache = assets.cache_store || Rails.cache end if assets.compress |