diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-02-07 15:28:56 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-02-07 15:28:56 +0300 |
| commit | 7d37e345b52b427dad6b7533b67a3946a7263192 (patch) | |
| tree | ec78bb1848ae0ef960e2b3402e71076cfe3cd403 /doc/api | |
| parent | 041316636b594c15f3fde9839354e3f1309ec763 (diff) | |
| parent | b37266004c13ae09f76b2b1fdec02459000124c2 (diff) | |
Merge branch '56014-api-merge-request-squash-commit-messages' into 'master'
API support for setting squash commit message during squash
Closes #56014
See merge request gitlab-org/gitlab-ce!24784
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/merge_requests.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index 802ff1d1df9..d58cd45538d 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -994,6 +994,8 @@ Parameters: - `id` (required) - The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user - `merge_request_iid` (required) - Internal ID of MR - `merge_commit_message` (optional) - Custom merge commit message +- `squash_commit_message` (optional) - Custom squash commit message +- `squash` (optional) - if `true` the commits will be squashed into a single commit on merge - `should_remove_source_branch` (optional) - if `true` removes the source branch - `merge_when_pipeline_succeeds` (optional) - if `true` the MR is merged when the pipeline succeeds - `sha` (optional) - if present, then this SHA must match the HEAD of the source branch, otherwise the merge will fail |