Merge branch 'sprint/devops16' into 'sprint/devops16_wangyidong_45438'

# Conflicts:
#   module/gitlab/js/managegroupmembers.js

module/gitlab/js/managegroupmembers.js

@@ -41,7 +41,7 @@ function addItem(obj)
  */
 function deleteItem(obj)
 {
-    if($('#teamForm .table tbody').children().length < 2) return false;
+    if($('#teamForm .table-form tbody').children().length < 2) return false;
     $(obj).closest('tr').remove();
 }
 

module/gitlab/js/manageprojectmembers.js

@@ -41,6 +41,6 @@ function addItem(obj)
  */
 function deleteItem(obj)
 {
-    if($('#teamForm .table tbody').children().length < 2) return false;
+    if($('#teamForm .table-form tbody').children().length < 2) return false;
     $(obj).closest('tr').remove();
-}
+}

module/mr/lang/zh-cn.php

@@ -107,7 +107,7 @@ $lang->mr->closeSuccess        = "已关闭合并请求。";
 
 $lang->mr->apiErrorMap[0] = "You can't use same project/branch for source and target";
 
-$lang->mr->errorLang[0] = '源项目分支不能和目标项目分支一样';
+$lang->mr->errorLang[0] = '源项目分支与目标项目分支不能相同';
 
 $lang->mr->from = "从";
 $lang->mr->to   = "合并到";

module/mr/view/view.html.php

@@ -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)):?>