aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorIlya Grigorik <ilya@igvita.com>2011-08-05 22:55:56 -0700
committerIlya Grigorik <ilya@igvita.com>2011-08-05 22:55:56 -0700
commitc0bfb5a63c926abcee8df26ed7b7598ef763463a (patch)
tree3d8d8df40b2550a6e51dfe2c1149b1bf5729ba4e /actionpack
parentfe55f5e5818698ff627d032f12a2cbbffdd7e739 (diff)
downloadrails-c0bfb5a63c926abcee8df26ed7b7598ef763463a.tar.gz
rails-c0bfb5a63c926abcee8df26ed7b7598ef763463a.tar.bz2
rails-c0bfb5a63c926abcee8df26ed7b7598ef763463a.zip
use assets.version in asset checksum to allow user to easily override
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/sprockets/railtie.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index 0c2eb5075b..e1db3c52a3 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -20,7 +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
+ env.version = ::Rails.env + '-' + config.assets.version
if config.assets.cache_store != false
env.cache = ActiveSupport::Cache.lookup_store(config.assets.cache_store) || ::Rails.cache