* GitLab MR Code Merge.

This commit is contained in:
lichengjun
2021-09-07 00:50:33 +00:00
parent 1c3f706088
commit a786e5f00d
-5
View File
@@ -239,12 +239,7 @@ class mrModel extends model
{
$rawMR = $this->apiGetSingleMR($MR->gitlabID, $MR->targetProject, $MR->mriid);
<<<<<<< HEAD
if(isset($rawMR->iid) and $rawMR->state != 'merged')
=======
if(isset($rawMR->iid))
>>>>>>> 2d1bc4fcc77df8662f24fda6afd586a5d49cb996
{
/* create gitlab mr todo to zentao todo */
$this->batchSyncTodo($MR->gitlabID, $MR->targetProject);