Repository navigation
Commit d76152e
committed
fix: remove default arguments for mergerequests.merge()
The arguments `should_remove_source_branch` and
`merge_when_pipeline_succeeds` are optional arguments. We should not
be setting any default value for them.
https://docs.gitlab.com/ee/api/merge_requests.html#accept-mr
Closes: #17501 parent 22a1516 commit d76152e
1 file 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 | def merge( | |
| 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 | if should_remove_source_branch is not None: | |
| 384 | 384 | data["should_remove_source_branch"] = should_remove_source_branch | |
| 385 | - if merge_when_pipeline_succeeds: | ||
| 386 | - data["merge_when_pipeline_succeeds"] = True | ||
| 385 | + if merge_when_pipeline_succeeds is not None: | ||
| 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 | if TYPE_CHECKING: | |
0 commit comments