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

* Modify delete branch after merge.

Browse Source
This commit is contained in:
caoyanyi
2022-07-20 09:59:14 +08:00
parent 3de9a41c2b
commit 809f321445
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/model.php
+6 -8
View File
@@ -976,8 +976,12 @@ 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';
$rowMR = json_decode(commonModel::http($url, array('Do' => $merge), array(), array(), 'json', 'POST'));
$merege = ($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'));
if(!isset($rowMR->massage))
{
$rowMR = $this->apiGetSingleMR($hostID, $projectID, $MRID);
@@ -986,12 +990,6 @@ class mrModel extends model
->where('id')->eq($MRID)
->autoCheck()
->exec();
if($MR and $MR->removeSourceBranch == '1')
{
$url = sprintf($apiRoot, "/repos/$projectID/branches/{$MR->sourceBranch}");
json_decode(commonModel::http($url, null, array(CURLOPT_CUSTOMREQUEST => 'DELETE')));
}
}
return $rowMR;
}