Merge branch 'sprint/devops_liyuchun_45441' into 'sprint/devops16'
* Finish task #45439. See merge request easycorp/zentaopms!852
This commit is contained in:
@@ -61,12 +61,6 @@
|
||||
<th class="w-100px"><?php echo $lang->mr->status;?></th>
|
||||
<td><?php echo zget($lang->mr->statusList, $MR->status);?></td>
|
||||
</tr>
|
||||
<?php if(isset($rawMR->head_pipeline->status)): ?>
|
||||
<tr>
|
||||
<th><?php echo "{$lang->mr->pipeline}{$lang->mr->status}";?></th>
|
||||
<td><?php echo zget($lang->mr->pipelineStatus, $rawMR->head_pipeline->status, $lang->mr->pipelineUnknown); ?></td>
|
||||
</tr>
|
||||
<?php endif; ?>
|
||||
<tr>
|
||||
<th><?php echo $lang->mr->mergeStatus; ?></th>
|
||||
<?php if(empty($rawMR->changes_count)):?>
|
||||
|
||||
Reference in New Issue
Block a user