diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-06-29 18:27:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-29 18:27:34 +0200 |
| commit | 54ed35f57c55fff639c8192b99fc60ab69c54f06 (patch) | |
| tree | 78cee27bfe871569f3ae2e7aa62d847fe9df7046 /app/helpers | |
| parent | 63f79874b59b3ba28c0f940b9d36ea7aacb44c93 (diff) | |
| parent | 485b43ed7e312ab2c3bad446132c57d6a0ce7de4 (diff) | |
Merge pull request #1801 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/routing_helper.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb index f95f46a56..0d5a8505a 100644 --- a/app/helpers/routing_helper.rb +++ b/app/helpers/routing_helper.rb @@ -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) |