diff options
| author | Ilya Grigorik <ilya@igvita.com> | 2011-08-04 23:55:31 -0400 |
|---|---|---|
| committer | Ilya Grigorik <ilya@igvita.com> | 2011-08-04 23:55:31 -0400 |
| commit | fe55f5e5818698ff627d032f12a2cbbffdd7e739 (patch) | |
| tree | 57009382e87c73bacc5a77929e5ceafd5605060a /actionpack/lib/sprockets | |
| parent | 050c1510b6041a0de21899de1c08d2b816ec0e66 (diff) | |
| parent | ed5c6d254c9ef5d44a11159561fddde7a3033874 (diff) | |
| download | rails-fe55f5e5818698ff627d032f12a2cbbffdd7e739.tar.gz rails-fe55f5e5818698ff627d032f12a2cbbffdd7e739.tar.bz2 rails-fe55f5e5818698ff627d032f12a2cbbffdd7e739.zip | |
Merge branch 'asset_hash_should_depend_on_env'
Diffstat (limited to 'actionpack/lib/sprockets')
| -rw-r--r-- | actionpack/lib/sprockets/railtie.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb index c8438e6043..0c2eb5075b 100644 --- a/actionpack/lib/sprockets/railtie.rb +++ b/actionpack/lib/sprockets/railtie.rb @@ -20,6 +20,7 @@ module Sprockets app.assets = Sprockets::Environment.new(app.root.to_s) do |env| env.static_root = File.join(app.root.join('public'), config.assets.prefix) env.logger = ::Rails.logger + env.version = ::Rails.env + '-' + env.version if config.assets.cache_store != false env.cache = ActiveSupport::Cache.lookup_store(config.assets.cache_store) || ::Rails.cache |