Commit 9fd594b7 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'bvl-fix-setting-name' into 'master'

Fix incorrect configuration name

See merge request gitlab-org/gitlab!23069
parents 241c0ab1 c4695a36
......@@ -35,7 +35,7 @@ production: &base
https: false # Set to true if using HTTPS, see installation.md#using-https for additional HTTPS configuration details
# The maximum time unicorn/puma can spend on the request. This needs to be smaller than the worker timeout.
# Default is 95% of the worker timeout
max_request_duration: 57
max_request_duration_seconds: 57
# Uncomment this line below if your ssh host is different from HTTP/HTTPS one
# (you'd obviously need to replace ssh.host_example.com with your own host).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment