Commit0dba899

authored

Merge pull request#1818 from python-gitlab/jlvillal/merge_request_merge_defaults

fix: remove default arguments for mergerequests.merge()

2 parents22a1516 +8e589c4 commit0dba899Copy full SHA for 0dba899

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 4 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,8 +382,8 @@ 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:`
`386`		`-data["merge_when_pipeline_succeeds"]=True`
	`385`	`+ifmerge_when_pipeline_succeedsisnotNone:`
	`386`	`+data["merge_when_pipeline_succeeds"]=merge_when_pipeline_succeeds`
`387`	`387`
`388`	`388`	`server_data=self.manager.gitlab.http_put(path,post_data=data,**kwargs)`
`389`	`389`	`ifTYPE_CHECKING:`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,9 @@ def test_merge_request_large_commit_message(`
`170`	`170`	`merge_commit_message="large_message\r\n"*1_000`
`171`	`171`	`assertlen(merge_commit_message)>10_000`
`172`	`172`
`173`		`-mr.merge(merge_commit_message=merge_commit_message)`
	`173`	`+mr.merge(`
	`174`	`+merge_commit_message=merge_commit_message,should_remove_source_branch=False`
	`175`	`+ )`
`174`	`176`
`175`	`177`	`result=wait_for_sidekiq(timeout=60)`
`176`	`178`	`assertresultisTrue,"sidekiq process should have terminated but did not"`

Comments

(0)