fix(merge_requests): add missing parameters for merge()

nejch · nejch · commit 08f23c3a2005 · 2022-04-27T00:18:32.000+02:00
diff --git a/gitlab/v4/objects/merge_requests.py b/gitlab/v4/objects/merge_requests.py
@@ -350,8 +350,11 @@ def merge_ref(self, **kwargs: Any) -> Union[Dict[str, Any], requests.Response]:
         (),
         (
             "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)

Original file line number	Diff line number	Diff line change
`@@ -350,8 +350,11 @@ def merge_ref(self, **kwargs: Any) -> Union[Dict[str, Any], requests.Response]:`
`350`	`350`	`(),`
`351`	`351`	`(`
`352`	`352`	`"merge_commit_message",`
`353`		`- "should_remove_source_branch",`
`354`	`353`	`"merge_when_pipeline_succeeds",`
	`354`	`+ "sha",`
	`355`	`+ "should_remove_source_branch",`
	`356`	`+ "squash_commit_message",`
	`357`	`+ "squash",`
`355`	`358`	`),`
`356`	`359`	`)`
`357`	`360`	`@exc.on_http_error(exc.GitlabMRClosedError)`