Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-04-13 22:33:27 +0300
committerClement Ho <ClemMakesApps@gmail.com>2018-04-13 22:33:27 +0300
commit21785171329ef0189a1c99d7b65b106b7bdda48c (patch)
treeaba9d0d5af3b3d2bd229cecc6cfdd77bd61d8d36 /app/views/projects/branches
parentb1c4fdecfceaac6509a817325822aa1e04f59046 (diff)
[skip ci] Convert .label. to .badge.
Diffstat (limited to 'app/views/projects/branches')
-rw-r--r--app/views/projects/branches/_branch.html.haml6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml
index 016894577c0..6042b3a8cba 100644
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
@@ -13,13 +13,13 @@
= branch.name
&nbsp;
- if branch.name == @repository.root_ref
- %span.label.label-primary default
+ %span.badge.label-primary default
- elsif merged
- %span.label.label-info.has-tooltip{ title: s_('Branches|Merged into %{default_branch}') % { default_branch: @repository.root_ref } }
+ %span.badge.label-info.has-tooltip{ title: s_('Branches|Merged into %{default_branch}') % { default_branch: @repository.root_ref } }
= s_('Branches|merged')
- if protected_branch?(@project, branch)
- %span.label.label-success
+ %span.badge.label-success
= s_('Branches|protected')
.block-truncated