diff options
| author | José Valim <jose.valim@gmail.com> | 2011-07-12 22:30:11 -0300 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-07-12 22:30:17 -0300 |
| commit | 8f0e0b63f526967fc13c78eedb5c3a28a8f6ee75 (patch) | |
| tree | 02047e886c85d74e9404c8ac5ed508f9f7b7792b /actionpack/lib/sprockets | |
| parent | 8cf45150dec7f30009d006e52c646acf6b615f89 (diff) | |
| download | rails-8f0e0b63f526967fc13c78eedb5c3a28a8f6ee75.tar.gz rails-8f0e0b63f526967fc13c78eedb5c3a28a8f6ee75.tar.bz2 rails-8f0e0b63f526967fc13c78eedb5c3a28a8f6ee75.zip | |
assets.cache_store now defaults to filesystem. You will want to share tmp/assets_cache between deploys.
Diffstat (limited to 'actionpack/lib/sprockets')
| -rw-r--r-- | actionpack/lib/sprockets/railtie.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb index e0124def2b..4906ad9a9c 100644 --- a/actionpack/lib/sprockets/railtie.rb +++ b/actionpack/lib/sprockets/railtie.rb @@ -63,8 +63,8 @@ module Sprockets env.logger = Rails.logger - if env.respond_to?(:cache) - env.cache = assets.cache_store || Rails.cache + if env.respond_to?(:cache) && assets.cache_store != false + env.cache = ActiveSupport::Cache.lookup_store(assets.cache_store) || Rails.cache end if assets.compress |