diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-16 03:09:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-16 03:09:09 +0300 |
| commit | 72179bac11e9c18ea623e30594d6d427ef63db36 (patch) | |
| tree | 601bc4fbb0a6c30ac866f11f278d80f920440c11 /doc/api/settings.md | |
| parent | 9922389a501dfde79037426fa6d09144ee5f7e1a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api/settings.md')
| -rw-r--r-- | doc/api/settings.md | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index 913a3699fe4..6322f14442c 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -87,7 +87,10 @@ Example response: "personal_access_token_prefix": "GL-", "rate_limiting_response_text": null, "keep_latest_artifact": true, - "admin_mode": false + "admin_mode": false, + "external_pipeline_validation_service_timeout": null, + "external_pipeline_validation_service_token": null, + "external_pipeline_validation_service_url": null } ``` @@ -183,7 +186,10 @@ Example response: "personal_access_token_prefix": "GL-", "rate_limiting_response_text": null, "keep_latest_artifact": true, - "admin_mode": false + "admin_mode": false, + "external_pipeline_validation_service_timeout": null, + "external_pipeline_validation_service_token": null, + "external_pipeline_validation_service_url": null } ``` @@ -283,6 +289,9 @@ listed in the descriptions of the relevant settings. | `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:<br>`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:<br>`external_authorization_service_enabled` | URL to which authorization requests are directed. | +| `external_pipeline_validation_service_url` | string | no | URL to which pipeline validation requests are directed. | +| `external_pipeline_validation_service_token` | string | no | An optional token to include as the `X-Gitlab-Token` header in requests to the URL in external_pipeline_validation_service_url. | +| `external_pipeline_validation_service_timeout` | integer | no | How long to wait for a response from the pipeline validation service before giving up and assuming 'OK'. | | `file_template_project_id` | integer | no | **(PREMIUM)** The ID of a project to load custom file templates from | | `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`. | |