techhub/mastodon
2
0
Fork 0
Code Activity

Use URI.join even when S3 enabled (#4652)

Browse Source
This commit is contained in:
Yamagishi Kazutoshi
2017-08-21 19:42:16 +09:00
committed by Eugen Rochko
parent 6e9eda5331
commit 10e9a9a3f9
2 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/routing_helper.rb
View File

@@ -12,6 +12,8 @@ module RoutingHelper
end
def full_asset_url(source, options = {})
Rails.configuration.x.use_s3 ? source : URI.join(root_url, ActionController::Base.helpers.asset_url(source, options)).to_s
source = ActionController::Base.helpers.asset_url(source, options) unless Rails.configuration.x.use_s3
URI.join(root_url, source).to_s
end
end