Merge branch 'fix-dev-ssl' into 'master'

Never connect to webpack-dev-server over SSL in dev mode

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

config/initializers/static_files.rb

@@ -30,7 +30,7 @@ if app.config.serve_static_files
       settings.merge!(
         host: Gitlab.config.gitlab.host,
         port: Gitlab.config.gitlab.port,
-        https: Gitlab.config.gitlab.https
+        https: false
       )
       app.config.middleware.insert_before(
         Gitlab::Middleware::Static,