summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-07-28 12:49:07 -0500
committerMike Greiling <mike@pixelcog.com>2017-07-28 12:49:07 -0500
commitebd5f5148894888c118e95239fc437141c8e6b41 (patch)
treebf0b680d1098ed4aedc6c99927f84f8b0e75fab9
parentbb23d462fa8bb270698e6e83c479884803658162 (diff)
downloadgitlab-ce-ebd5f5148894888c118e95239fc437141c8e6b41.tar.gz
fix relative_url_root support for webpack chunks
-rw-r--r--app/helpers/webpack_helper.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/webpack_helper.rb b/app/helpers/webpack_helper.rb
index 0386df22374..33453dd178f 100644
--- a/app/helpers/webpack_helper.rb
+++ b/app/helpers/webpack_helper.rb
@@ -34,6 +34,8 @@ module WebpackHelper
end
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