Commitadc9c7c

committed

fix: remove default arguments for mergerequests.merge()

The arguments `should_remove_source_branch` and`merge_when_pipeline_succeeds` are optional arguments. We should notbe setting any default value for them.https://docs.gitlab.com/ee/api/merge_requests.html#accept-mrCloses:#1750

1 parent22a1516 commitadc9c7cCopy full SHA for adc9c7c

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -358,8 +358,8 @@ def merge_ref(self, **kwargs: Any) -> Union[Dict[str, Any], requests.Response]:`
`358`	`358`	`defmerge(`
`359`	`359`	`self,`
`360`	`360`	`merge_commit_message:Optional[str]=None,`
`361`		`-should_remove_source_branch:bool=False,`
`362`		`-merge_when_pipeline_succeeds:bool=False,`
	`361`	`+should_remove_source_branch:Optional[bool]=None,`
	`362`	`+merge_when_pipeline_succeeds:Optional[bool]=None,`
`363`	`363`	`**kwargs:Any,`
`364`	`364`	`)->Dict[str,Any]:`
`365`	`365`	`"""Accept the merge request.`
`@@ -382,7 +382,7 @@ def merge(`
`382`	`382`	`data["merge_commit_message"]=merge_commit_message`
`383`	`383`	`ifshould_remove_source_branchisnotNone:`
`384`	`384`	`data["should_remove_source_branch"]=should_remove_source_branch`
`385`		`-ifmerge_when_pipeline_succeeds:`
	`385`	`+ifmerge_when_pipeline_succeedsisnotNone:`
`386`	`386`	`data["merge_when_pipeline_succeeds"]=True`
`387`	`387`
`388`	`388`	`server_data=self.manager.gitlab.http_put(path,post_data=data,**kwargs)`

Comments

(0)