Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #3000 from guilleiguaran/fix-relative-url-root

Fix for relative url root in assets
  • Loading branch information...
commit 8a005ff5046bd78f71578dfbc19460cdbe2f0537 2 parents 536bb7b + f509b69
@spastorino spastorino authored
Showing with 2 additions and 4 deletions.
  1. +2 −4 actionpack/lib/sprockets/helpers/rails_helper.rb
View
6 actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -17,7 +17,6 @@ def asset_paths
paths.asset_digests = asset_digests
paths.compile_assets = compile_assets?
paths.digest_assets = digest_assets?
- paths.relative_url_root = config.action_controller.relative_url_root
paths
end
end
@@ -97,8 +96,7 @@ def asset_environment
end
class AssetPaths < ::ActionView::AssetPaths #:nodoc:
- attr_accessor :asset_environment, :asset_prefix, :asset_digests, :compile_assets,
- :digest_assets, :relative_url_root
+ attr_accessor :asset_environment, :asset_prefix, :asset_digests, :compile_assets, :digest_assets
class AssetNotPrecompiledError < StandardError; end
@@ -153,7 +151,7 @@ def rewrite_extension(source, dir, ext)
end
def relative_url_root
- has_request? ? super : @relative_url_root
+ has_request? ? super : config.action_controller.relative_url_root
end
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.