* Optimize merge request status in view page of MR module.

2021-11-04 10:21:17 +08:00
parent 201e471acc
commit 2acf4c98db
1 changed files with 6 additions and 1 deletions
@@ -39,10 +39,15 @@
              </div>
            <?php endif;?>
            <strong><?php echo $lang->mr->mergeStatus;?> </strong>
-            <?php echo zget($lang->mr->mergeStatusList, $rawMR->merge_status);?>
+            <?php
+            if(empty($rawMR->changes_count)):
+              echo $lang->mr->noChanges;
+            else:
+              echo zget($lang->mr->mergeStatusList, $rawMR->merge_status);?>
            <br>
            <strong><?php echo $lang->mr->MRHasConflicts;?></strong>
            <?php echo ($rawMR->has_conflicts ? $lang->mr->hasConflicts : $lang->mr->hasNoConflict);?>
+            <?php endif;?>
          </div>
        </div>
      </div>