Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc/api
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-02 00:08:46 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-02 00:08:46 +0300
commitd15b856c1c42d198ba102123f72b8a0b19d143df (patch)
tree6bfdaaa818d160b9e4f756ca09c0be397f963db9 /doc/api
parent3011f8b297a5b71cd505a672b59cc8d3e0aa9f65 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
-rw-r--r--doc/api/protected_branches.md16
-rw-r--r--doc/api/protected_tags.md8
2 files changed, 24 insertions, 0 deletions
diff --git a/doc/api/protected_branches.md b/doc/api/protected_branches.md
index d3d91be290f..cdae313187d 100644
--- a/doc/api/protected_branches.md
+++ b/doc/api/protected_branches.md
@@ -19,6 +19,8 @@ The access levels are defined in the `ProtectedRefAccess.allowed_access_levels`
## List protected branches
+> Deploy key information [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116846) in GitLab 16.0.
+
Gets a list of protected branches from a project as they are defined [in the UI](../user/project/protected_branches.md#configure-a-protected-branch). If a wildcard is set, it is returned instead of the exact name of the branches that match that wildcard.
```plaintext
@@ -46,6 +48,12 @@ Example response:
"id": 1,
"access_level": 40,
"access_level_description": "Maintainers"
+ },
+ {
+ "id": 2,
+ "access_level": 40,
+ "access_level_description": "Deploy key",
+ "deploy_key_id": 1
}
],
"merge_access_levels": [
@@ -100,6 +108,14 @@ Example response:
"user_id": null,
"group_id": null,
"access_level_description": "Maintainers"
+ },
+ {
+ "id": 2,
+ "access_level": 40,
+ "access_level_description": "Deploy key",
+ "deploy_key_id": 1,
+ "user_id": null,
+ "group_id": null
}
],
"merge_access_levels": [
diff --git a/doc/api/protected_tags.md b/doc/api/protected_tags.md
index bcb0298ef55..7aff87b54f0 100644
--- a/doc/api/protected_tags.md
+++ b/doc/api/protected_tags.md
@@ -16,6 +16,8 @@ These access levels are recognized:
## List protected tags
+> Deploy key information [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116846) in GitLab 16.0.
+
Gets a list of [protected tags](../user/project/protected_tags.md) from a project.
This function takes pagination parameters `page` and `per_page` to restrict the list of protected tags.
@@ -43,6 +45,12 @@ Example response:
"id":1,
"access_level": 40,
"access_level_description": "Maintainers"
+ },
+ {
+ "id": 2,
+ "access_level": 40,
+ "access_level_description": "Deploy key",
+ "deploy_key_id": 1
}
]
},