summaryrefslogtreecommitdiff
path: root/doc/api/merge_requests.md
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-15 10:17:16 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-15 10:17:16 +0300
commit433dac7799a1a5fd4a0dfeaa0157148eb9058202 (patch)
tree363bd1609d2bef7fb502971bc7bb8d51209e5343 /doc/api/merge_requests.md
parent7120af725148aae5092c0870c1da34ca5652f60d (diff)
parentcbc90565b55d89704d64bc48db323b82b739a873 (diff)
downloadgitlab-ce-433dac7799a1a5fd4a0dfeaa0157148eb9058202.tar.gz
Merge pull request #7465 from Razer6/better_label_color_validation
Better label color validation, fixes #7454
Diffstat (limited to 'doc/api/merge_requests.md')
-rw-r--r--doc/api/merge_requests.md10
1 files changed, 8 insertions, 2 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 794d46ed7c9..230f572fc3b 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -139,6 +139,9 @@ Parameters:
}
```
+If the operation is successful, 200 and the newly created merge request is returned.
+If an error occurs, an error number and a message explaining the reason is returned.
+
## Update MR
Updates an existing merge request. You can change branches, title, or even close the MR.
@@ -186,15 +189,18 @@ Parameters:
}
```
+If the operation is successful, 200 and the updated merge request is returned.
+If an error occurs, an error number and a message explaining the reason is returned.
+
## Accept MR
-Merge changes submitted with MR usign this API.
+Merge changes submitted with MR using this API.
If merge success you get 200 OK.
If it has some conflicts and can not be merged - you get 405 and error message 'Branch cannot be merged'
-If merge request is already merged or closed - you get 405 and error message 'Method Not Allowed'
+If merge request is already merged or closed - you get 405 and error message 'Method Not Allowed'
If you dont have permissions to accept this merge request - you get 401