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

Merge branch 'fix-dev-ssl' into 'master'
d86bbe01 · Grzegorz Bizon · fc504b88 · 8a13032d · d86bbe01
Commit d86bbe01 authored Sep 18, 2017 by Grzegorz Bizon
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

static_files.rb config/initializers/static_files.rb +1 -1

No files found.
--- a/config/initializers/static_files.rb
+++ b/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,