diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-10-17 16:02:32 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-10-17 16:02:32 -0700 |
| commit | 891a9ce8b0839fb478ca5704022b2e921097fe27 (patch) | |
| tree | ec314e86f62f046cb96650be6d076276f23ff453 /doc/api/settings.md | |
| parent | bd46c8abfd5ee964c47eff0ace021e45cbbe6687 (diff) | |
| parent | b3f749036ea919de3982c81b157ab2d790ecb4c5 (diff) | |
| download | gitlab-ce-891a9ce8b0839fb478ca5704022b2e921097fe27.tar.gz | |
Merge branch 'master' into sh-security-fix-backports-master
Diffstat (limited to 'doc/api/settings.md')
| -rw-r--r-- | doc/api/settings.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index be75e1b66ba..664f3ef7b77 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -69,6 +69,10 @@ PUT /application/settings | `after_sign_up_text` | string | no | Text shown to the user after signing up | | `akismet_api_key` | string | no | API key for akismet spam protection | | `akismet_enabled` | boolean | no | Enable or disable akismet spam protection | +| `circuitbreaker_failure_count_threshold` | integer | no | The number of failures of after which GitLab will completely prevent access to the storage. | +| `circuitbreaker_failure_reset_time` | integer | no | Time in seconds GitLab will keep storage failure information. When no failures occur during this time, the failure information is reset. | +| `circuitbreaker_failure_wait_time` | integer | no | Time in seconds GitLab will block access to a failing storage to allow it to recover. | +| `circuitbreaker_storage_timeout` | integer | no | Seconds to wait for a storage access attempt | | `clientside_sentry_dsn` | string | no | Required if `clientside_sentry_dsn` is enabled | | `clientside_sentry_enabled` | boolean | no | Enable Sentry error reporting for the client side | | `container_registry_token_expire_delay` | integer | no | Container Registry token duration in minutes | |