diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-12-07 14:16:17 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-12-07 14:16:17 +0300 |
| commit | a7a11f828dd7d75e2fdf06f4889a23906880abe9 (patch) | |
| tree | 5f38a1ca7f8dcdcec31241d91619a9a10a58a1c8 /doc | |
| parent | f06da1c44def8d2625564a89461c5c0ecf30de63 (diff) | |
| parent | cc38e1b8ea510ccd5bfa188f6ab2d2cc4424479a (diff) | |
Merge branch 'master' into 'master'
Fixed misreported error codes and elaborated
See merge request gitlab-org/gitlab-ce!23642
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/merge_requests.md | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index fc03cf6cc39..9ff6c73b1b6 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -974,10 +974,9 @@ curl --request DELETE --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" 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 it has some conflicts and can not be merged - you'll get a `405` and the error message 'Branch cannot be merged' - -If merge request is already merged or closed - you'll get a `406` 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' If the `sha` parameter is passed and does not match the HEAD of the source - you'll get a `409` and the error message 'SHA does not match HEAD of source branch' |