diff options
| author | Nejc Habjan <nejc.habjan@siemens.com> | 2022-04-27 00:18:32 +0200 |
|---|---|---|
| committer | Nejc Habjan <nejc.habjan@siemens.com> | 2022-04-27 00:18:32 +0200 |
| commit | 08f23c3a20052f18ef8cb26bb23c49fe04dc07a7 (patch) | |
| tree | 77dd8eb0ca9b4406b0524b2d85e4580022718078 | |
| parent | c4bfbb4bd9c89d1cee9fdd2db2caef35a6b041c9 (diff) | |
| download | gitlab-fix/mr-merge-arbitrary-arguments.tar.gz | |
fix(merge_requests): add missing parameters for merge()fix/mr-merge-arbitrary-arguments
| -rw-r--r-- | gitlab/v4/objects/merge_requests.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gitlab/v4/objects/merge_requests.py b/gitlab/v4/objects/merge_requests.py index b1c0029..0493c58 100644 --- a/gitlab/v4/objects/merge_requests.py +++ b/gitlab/v4/objects/merge_requests.py @@ -350,8 +350,11 @@ class ProjectMergeRequest( (), ( "merge_commit_message", - "should_remove_source_branch", "merge_when_pipeline_succeeds", + "sha", + "should_remove_source_branch", + "squash_commit_message", + "squash", ), ) @exc.on_http_error(exc.GitlabMRClosedError) |