]> cat aescling's git repositories - mastodon.git/commitdiff
Fix CDN_HOST not affected on full_asset_url (#18662)
authorJeong Arm <kjwonmail@gmail.com>
Thu, 23 Jun 2022 21:09:32 +0000 (06:09 +0900)
committeraescling <aescling+gitlab@cat.family>
Mon, 5 Sep 2022 04:27:52 +0000 (00:27 -0400)
* Fix CDN_HOST not affected to assets url

* Fix typo

app/helpers/routing_helper.rb

index f95f46a5609755e3047a41363c2ffb59275f5b74..0d5a8505a20486be79c3352bdc8bf9192e151ab4 100644 (file)
@@ -16,7 +16,11 @@ module RoutingHelper
   def full_asset_url(source, **options)
     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
 
   def full_pack_url(source, **options)