diff options
| author | Nejc Habjan <nejc.habjan@siemens.com> | 2022-01-09 00:33:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-09 00:33:38 +0100 |
| commit | 0dba899c20dda3a9789992a1186cfd718e5b588f (patch) | |
| tree | 01ce072db38de16e3fd28e4c4539160cb9a13720 | |
| parent | 22a151695373ead50ede5cc623130c39bfe1030e (diff) | |
| parent | 8e589c43fa2298dc24b97423ffcc0ce18d911e3b (diff) | |
| download | gitlab-0dba899c20dda3a9789992a1186cfd718e5b588f.tar.gz | |
Merge pull request #1818 from python-gitlab/jlvillal/merge_request_merge_defaults
fix: remove default arguments for mergerequests.merge()
| -rw-r--r-- | gitlab/v4/objects/merge_requests.py | 8 | ||||
| -rw-r--r-- | tests/functional/api/test_merge_requests.py | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/gitlab/v4/objects/merge_requests.py b/gitlab/v4/objects/merge_requests.py index 11c962b..0e81de1 100644 --- a/gitlab/v4/objects/merge_requests.py +++ b/gitlab/v4/objects/merge_requests.py @@ -358,8 +358,8 @@ class ProjectMergeRequest( def merge( self, merge_commit_message: Optional[str] = None, - should_remove_source_branch: bool = False, - merge_when_pipeline_succeeds: bool = False, + should_remove_source_branch: Optional[bool] = None, + merge_when_pipeline_succeeds: Optional[bool] = None, **kwargs: Any, ) -> Dict[str, Any]: """Accept the merge request. @@ -382,8 +382,8 @@ class ProjectMergeRequest( data["merge_commit_message"] = merge_commit_message if should_remove_source_branch is not None: data["should_remove_source_branch"] = should_remove_source_branch - if merge_when_pipeline_succeeds: - data["merge_when_pipeline_succeeds"] = True + if merge_when_pipeline_succeeds is not None: + data["merge_when_pipeline_succeeds"] = merge_when_pipeline_succeeds server_data = self.manager.gitlab.http_put(path, post_data=data, **kwargs) if TYPE_CHECKING: diff --git a/tests/functional/api/test_merge_requests.py b/tests/functional/api/test_merge_requests.py index f92e30d..74d0b41 100644 --- a/tests/functional/api/test_merge_requests.py +++ b/tests/functional/api/test_merge_requests.py @@ -170,7 +170,9 @@ def test_merge_request_large_commit_message( merge_commit_message = "large_message\r\n" * 1_000 assert len(merge_commit_message) > 10_000 - mr.merge(merge_commit_message=merge_commit_message) + mr.merge( + merge_commit_message=merge_commit_message, should_remove_source_branch=False + ) result = wait_for_sidekiq(timeout=60) assert result is True, "sidekiq process should have terminated but did not" |