diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 21:09:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 21:09:35 +0300 |
| commit | 3a9076e0a4c28af9a1a40ed5e181b70fb1b659de (patch) | |
| tree | 3d531c50bec43c1845c7d74f76442b7a6f49849f /doc/api/merge_requests.md | |
| parent | 2d8454515e7b631a8f39a6415c86154d6c62841c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api/merge_requests.md')
| -rw-r--r-- | doc/api/merge_requests.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index 070d21d99aa..959cf87ba62 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -1303,7 +1303,7 @@ curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" "https://git Merge changes submitted with MR using this API. -If merge request is unable to be accepted (ie: Work in Progress, Closed, Pipeline Pending Completion, or Failed while requiring Success) - you'll get a `405` and the error message 'Method Not Allowed' +If merge request is unable to be accepted (ie: Draft, Closed, Pipeline Pending Completion, or Failed while requiring Success) - you'll get a `405` and the error message 'Method Not Allowed' If it has some conflicts and can not be merged - you'll get a `406` and the error message 'Branch cannot be merged' |