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

Fix for relative url root in assets

1 files changed, 2 insertions, 4 deletions

diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index f9135d43d2..5785da5124 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -17,7 +17,6 @@ module Sprockets
           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 @@ module Sprockets
       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 @@ module Sprockets
         end
 
         def relative_url_root
-          has_request? ? super : @relative_url_root
+          has_request? ? super : config.action_controller.relative_url_root
         end
       end
     end