diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-01-05 14:01:08 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-01-05 14:01:08 +0000 |
| commit | e74908244f4e45c468a041cf40d22880f6bd5a32 (patch) | |
| tree | 004d46ac0b4194900d593f05e5d6f36212b79dec | |
| parent | 6c2a35fe4865a50338b38f89279813130c0a6cba (diff) | |
| parent | 0a02b0d8eada41b72d19bee3f963d7cee5b19c57 (diff) | |
| download | gitlab-ce-e74908244f4e45c468a041cf40d22880f6bd5a32.tar.gz | |
Merge branch 'master' into 'master'
Update settings.md
See merge request gitlab-org/gitlab-ce!16233
| -rw-r--r-- | doc/api/settings.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index 0e4758cda2d..0b5b1f0c134 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -69,7 +69,7 @@ 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_access_retries | integer | no | The number of attempts GitLab will make to access a storage. | +| `circuitbreaker_access_retries` | integer | no | The number of attempts GitLab will make to access a storage. | | `circuitbreaker_check_interval` | integer | no | Number of seconds in between storage checks. | | `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. | |