diff --git a/module/mr/view/view.html.php b/module/mr/view/view.html.php index 7a2a42698c..b5f7c68ca4 100644 --- a/module/mr/view/view.html.php +++ b/module/mr/view/view.html.php @@ -27,13 +27,18 @@
mr->from . html::a($sourceProjectURL, $sourceProjectName . ":" . $MR->sourceBranch, "_blank", "class='btn btn-link btn-active-text' style='color: blue'") . $lang->mr->to . html::a($targetProjectURL, $targetProjectName . ":" . $MR->targetBranch, "_blank", "class='btn btn-link btn-active-text' style='color: blue'");?>
-
head_pipeline->status)) echo $lang->mr->pipeline . $lang->mr->status . ": " . zget($lang->mr->pipelineStatus, $rawMR->head_pipeline->status, $lang->mr->pipelineUnknown);?>
+ head_pipeline->status)):?> +
+ mr->pipeline}{$lang->mr->status}";?> + mr->pipelineStatus, $rawMR->head_pipeline->status, $lang->mr->pipelineUnknown);?> +
+ mr->mergeStatus;?> mr->mergeStatusList, $rawMR->merge_status);?>
- mr->MRHasConflicts. $lang->colon;?> + mr->MRHasConflicts;?> has_conflicts ? $lang->mr->hasConflicts : $lang->mr->hasNoConflict);?>