diff --git a/module/gitlab/control.php b/module/gitlab/control.php index b6a3a43913..a56097db8f 100644 --- a/module/gitlab/control.php +++ b/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; } diff --git a/module/gitlab/view/browsetag.html.php b/module/gitlab/view/browsetag.html.php index bfdb0aa800..b2745afe98 100644 --- a/module/gitlab/view/browsetag.html.php +++ b/module/gitlab/view/browsetag.html.php @@ -62,7 +62,8 @@ updated?> name}", " ", '', "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}", " ", '', "title='{$lang->gitlab->deleteTag}' class='btn btn-primary' target='hiddenwin' $isDisabled"); ?> diff --git a/module/mr/css/create.css b/module/mr/css/create.css new file mode 100644 index 0000000000..7176c78083 --- /dev/null +++ b/module/mr/css/create.css @@ -0,0 +1 @@ +#mrForm table tbody th {width: 145px;} diff --git a/module/mr/css/create.en.css b/module/mr/css/create.en.css new file mode 100644 index 0000000000..4fccd4c2bc --- /dev/null +++ b/module/mr/css/create.en.css @@ -0,0 +1 @@ +#mrForm table tbody th {width: 185px;} diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php index d3ab106136..b9dd743449 100644 --- a/module/mr/lang/en.php +++ b/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';