diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-01-16 16:08:53 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-01-16 16:08:53 +0000 |
| commit | fb3dc55bbf23506bac329d20d970e07ea703c6e0 (patch) | |
| tree | e8b1cd31fa85c19724f7e7a4a0e7e0df64a94aa9 | |
| parent | faa53a8a7c0eca37d9aa93d6abf3eaaf11303d44 (diff) | |
| parent | 015b133b731453c9a9712a80395d45a0e0e6c000 (diff) | |
| download | gitlab-ce-fb3dc55bbf23506bac329d20d970e07ea703c6e0.tar.gz | |
Merge branch '22111-remove-lock-icon-on-protected-tag' into 'master'
Remove Lock Icon on Protected Tag
Closes #22111
See merge request !8513
| -rw-r--r-- | app/views/projects/branches/_branch.html.haml | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/22111-remove-lock-icon-on-protected-tag.yml | 4 |
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 |