* The merged mr does not display the merge button.

This commit is contained in:
liyang
2024-05-20 15:48:39 +08:00
committed by caoyanyi
parent fd3065f0d0
commit 1b2d102591
+1 -1
View File
@@ -20,7 +20,7 @@ foreach($config->mr->view->operateList as $operate)
{
if(!common::hasPriv('mr', $operate == 'reject' ? 'approval' : $operate)) continue;
if($operate == 'reopen' && (!$MR->synced || $rawMR->state != 'closed')) continue;
if($rawMR->state == 'closed' && $operate == 'accept') continue;
if(in_array($rawMR->state, array('closed', 'merged')) && $operate == 'accept') continue;
$action = $config->mr->actionList[$operate];
if($operate === 'edit' || $operate === 'delete')