Movatterモバイル変換


[0]ホーム

URL:


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

Sign up
Appearance settings

Commitc4bfbb4

Browse files
committed
refactor(merge_requests): collect payload arguments from custom action
1 parent2a4493c commitc4bfbb4

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

‎gitlab/v4/objects/merge_requests.py

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -355,13 +355,7 @@ def merge_ref(self, **kwargs: Any) -> Union[Dict[str, Any], requests.Response]:
355355
),
356356
)
357357
@exc.on_http_error(exc.GitlabMRClosedError)
358-
defmerge(
359-
self,
360-
merge_commit_message:Optional[str]=None,
361-
should_remove_source_branch:Optional[bool]=None,
362-
merge_when_pipeline_succeeds:Optional[bool]=None,
363-
**kwargs:Any,
364-
)->Dict[str,Any]:
358+
defmerge(self,**kwargs:Any)->Dict[str,Any]:
365359
"""Accept the merge request.
366360
367361
Args:
@@ -377,15 +371,14 @@ def merge(
377371
GitlabMRClosedError: If the merge failed
378372
"""
379373
path=f"{self.manager.path}/{self.encoded_id}/merge"
380-
data:Dict[str,Any]= {}
381-
ifmerge_commit_message:
382-
data["merge_commit_message"]=merge_commit_message
383-
ifshould_remove_source_branchisnotNone:
384-
data["should_remove_source_branch"]=should_remove_source_branch
385-
ifmerge_when_pipeline_succeedsisnotNone:
386-
data["merge_when_pipeline_succeeds"]=merge_when_pipeline_succeeds
387-
388-
server_data=self.manager.gitlab.http_put(path,post_data=data,**kwargs)
374+
post_data:Dict[str,Any]= {}
375+
data=kwargs.copy()
376+
377+
forkeyinkwargs.keys():
378+
ifkeyinself.merge._custom_args:
379+
post_data[key]=data.pop(key)
380+
381+
server_data=self.manager.gitlab.http_put(path,post_data=post_data,**data)
389382
ifTYPE_CHECKING:
390383
assertisinstance(server_data,dict)
391384
self._update_attrs(server_data)

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp