summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessio Caiazza <acaiazza@gitlab.com>2017-09-15 14:40:50 +0200
committerAlessio Caiazza <acaiazza@gitlab.com>2017-09-15 14:41:52 +0200
commit8a13032da70765ee1258a47a76a198f106584b3b (patch)
tree38b885c2fb04aba04baced02e9f8e4ffe8577035
parent20295b3db379f4be02521cac591feca3452a2b1c (diff)
downloadgitlab-ce-fix-dev-ssl.tar.gz
Never connect to webpack-dev-server over SSLfix-dev-ssl
-rw-r--r--config/initializers/static_files.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/static_files.rb b/config/initializers/static_files.rb
index 943e01f1496..d3a7a2b9f8b 100644
--- 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,