diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-23 09:34:04 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-23 09:34:04 -0700 |
| commit | 5dcb269eb8c8730084734e845534d3b9580c40f4 (patch) | |
| tree | b9dd0df70acd36cdda25aea89c58f3a0b0751380 /actionpack/lib/sprockets | |
| parent | 36699977f2ddbb937aac97998d2d8503499c57e0 (diff) | |
| parent | c070cc4ab41fd848fc72f19e7f99d75b1e1fd097 (diff) | |
| download | rails-5dcb269eb8c8730084734e845534d3b9580c40f4.tar.gz rails-5dcb269eb8c8730084734e845534d3b9580c40f4.tar.bz2 rails-5dcb269eb8c8730084734e845534d3b9580c40f4.zip | |
Merge pull request #3092 from asee/master
Sprockets to use config.assets.prefix, with tests
Diffstat (limited to 'actionpack/lib/sprockets')
| -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 457ab93ae3..c569124c94 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -57,7 +57,7 @@ module Sprockets def asset_path(source, options = {}) source = source.logical_path if source.respond_to?(:logical_path) - path = asset_paths.compute_public_path(source, 'assets', options.merge(:body => true)) + path = asset_paths.compute_public_path(source, asset_prefix, options.merge(:body => true)) options[:body] ? "#{path}?body=1" : path end |