diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-09-18 09:00:14 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-09-18 09:00:14 +0000 |
| commit | d86bbe012644c672874ccd99d68847b751c4b635 (patch) | |
| tree | 024e07b3dc4f625973ae05aa75d3848bff464a33 /config | |
| parent | fc504b887af54c62b247201282c14ccb45d9f479 (diff) | |
| parent | 8a13032da70765ee1258a47a76a198f106584b3b (diff) | |
| download | gitlab-ce-d86bbe012644c672874ccd99d68847b751c4b635.tar.gz | |
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
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/static_files.rb | 2 |
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, |