Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 0dba899

Browse filesBrowse files
authored
Merge pull request #1818 from python-gitlab/jlvillal/merge_request_merge_defaults
fix: remove default arguments for mergerequests.merge()
2 parents 22a1516 + 8e589c4 commit 0dba899
Copy full SHA for 0dba899

File tree

Expand file treeCollapse file tree

2 files changed

+7
-5
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

2 files changed

+7
-5
lines changed
Open diff view settings
Collapse file

‎gitlab/v4/objects/merge_requests.py‎

Copy file name to clipboardExpand all lines: gitlab/v4/objects/merge_requests.py
+4-4Lines 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:
Collapse file

‎tests/functional/api/test_merge_requests.py‎

Copy file name to clipboardExpand all lines: tests/functional/api/test_merge_requests.py
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,9 @@ def test_merge_request_large_commit_message(
170170
merge_commit_message = "large_message\r\n" * 1_000
171171
assert len(merge_commit_message) > 10_000
172172

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+
)
174176

175177
result = wait_for_sidekiq(timeout=60)
176178
assert result is True, "sidekiq process should have terminated but did not"

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.