summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlejandro Rodríguez <alejorro70@gmail.com>2016-07-02 17:44:19 -0400
committerAlejandro Rodríguez <alejorro70@gmail.com>2016-07-02 17:44:19 -0400
commit52008045e5785772f74b3ab5c686e6babb4fd45b (patch)
treeaa10f3654ab2a1bd65184d5d9f05b8cbca6bf970
parentfc3402b7eaa9e9839ac2b7087d9582f518b0bf96 (diff)
downloadgitlab-ce-19448-merge-requests-api-has-incorrect-documentation-regarding-merge_when_build_succeeds.tar.gz
-rw-r--r--doc/api/merge_requests.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index f60b0d0ebc6..aee94b3fc36 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -433,7 +433,7 @@ Parameters:
- `merge_request_id` (required) - ID of MR
- `merge_commit_message` (optional) - Custom merge commit message
- `should_remove_source_branch` (optional) - if `true` removes the source branch
-- `merged_when_build_succeeds` (optional) - if `true` the MR is merged when the build succeeds
+- `merge_when_build_succeeds` (optional) - if `true` the MR is merged when the build succeeds
- `sha` (optional) - if present, then this SHA must match the HEAD of the source branch, otherwise the merge will fail
```json