| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
1 parent 22a1516 commit 8e589c4
2 files changed
| 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: | |
| 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 | assert len(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 | assert result is True, "sidekiq process should have terminated but did not" | |
| Back | FazBrowse Home | New Git URL |
0 commit comments