From 8e11431865caf668564e0638b4ec2b79291587d2 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Thu, 2 Dec 2021 15:46:53 +0800
Subject: [PATCH 1/3]  * Adjust style.

---
 module/gitlab/view/manageprojectmembers.html.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/gitlab/view/manageprojectmembers.html.php b/module/gitlab/view/manageprojectmembers.html.php
index 123d20e2f6..f88fe32eea 100644
--- a/module/gitlab/view/manageprojectmembers.html.php
+++ b/module/gitlab/view/manageprojectmembers.html.php
@@ -15,6 +15,8 @@
           <th><?php echo $lang->gitlab->group->memberAccessLevel;?></th>
           <th class='c-date'><?php echo $lang->gitlab->group->memberExpiresAt;?></th>
           <th class="c-actions"><?php echo $lang->actions;?></th>
+          <th></th>
+          <th></th>
         </tr>
       </thead>
       <tbody>
@@ -52,7 +54,7 @@
       </tbody>
       <tfoot>
         <tr>
-          <td colspan='6' class='text-center form-actions'>
+          <td colspan='4' class='text-center form-actions'>
             <?php
               echo html::submitButton('', '', 'hidden btn btn-wide btn-primary');
               echo html::commonButton($lang->save, 'onclick="saveMembers()" id="saveBtn"', 'btn btn-wide btn-primary');

From 9c9756bdd892abe358dfee7bcec56fcbfa2abf47 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Thu, 2 Dec 2021 15:53:06 +0800
Subject: [PATCH 2/3]  * Fix bug #16853.

---
 module/mr/lang/en.php          | 1 -
 module/mr/lang/zh-cn.php       | 1 -
 module/mr/lang/zh-tw.php       | 3 +--
 module/mr/view/create.html.php | 4 ----
 module/mr/view/edit.html.php   | 4 ----
 5 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php
index 67839e182e..25d79820fc 100644
--- a/module/mr/lang/en.php
+++ b/module/mr/lang/en.php
@@ -81,7 +81,6 @@ $lang->mr->sourceBranch  = 'Source branch';
 $lang->mr->targetProject = 'Target project';
 $lang->mr->targetBranch  = 'Target branch';
 
-$lang->mr->usersTips         = 'Tip: If you cannot choose the assignee, please go to the GitLab page to bind the user first.';
 $lang->mr->notFound          = "Merge Request does not exist!";
 $lang->mr->toCreatedMessage  = "The merge request you submitted：<a href='%s'>%s</a>, the build task succeeded.";
 $lang->mr->toReviewerMessage = "You have one merge request <a href='%s'>%s</a> waiting.";
diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php
index 81e85c2687..b1e2ce9d6b 100644
--- a/module/mr/lang/zh-cn.php
+++ b/module/mr/lang/zh-cn.php
@@ -86,7 +86,6 @@ $lang->mr->targetBranch      = '目标分支';
 $lang->mr->noCompileJob      = '没有构建任务';
 $lang->mr->compileUnexecuted = '还未执行';
 
-$lang->mr->usersTips         = '提示：如果无法选择指派人，请先前往GitLab页面绑定用户。';
 $lang->mr->notFound          = "此{$lang->mr->common}不存在。";
 $lang->mr->toCreatedMessage  = "您提交的合并请求：<a href='%s'>%s</a> 构建任务执行通过。";
 $lang->mr->toReviewerMessage = "有一个合并请求：<a href='%s'>%s</a> 待审核。";
diff --git a/module/mr/lang/zh-tw.php b/module/mr/lang/zh-tw.php
index e0b4a07446..feff149dfe 100644
--- a/module/mr/lang/zh-tw.php
+++ b/module/mr/lang/zh-tw.php
@@ -68,8 +68,7 @@ $lang->mr->sourceBranch  = '源分支';
 $lang->mr->targetProject = '目標項目';
 $lang->mr->targetBranch  = '目標分支';
 
-$lang->mr->usersTips = '提示：如果無法選擇指派人，請先前往GitLab頁面綁定用戶。';
-$lang->mr->notFound  = "此{$lang->mr->common}不存在。";
+$lang->mr->notFound = "此{$lang->mr->common}不存在。";
 
 $lang->mr->apiError = new stdclass;
 $lang->mr->apiError->createMR = "通過API創建合併請求失敗，失敗原因：%s";
diff --git a/module/mr/view/create.html.php b/module/mr/view/create.html.php
index 73daa976d0..71b862c73b 100644
--- a/module/mr/view/create.html.php
+++ b/module/mr/view/create.html.php
@@ -72,10 +72,6 @@
             <th><?php echo $lang->mr->assignee;?></th>
             <td><?php echo html::select('assignee', $users, '', "class='form-control chosen'");?></td>
           </tr>
-          <tr>
-            <th></th>
-            <td><?php echo $lang->mr->usersTips;?></td>
-          </tr>
           <tr>
             <td colspan='2' class='text-center form-actions'>
               <?php echo html::submitButton();?>
diff --git a/module/mr/view/edit.html.php b/module/mr/view/edit.html.php
index 5527387a32..4489aeb320 100644
--- a/module/mr/view/edit.html.php
+++ b/module/mr/view/edit.html.php
@@ -87,10 +87,6 @@
             <th><?php echo $lang->mr->assignee;?></th>
             <td><?php echo html::select('assignee', $users, $assignee, "class='form-control chosen'");?></td>
           </tr>
-          <tr>
-            <th></th>
-            <td><?php echo $lang->mr->usersTips;?></td>
-          </tr>
           <tr>
             <td colspan='2' class='text-center form-actions'>
               <?php echo html::submitButton();?>

From 2b331d987d97fb384d7ee2c3ccbd94f16aa99aee Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Thu, 2 Dec 2021 16:00:32 +0800
Subject: [PATCH 3/3]  * Fix bug #16885.

---
 module/mr/lang/zh-cn.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php
index b1e2ce9d6b..4598f1d2de 100644
--- a/module/mr/lang/zh-cn.php
+++ b/module/mr/lang/zh-cn.php
@@ -63,8 +63,8 @@ $lang->mr->approvalStatusList['approved']    = '已通过';
 $lang->mr->approvalStatusList['rejected']    = '已拒绝';
 
 $lang->mr->notApproved  = '审核拒绝的';
-$lang->mr->assignedToMe = '指派给我的';
-$lang->mr->createdByMe  = '我创建的';
+$lang->mr->assignedToMe = '指派给我';
+$lang->mr->createdByMe  = '由我创建';
 
 $lang->mr->statusList = array();
 $lang->mr->statusList['all']    = '所有';