Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update asset helpers to use `config.assets.prefix`

Fixes #1489
  • Loading branch information...
commit 2684f17a17e4f97bdb89d20b4cd08585235263a2 1 parent c00da25
@josh josh authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 actionpack/lib/sprockets/helpers/rails_helper.rb
View
4 actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -67,13 +67,13 @@ def debug_assets?
def asset_path(source, default_ext = nil, body = false)
source = source.logical_path if source.respond_to?(:logical_path)
- path = asset_paths.compute_public_path(source, 'assets', default_ext, true)
+ path = asset_paths.compute_public_path(source, Rails.application.config.assets.prefix, default_ext, true)
body ? "#{path}?body=1" : path
end
class AssetPaths < ActionView::Helpers::AssetPaths #:nodoc:
def compute_public_path(source, dir, ext=nil, include_host=true)
- super(source, 'assets', ext, include_host)
+ super(source, Rails.application.config.assets.prefix, ext, include_host)
end
def asset_for(source, ext)

7 comments on commit 2684f17

@jamesarosen

This doesn't seem to be in v3.1.0.rc4 even though that was released two days after this commit. Any idea when this will make it into an RC?

@docunext

Somehow this commit has been left out - its not in 3.1.0 or 3.1.1rc1... how can this get reconciled?

@kalbasit

@docunext maybe submit a new pull request ?

@spastorino
Owner

Provide a pull request and please add tests.

@docunext

Great, thank you. I can write the tests and create a pull request.

@docunext

I have forked, patched, committed, and created a pull request:

#3092

Please sign in to comment.
Something went wrong with that request. Please try again.