Merge branch 'dm-relative-url-root-in-development' into 'master'

Fix various bugs related to relative_url_root in development

See merge request gitlab-org/gitlab-ce!19213

2 files changed, 6 insertions, 1 deletions

diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb
index 0d31934347f..deaa14c8434 100644
--- a/lib/gitlab/gon_helper.rb
+++ b/lib/gitlab/gon_helper.rb
@@ -11,7 +11,7 @@ module Gitlab
       gon.asset_host             = ActionController::Base.asset_host
       gon.webpack_public_path    = webpack_public_path
       gon.relative_url_root      = Gitlab.config.gitlab.relative_url_root
-      gon.shortcuts_path         = help_page_path('shortcuts')
+      gon.shortcuts_path         = Gitlab::Routing.url_helpers.help_page_path('shortcuts')
       gon.user_color_scheme      = Gitlab::ColorSchemes.for_user(current_user).css_class
       gon.sentry_dsn             = Gitlab::CurrentSettings.clientside_sentry_dsn if Gitlab::CurrentSettings.clientside_sentry_enabled
       gon.gitlab_url             = Gitlab.config.gitlab.url
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)