summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Nikitin <snikitin@outlook.com>2017-01-10 00:35:18 +0300
committerSergey Nikitin <snikitin@outlook.com>2017-01-14 00:42:36 +0300
commit015b133b731453c9a9712a80395d45a0e0e6c000 (patch)
tree2858492429aa6bc9ed0e6eaaff04bba97ae13b8f
parente93cd61793020128ae2f577b20d8e4cc2313ce8b (diff)
downloadgitlab-ce-015b133b731453c9a9712a80395d45a0e0e6c000.tar.gz
Remove Lock Icon on Protected Tag
-rw-r--r--app/views/projects/branches/_branch.html.haml1
-rw-r--r--changelogs/unreleased/22111-remove-lock-icon-on-protected-tag.yml4
2 files changed, 4 insertions, 1 deletions
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml
index 2eb49685f08..04efc2e996c 100644
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
@@ -17,7 +17,6 @@
- if @project.protected_branch? branch.name
%span.label.label-success
- %i.fa.fa-lock
protected
.controls.hidden-xs
- if merge_project && create_mr_button?(@repository.root_ref, branch.name)
diff --git a/changelogs/unreleased/22111-remove-lock-icon-on-protected-tag.yml b/changelogs/unreleased/22111-remove-lock-icon-on-protected-tag.yml
new file mode 100644
index 00000000000..e4f7c1b7762
--- /dev/null
+++ b/changelogs/unreleased/22111-remove-lock-icon-on-protected-tag.yml
@@ -0,0 +1,4 @@
+---
+title: Remove Lock Icon on Protected Tag
+merge_request: 8513
+author: Sergey Nikitin