Use URI.join for generate asset URL (mastodon#2741)

* Use URI.join for generate asset URL * to String
hachyderm · May 3, 2017 · 2ab7dc9 · 2ab7dc9
1 parent 2b9bc9c
commit 2ab7dc9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb
@@ -12,6 +12,6 @@ def default_url_options
   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