diff options
| author | Douwe Maan <douwe@selenight.nl> | 2018-05-29 16:03:14 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2018-05-29 16:03:14 +0300 |
| commit | 033b44eb614e7ef4e00f3fcbf13b6d5d751ba80b (patch) | |
| tree | 16037354972b82f0d250d41b7492670047929785 /lib/gitlab/webpack | |
| parent | 6b7a70d2018eae437c86fea6795ed97ba1e599bc (diff) | |
Fix various bugs related to relative_url_root in development
Diffstat (limited to 'lib/gitlab/webpack')
| -rw-r--r-- | lib/gitlab/webpack/dev_server_middleware.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/gitlab/webpack/dev_server_middleware.rb b/lib/gitlab/webpack/dev_server_middleware.rb index b9a75eaac63..529f7d6a8d6 100644 --- a/lib/gitlab/webpack/dev_server_middleware.rb +++ b/lib/gitlab/webpack/dev_server_middleware.rb @@ -15,6 +15,11 @@ module Gitlab def perform_request(env) if @proxy_path && env['PATH_INFO'].start_with?("/#{@proxy_path}") + if relative_url_root = Rails.application.config.relative_url_root + env['SCRIPT_NAME'] = "" + env['REQUEST_PATH'].sub!(/\A#{Regexp.escape(relative_url_root)}/, '') + end + super(env) else @app.call(env) |