diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-05-01 16:21:47 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-05-01 16:21:47 +0000 |
| commit | f9e2b4730f58ba630344c9554eb907ab003abbd5 (patch) | |
| tree | 8ea283d80956ce9117f40cd58469e7dc26a4bb44 /app/views/projects/branches | |
| parent | b49ac65e3fcfcac87157810b08d20efd8b8e5e73 (diff) | |
| parent | 5b92d405fd6e52e6bf1ab1d440ece5a5c1654198 (diff) | |
| download | gitlab-ce-f9e2b4730f58ba630344c9554eb907ab003abbd5.tar.gz | |
Merge branch 'master' into 'bootstrap4'
# Conflicts:
# app/views/projects/branches/_branch.html.haml
Diffstat (limited to 'app/views/projects/branches')
| -rw-r--r-- | app/views/projects/branches/_branch.html.haml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index 54767bdf757..85cde721607 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -8,18 +8,17 @@ %li{ class: "branch-item js-branch-#{branch.name}" } .branch-info .branch-title - = link_to project_tree_path(@project, branch.name), class: 'item-title str-truncated-100 ref-name' do - = sprite_icon('fork', size: 12) + = sprite_icon('fork', size: 12) + = link_to project_tree_path(@project, branch.name), class: 'item-title str-truncated-100 ref-name prepend-left-8' do = branch.name - - if branch.name == @repository.root_ref - %span.badge.badge-primary default + %span.badge.badge-primary.prepend-left-5 default - elsif merged - %span.badge.badge-info.has-tooltip{ title: s_('Branches|Merged into %{default_branch}') % { default_branch: @repository.root_ref } } + %span.badge.badge-info.has-tooltip.prepend-left-5{ title: s_('Branches|Merged into %{default_branch}') % { default_branch: @repository.root_ref } } = s_('Branches|merged') - if protected_branch?(@project, branch) - %span.badge.badge-success + %span.badge.badge-success.prepend-left-5 = s_('Branches|protected') .block-truncated |