From d14967e1c825eae1288c7a5bb1a30f49f174f857 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 6 Nov 2016 20:43:16 +0100 Subject: Fix URL configuration when S3 is enabled --- app/helpers/routing_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/helpers/routing_helper.rb') diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb index 101382604..0512a4e0a 100644 --- a/app/helpers/routing_helper.rb +++ b/app/helpers/routing_helper.rb @@ -10,6 +10,6 @@ module RoutingHelper end def full_asset_url(source) - File.join(root_url, ActionController::Base.helpers.asset_url(source)) + Rails.configuration.x.use_s3 ? source : File.join(root_url, ActionController::Base.helpers.asset_url(source)) end end -- cgit