diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-08 00:10:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-08 00:10:15 +0300 |
| commit | 4cf8d931aa8511aa93b8504e940d2f5ddfee7b4c (patch) | |
| tree | 1c2cd88c4d895757f08b73708bf49b182cc0a715 /doc/api | |
| parent | fbe6bd7c6aae0beb81fa47d5834393ed92662885 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/container_registry.md | 2 | ||||
| -rw-r--r-- | doc/api/graphql/reference/index.md | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/api/container_registry.md b/doc/api/container_registry.md index c44d800d39f..35b74965d2e 100644 --- a/doc/api/container_registry.md +++ b/doc/api/container_registry.md @@ -464,7 +464,7 @@ DELETE http(s)://${CI_REGISTRY}/v2/${CI_REGISTRY_IMAGE}/tags/reference/${CI_COMM ``` You can use the token retrieved with the predefined `CI_REGISTRY_USER` and `CI_REGISTRY_PASSWORD` variables to delete container image tags by reference on your GitLab instance. -The `tag_delete` [Container-Registry-Feature](https://gitlab.com/gitlab-org/container-registry/-/tree/v3.61.0-gitlab/docs-gitlab#api) must be enabled. +The `tag_delete` [Container-Registry-Feature](https://gitlab.com/gitlab-org/container-registry/-/blob/master/docs/spec/docker/v2/api.md#delete-tag) must be enabled. ```shell $ curl --request DELETE --header "Authorization: Bearer <token_from_above>" \ diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index 6c22ffa5f22..965f9f52327 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -5136,6 +5136,10 @@ Accepts a merge request. When accepted, the source branch will be scheduled to merge into the target branch, either immediately if possible, or using one of the automatic merge strategies. +[In GitLab 16.5](https://gitlab.com/gitlab-org/gitlab/-/issues/421510), the merging happens asynchronously. +This results in `mergeRequest` and `state` not updating after a mutation request, +because the merging may not have happened yet. + Input type: `MergeRequestAcceptInput` #### Arguments |