diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-27 15:03:26 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-27 15:03:26 +0000 |
| commit | e3ca4eee1306914d760367a954d2af72c787f5ae (patch) | |
| tree | bd406e282f1d2fc67987bf765df79d45667528f2 /doc/api | |
| parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) | |
| download | gitlab-ce-e3ca4eee1306914d760367a954d2af72c787f5ae.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/protected_branches.md | 2 | ||||
| -rw-r--r-- | doc/api/scim.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/api/protected_branches.md b/doc/api/protected_branches.md index 4206fe6a565..a1f42958c36 100644 --- a/doc/api/protected_branches.md +++ b/doc/api/protected_branches.md @@ -248,7 +248,7 @@ Example response: ### Example with user / group level access **(STARTER)** Elements in the `allowed_to_push` / `allowed_to_merge` / `allowed_to_unprotect` array should take the -form `{user_id: integer}`, `{group_id: integer}` or `{access_level: integer}`. Each user must have access to the project and each group must [have this project shared](../user/project/members/share_project_with_groups.md). These access levels allow [more granular control over protected branch access](../user/project/protected_branches.md#restricting-push-and-merge-access-to-certain-users-starter) and were [added to the API in](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3516) in GitLab 10.3 EE. +form `{user_id: integer}`, `{group_id: integer}` or `{access_level: integer}`. Each user must have access to the project and each group must [have this project shared](../user/project/members/share_project_with_groups.md). These access levels allow [more granular control over protected branch access](../user/project/protected_branches.md#restricting-push-and-merge-access-to-certain-users-starter) and were [added to the API in](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3516) GitLab 10.3 EE. ```shell curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/5/protected_branches?name=*-stable&allowed_to_push%5B%5D%5Buser_id%5D=1" diff --git a/doc/api/scim.md b/doc/api/scim.md index 7c8da37a949..bd86408ee63 100644 --- a/doc/api/scim.md +++ b/doc/api/scim.md @@ -2,7 +2,7 @@ > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/9388) in [GitLab Silver](https://about.gitlab.com/pricing/) 11.10. -The SCIM API implements the [the RFC7644 protocol](https://tools.ietf.org/html/rfc7644). +The SCIM API implements [the RFC7644 protocol](https://tools.ietf.org/html/rfc7644). CAUTION: **Caution:** This API is for internal system use for connecting with a SCIM provider. While it can be used directly, it is subject to change without notice. |