diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-12 23:04:14 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-12 23:04:14 -0700 |
| commit | 038e45a2b6a71175ffe368ae9d7c920f7d1230a6 (patch) | |
| tree | 3b94e70dd6b817fe14ced50318faab6cdb97cfa1 /actionpack | |
| parent | f65b2215cd5ab54d3aca2095f51429b7e503431f (diff) | |
| parent | 21eaba4c39773af3e7b279325fb8d6b5ab474ef0 (diff) | |
| download | rails-038e45a2b6a71175ffe368ae9d7c920f7d1230a6.tar.gz rails-038e45a2b6a71175ffe368ae9d7c920f7d1230a6.tar.bz2 rails-038e45a2b6a71175ffe368ae9d7c920f7d1230a6.zip | |
Merge pull request #2987 from kennyj/master
fix https://github.com/rails/rails/issues/2947 (with testcase)
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/sprockets/assets.rake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake index db0ddad3c2..0531b1509b 100644 --- a/actionpack/lib/sprockets/assets.rake +++ b/actionpack/lib/sprockets/assets.rake @@ -16,6 +16,9 @@ namespace :assets do # Always compile files Rails.application.config.assets.compile = true + # Always ignore asset host + Rails.application.config.action_controller.asset_host = nil + config = Rails.application.config env = Rails.application.assets target = Pathname.new(File.join(Rails.public_path, config.assets.prefix)) |