Don't indiscriminately overwrite the `webpack.dev_server.https` config value.

- Currently (in development), the `webpack.dev_server.https` config value is
  overridden by the `gitlab.https` config value.

- This assumes that when GitLab is running on HTTPS, webpack will be running on
  HTTPS, and when GitLab is running on HTTP, webpack will be running on HTTP.
  This is not always the case in a development environment.

- This commit only performs this override if `webpack.dev_server.https` is unset.

1 files changed, 1 insertions, 1 deletions

diff --git a/config/initializers/static_files.rb b/config/initializers/static_files.rb
index 74aba6c5d06..b26835d0258 100644
--- a/config/initializers/static_files.rb
+++ b/config/initializers/static_files.rb
@@ -24,13 +24,13 @@ if app.config.serve_static_files
       port: dev_server.port,
       manifest_host: dev_server.host,
       manifest_port: dev_server.port,
+      https: dev_server.https || Gitlab.config.gitlab.https,
     }
 
     if Rails.env.development?
       settings.merge!(
         host: Gitlab.config.gitlab.host,
         port: Gitlab.config.gitlab.port,
-        https: Gitlab.config.gitlab.https,
       )
       app.config.middleware.insert_before(
         Gitlab::Middleware::Static,