3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CDN_HOST not affected on full_asset_url (#18662) 

* Fix CDN_HOST not affected to assets url

* Fix typo
rebase/4.0.0rc1
Jeong Arm 2022-06-24 06:09:32 +09:00 committed by GitHub
parent 65ad589848
commit 6c2d3038f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/helpers/routing_helper.rb
View File

@ -16,7 +16,11 @@ module RoutingHelper
def full_asset_url(source, **options) def full_asset_url(source, **options)
source = ActionController::Base.helpers.asset_url(source, **options) unless use_storage? source = ActionController::Base.helpers.asset_url(source, **options) unless use_storage?
URI.join(root_url, source).to_s URI.join(asset_host, source).to_s
end
def asset_host
Rails.configuration.action_controller.asset_host || root_url
end end
def full_pack_url(source, **options) def full_pack_url(source, **options)