Read about our upcoming Code of Conduct on this issue

This instance will be upgraded to Heptapod 0.28.0 on 2022-01-18 at 14:00 UTC+1 (a few minutes of down time)

Commit 7146617b authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files

Merge branch 'fix-inconsistent-protected-branch-pill-baseline' into 'master'

Fixed inconsistent protected branch pill baseline

Closes #41286 and #45354

See merge request gitlab-org/gitlab-ce!18409
......@@ -8,18 +8,17 @@
%li{ class: "branch-item js-branch-#{}" }
= link_to project_tree_path(@project,, 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,, class: 'item-title str-truncated-100 ref-name prepend-left-8' do
- if == @repository.root_ref
%span.label.label-primary default
%span.label.label-primary.prepend-left-5 default
- elsif merged
%span.label.label-info.has-tooltip{ title: s_('Branches|Merged into %{default_branch}') % { default_branch: @repository.root_ref } }
%span.label.label-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)
= s_('Branches|protected')
title: Fixed inconsistent protected branch pill baseline
type: fixed
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment