Skip to content

Commit d76152e

Browse files
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: #1750
1 parent 22a1516 commit d76152e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

gitlab/v4/objects/merge_requests.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,8 @@ def merge_ref(self, **kwargs: Any) -> Union[Dict[str, Any], requests.Response]:
358358
def merge(
359359
self,
360360
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,
363363
**kwargs: Any,
364364
) -> Dict[str, Any]:
365365
"""Accept the merge request.
@@ -382,8 +382,8 @@ def merge(
382382
data["merge_commit_message"] = merge_commit_message
383383
if should_remove_source_branch is not None:
384384
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
387387

388388
server_data = self.manager.gitlab.http_put(path, post_data=data, **kwargs)
389389
if TYPE_CHECKING:

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy