diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-20 19:05:56 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-20 19:07:49 -0300 |
| commit | 54f55746a70a7091341e84236498203118a7fbb4 (patch) | |
| tree | 282154d3911fc937db26fe9bd9126bd2abb4b040 /actionpack/lib | |
| parent | e4018a00fdfb6b0586c42d4a25a005b5ca416173 (diff) | |
| download | rails-54f55746a70a7091341e84236498203118a7fbb4.tar.gz rails-54f55746a70a7091341e84236498203118a7fbb4.tar.bz2 rails-54f55746a70a7091341e84236498203118a7fbb4.zip | |
Revert "Respect `config.digest = false` for `asset_path`"
This reverts commit 1ac19c11792a745cd654f02dfaed8e93f95b3c70.
Conflicts:
actionpack/CHANGELOG.md
Reason: This is causing failures in the railties build.
See http://travis-ci.org/#!/rails/rails/jobs/2491787
Related with #7672
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index 690c71b472..8f0e0f8ee1 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -147,9 +147,7 @@ module Sprockets if source[0] == ?/ source else - if digest_assets && options[:digest] != false - source = digest_for(source) - end + source = digest_for(source) unless options[:digest] == false source = File.join(dir, source) source = "/#{source}" unless source =~ /^\// source |