diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-06 20:43:16 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-06 20:43:16 +0100 |
| commit | d14967e1c825eae1288c7a5bb1a30f49f174f857 (patch) | |
| tree | 3750d94275b1393d378ee48bdd8c8b7411f3b505 /app/helpers | |
| parent | 45230c56ab10cd40d7a2e6e241dd30ae4e40e6b0 (diff) | |
Fix URL configuration when S3 is enabled
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/routing_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |