diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-05 15:09:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-05 15:09:31 +0300 |
| commit | 64f7eb2b37aebbb713463b2f6971b13191c1b0db (patch) | |
| tree | 186ce376859dc04055a20d87945556eec63acd68 /doc/api/settings.md | |
| parent | 315243f87739dd1edda2b75361f826abc91d4069 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api/settings.md')
| -rw-r--r-- | doc/api/settings.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index 6c996caed7b..05ea25a1955 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -282,6 +282,7 @@ listed in the descriptions of the relevant settings. | `first_day_of_week` | integer | no | Start day of the week for calendar views and date pickers. Valid values are `0` (default) for Sunday, `1` for Monday, and `6` for Saturday. | | `geo_node_allowed_ips` | string | yes | **(PREMIUM)** Comma-separated list of IPs and CIDRs of allowed secondary nodes. For example, `1.1.1.1, 2.2.2.0/24`. | | `geo_status_timeout` | integer | no | **(PREMIUM)** The amount of seconds after which a request to get a secondary node status times out. | +| `git_two_factor_session_expiry` | integer | no | **(PREMIUM)** Maximum duration (in minutes) of a session for Git operations when 2FA is enabled. | | `gitaly_timeout_default` | integer | no | Default Gitaly timeout, in seconds. This timeout is not enforced for Git fetch/push operations or Sidekiq jobs. Set to `0` to disable timeouts. | | `gitaly_timeout_fast` | integer | no | Gitaly fast operation timeout, in seconds. Some Gitaly operations are expected to be fast. If they exceed this threshold, there may be a problem with a storage shard and 'failing fast' can help maintain the stability of the GitLab instance. Set to `0` to disable timeouts. | | `gitaly_timeout_medium` | integer | no | Medium Gitaly timeout, in seconds. This should be a value between the Fast and the Default timeout. Set to `0` to disable timeouts. | |