diff options
| author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-05-03 18:31:21 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-03 11:31:21 +0200 |
| commit | 2ab7dc9a551dee6adc17df57ccb698aa037dd4ec (patch) | |
| tree | 88229ec5a7d51dad4a6f05a9a9a3cd1009bd5dac /app/helpers | |
| parent | 2b9bc9c154b790738a839be0ec98e49e82450c60 (diff) | |
Use URI.join for generate asset URL (#2741)
* Use URI.join for generate asset URL * to String
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 9ae29ec91..9650ee286 100644 --- a/app/helpers/routing_helper.rb +++ b/app/helpers/routing_helper.rb @@ -12,6 +12,6 @@ module RoutingHelper end def full_asset_url(source) - Rails.configuration.x.use_s3 ? source : File.join(root_url, ActionController::Base.helpers.asset_url(source)) + Rails.configuration.x.use_s3 ? source : URI.join(root_url, ActionController::Base.helpers.asset_url(source)).to_s end end |