diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-15 15:08:32 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-15 15:08:32 +0000 |
| commit | 9044365a91112d426fbbfba07eca595652bbe2df (patch) | |
| tree | a46df8721ca37ef4336375c201f783b4392f385a /config | |
| parent | 0820b29dca14bd22c2cee6d9ee2900b64385bfa6 (diff) | |
| download | gitlab-ce-9044365a91112d426fbbfba07eca595652bbe2df.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_categories.yml | 1 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/config/feature_categories.yml b/config/feature_categories.yml index 50776d92a30..1cae9875eac 100644 --- a/config/feature_categories.yml +++ b/config/feature_categories.yml @@ -21,7 +21,6 @@ - cloud_native_installation - cluster_cost_optimization - cluster_monitoring -- code_analytics - code_quality - code_review - collection diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index dc66b2adb70..5f078459bc2 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -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). |