diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-21 21:09:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-21 21:09:11 +0300 |
| commit | 37a492326e7cde47928ee72abcc284ff9cf8f254 (patch) | |
| tree | 832417ddab170745bca91ec158b70973ba0700af /doc/api/merge_requests.md | |
| parent | 81884c35b86035f89364db482e4fff91718bb63a (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 b6ae62dc47a..e16c08e4d97 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -1406,7 +1406,7 @@ Parameters: | `merge_request_iid` | integer | yes | The internal ID of the merge request. | | `merge_commit_message` | string | no | Custom merge commit message. | | `squash_commit_message` | string | no | Custom squash commit message. | -| `squash` | boolean | no | If `true` the commits the commits are squashed into a single commit on merge. | +| `squash` | boolean | no | If `true` the commits are squashed into a single commit on merge. | | `should_remove_source_branch` | boolean | no | If `true` removes the source branch. | | `merge_when_pipeline_succeeds` | boolean | no | If `true` the MR is merged when the pipeline succeeds. | | `sha` | string | no | If present, then this SHA must match the HEAD of the source branch, otherwise the merge fails. | |