From 07ce01bda2710d53550b2dec77760eab20345e1a Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Thu, 9 Dec 2021 12:28:32 +0800
Subject: [PATCH 1/2]  * Finish task #45439.

---
 module/mr/view/view.html.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/module/mr/view/view.html.php b/module/mr/view/view.html.php
index 54667871b7..55f984cbaa 100644
--- a/module/mr/view/view.html.php
+++ b/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)):?>

From fe5571a0ed20c13ded54e17b8bb92e31e98413b1 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Thu, 9 Dec 2021 07:46:07 +0000
Subject: [PATCH 2/2] * Fix bug#17141

---
 module/gitlab/js/managegroupmembers.js   | 4 ++--
 module/gitlab/js/manageprojectmembers.js | 4 ++--
 module/mr/lang/zh-cn.php                 | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/gitlab/js/managegroupmembers.js b/module/gitlab/js/managegroupmembers.js
index 589e0ffc61..f67e13d81e 100644
--- a/module/gitlab/js/managegroupmembers.js
+++ b/module/gitlab/js/managegroupmembers.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();
-}
\ No newline at end of file
+}
diff --git a/module/gitlab/js/manageprojectmembers.js b/module/gitlab/js/manageprojectmembers.js
index 589e0ffc61..f67e13d81e 100644
--- a/module/gitlab/js/manageprojectmembers.js
+++ b/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();
-}
\ No newline at end of file
+}
diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php
index d4608feb93..38ae4979c3 100644
--- a/module/mr/lang/zh-cn.php
+++ b/module/mr/lang/zh-cn.php
@@ -102,7 +102,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   = "合并到";