diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-26 08:16:02 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-26 08:16:02 -0700 |
| commit | 2c3a5075b683f079b6b53f121137d3c38e47a8ef (patch) | |
| tree | 0d586f5a98fdd3810af19f5295e008a04802a96d /actionpack/lib/sprockets/helpers/rails_helper.rb | |
| parent | 3b87c38d029c1626161a3e7699d40da3e789d7cb (diff) | |
| parent | 793e9da63d74a082281d41c2bc90e7bd02adcde4 (diff) | |
| download | rails-2c3a5075b683f079b6b53f121137d3c38e47a8ef.tar.gz rails-2c3a5075b683f079b6b53f121137d3c38e47a8ef.tar.bz2 rails-2c3a5075b683f079b6b53f121137d3c38e47a8ef.zip | |
Merge pull request #3135 from christos/respect_assets_digest_value
Give precedence to `config.digest = false` over the existence of manifest.yml asset digests
Diffstat (limited to 'actionpack/lib/sprockets/helpers/rails_helper.rb')
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index 62bfcb24dd..fe37553fc1 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -118,7 +118,7 @@ module Sprockets end def digest_for(logical_path) - if asset_digests && (digest = asset_digests[logical_path]) + if digest_assets && asset_digests && (digest = asset_digests[logical_path]) return digest end |