summaryrefslogtreecommitdiff
path: root/config/initializers/static_files.rb
diff options
context:
space:
mode:
Diffstat (limited to 'config/initializers/static_files.rb')
-rw-r--r--config/initializers/static_files.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/initializers/static_files.rb b/config/initializers/static_files.rb
index e02f0868e9f..b8e555d4f5e 100644
--- a/config/initializers/static_files.rb
+++ b/config/initializers/static_files.rb
@@ -21,16 +21,16 @@ if app.config.public_file_server.enabled
settings = {
enabled: true,
host: dev_server.host,
- port: dev_server.port,
manifest_host: dev_server.host,
- manifest_port: dev_server.port
+ manifest_port: dev_server.port,
+ port: dev_server.port
}
if Rails.env.development?
settings.merge!(
host: Gitlab.config.gitlab.host,
port: Gitlab.config.gitlab.port,
- https: false
+ https: Gitlab.config.gitlab.https
)
app.config.middleware.insert_before(
Gitlab::Middleware::Static,