* Fix bug #17841,17830.

module/gitlab/control.php

@@ -957,6 +957,7 @@ class gitlab extends control
             $tag->name          = $gitlabTag->name;
             $tag->lastCommitter = $gitlabTag->commit->committer_name;
             $tag->updated       = date('Y-m-d H:i:s', strtotime($gitlabTag->commit->committed_date));
+            $tag->protected     = $gitlabTag->protected;
 
             $tagList[] = $tag;
         }

module/gitlab/view/browsetag.html.php

@@ -62,7 +62,8 @@
           <td class='text'><?php echo $gitlabTag->updated?></td>
           <td class='c-actions text-left'>
             <?php
-            common::printLink('gitlab', 'deleteTag', "gitlabID=$gitlabID&projectID={$projectID}&tag_name={$gitlabTag->name}", "<i class='icon icon-trash'></i> ", '', "title='{$lang->gitlab->deleteTag}' class='btn btn-primary' target='hiddenwin'");
+            $isDisabled = $gitlabTag->protected ? 'disabled' : '';
+            common::printLink('gitlab', 'deleteTag', "gitlabID=$gitlabID&projectID={$projectID}&tag_name={$gitlabTag->name}", "<i class='icon icon-trash'></i> ", '', "title='{$lang->gitlab->deleteTag}' class='btn btn-primary' target='hiddenwin' $isDisabled");
             ?>
           </td>
         </tr>

module/mr/css/create.css

@@ -0,0 +1 @@
+#mrForm table tbody th {width: 145px;}

module/mr/css/create.en.css

@@ -0,0 +1 @@
+#mrForm table tbody th {width: 185px;}

module/mr/lang/en.php

@@ -57,7 +57,7 @@ $lang->mr->approvalResultList['approve'] = 'Approve';
 $lang->mr->approvalResultList['reject']  = 'Reject';
 
 $lang->mr->needApproved       = 'This MR should be approved before merge';
-$lang->mr->needCI             = 'This MR should be passed CI before merge';
+$lang->mr->needCI             = 'Merge only after passing CI';
 $lang->mr->removeSourceBranch = 'Delete source branch after merge';
 
 $lang->mr->repeatedOperation = 'Do not repeat operations';