diff options
Diffstat (limited to 'doc/api')
-rw-r--r-- | doc/api/index.md | 2 | ||||
-rw-r--r-- | doc/api/status_checks.md | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/doc/api/index.md b/doc/api/index.md index 6cdf64a01af..178c2f05a6d 100644 --- a/doc/api/index.md +++ b/doc/api/index.md @@ -28,7 +28,7 @@ For an introduction and basic steps, see ## SCIM API **(PREMIUM SAAS)** -GitLab provides an [SCIM API](scim.md) that both implements +GitLab provides a [SCIM API](scim.md) that both implements [the RFC7644 protocol](https://tools.ietf.org/html/rfc7644) and provides the `/Users` endpoint. The base URL is `/api/scim/v2/groups/:group_path/Users/`. diff --git a/doc/api/status_checks.md b/doc/api/status_checks.md index 1a41454e621..3671ddbd138 100644 --- a/doc/api/status_checks.md +++ b/doc/api/status_checks.md @@ -44,11 +44,17 @@ GET /projects/:id/merge_requests/:merge_request_iid/status_checks ## Set status of an external status check -> - Introduced in GitLab 14.9, `passed` status to pass external status checks. +> - Introduced in GitLab 14.9, `passed` status to pass external status checks. Introduced [with a flag](../administration/feature_flags.md) named `status_checks_add_status_field`. Disabled by default. +> - Introduced in GitLab 14.9, `failed` status to fail external status checks. Introduced [with a flag](../administration/feature_flags.md) named `status_checks_add_status_field`. Disabled by default. > - `pass` status to pass checks is [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/339039) in GitLab 14.9. Replaced with `passed`. +FLAG: +On self-managed GitLab, by default setting `passed` instead of `pass` is unavailable. Also, setting `failed` is unavailable by default. To support +setting `passed` and `failed` instead of only `pass`, ask an administrator to [enable the feature flag](../administration/feature_flags.md) named +`status_checks_add_status_field`. On GitLab.com, this feature is not available. + For a single merge request, use the API to inform GitLab that a merge request has passed a check by an external service. -To set the status of an external check, the personal access token used must belong to a user with at least the developer role on the target project of the merge request. +To set the status of an external check, the personal access token used must belong to a user with at least the Developer role on the target project of the merge request. Execute this API call as any user with rights to approve the merge request itself. @@ -64,8 +70,8 @@ POST /projects/:id/merge_requests/:merge_request_iid/status_check_responses | `merge_request_iid` | integer | yes | IID of a merge request | | `sha` | string | yes | SHA at `HEAD` of the source branch | | `external_status_check_id` | integer | yes | ID of an external status check | -| `status` | string | no | Set to `passed` to pass the check or `failed` to fail it (GitLab 14.9 and later with feature flag enabled) | -| `status` | string | no | Set to `pass` to pass the check (GitLab 14.0 to GitLab 14.8) | +| `status` | string | no | Set to `passed` to pass the check or `failed` to fail it (GitLab 14.9 and later with feature flag `status_checks_add_status_field` enabled) | +| `status` | string | no | Set to `pass` to pass the check (GitLab 14.0 to GitLab 14.8, and GitLab 14.9 and later with feature flag `status_checks_add_status_field` disabled) | NOTE: `sha` must be the SHA at the `HEAD` of the merge request's source branch. |