Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Modify merge param.

Browse Source
This commit is contained in:
caoyanyi
2022-07-22 10:05:29 +08:00
parent ce572304aa
commit eba899076d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/model.php
+2 -2
View File
@@ -991,8 +991,8 @@ class mrModel extends model
$apiRoot = $this->loadModel('gitea')->getApiRoot($hostID);
$url = sprintf($apiRoot, "/repos/$projectID/pulls/$MRID/merge");
$merege = ($MR and $MR->squash == '1') ? 'squash' : 'merge';
$data = array('Do' => $merge);
$merge = ($MR and $MR->squash == '1') ? 'squash' : 'merge';
$data = array('Do' => $merge);
if($MR and $MR->removeSourceBranch == '1') $data['delete_branch_after_merge'] = true;
$rowMR = json_decode(commonModel::http($url, $data, array(), array(), 'json', 'POST'));