diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 09:09:23 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 09:09:23 +0000 |
| commit | 4cb5e5011abfe8d50ac3a7ebd0018c563c6d7af4 (patch) | |
| tree | 82591df15758864325897043f855b4e4dfcb6a56 /doc/api/settings.md | |
| parent | 0301a0cad0063d76b1607358dc6c711ea043fdda (diff) | |
| download | gitlab-ce-4cb5e5011abfe8d50ac3a7ebd0018c563c6d7af4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api/settings.md')
| -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 1996f1ce144..2c75c175fdd 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -239,7 +239,7 @@ are listed in the descriptions of the relevant settings. | `external_auth_client_key_pass` | string | no | Passphrase to use for the private key when authenticating with the external service this is encrypted when stored | | `external_auth_client_key` | string | required by: `external_auth_client_cert` | Private key for the certificate when authentication is required for the external authorization service, this is encrypted when stored | | `external_authorization_service_default_label` | string | required by: `external_authorization_service_enabled` | The default classification label to use when requesting authorization and no classification label has been specified on the project | -| `external_authorization_service_enabled` | boolean | no | (**If enabled, requires:** `external_authorization_service_default_label`, `external_authorization_service_timeout` and `external_authorization_service_url` ) Enable using an external authorization service for accessing projects | +| `external_authorization_service_enabled` | boolean | no | (**If enabled, requires:** `external_authorization_service_default_label`, `external_authorization_service_timeout` and `external_authorization_service_url`) Enable using an external authorization service for accessing projects | | `external_authorization_service_timeout` | float | required by: `external_authorization_service_enabled` | The timeout after which an authorization request is aborted, in seconds. When a request times out, access is denied to the user. (min: 0.001, max: 10, step: 0.001) | | `external_authorization_service_url` | string | required by: `external_authorization_service_enabled` | URL to which authorization requests will be directed | | `file_template_project_id` | integer | no | **(PREMIUM)** The ID of a project to load custom file templates from | |