Commit 6fe736f2 authored by Douwe Maan's avatar Douwe Maan

Merge branch '35567-fix-relative-urls-in-webpack-public-path' into 'master'

Fix relative_url_root support for webpack chunks

Closes #35567

See merge request !13165
parents 9a3b2834 eac8ae0f
...@@ -34,6 +34,8 @@ module WebpackHelper ...@@ -34,6 +34,8 @@ module WebpackHelper
end end
def webpack_public_path def webpack_public_path
"#{webpack_public_host}/#{Rails.application.config.webpack.public_path}/" relative_path = Rails.application.config.relative_url_root
webpack_path = Rails.application.config.webpack.public_path
File.join(webpack_public_host.to_s, relative_path.to_s, webpack_path.to_s, '')
end end
end end
---
title: Fix asynchronous javascript paths when GitLab is installed under a relative
URL
merge_request: 13165
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment