diff options
| author | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-04-30 22:28:49 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-04-30 22:28:49 +0000 |
| commit | 8414129873f305c6e08dcd5da9dae00ca0abff2c (patch) | |
| tree | 0e4740a50444dd63069242bb0a26e617ead550c4 | |
| parent | 2f7b71df7619768220657ed47c7737f4c3e19e90 (diff) | |
| download | gitlab-ce-8414129873f305c6e08dcd5da9dae00ca0abff2c.tar.gz | |
Fixed inconsistent protected branch pill baseline
| -rw-r--r-- | app/views/projects/branches/_branch.html.haml | 11 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-inconsistent-protected-branch-pill-baseline.yml | 5 |
2 files changed, 10 insertions, 6 deletions
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index d0c01f95cb7..0e012b5a216 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.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) - %span.label.label-success + %span.label.label-success.prepend-left-5 = s_('Branches|protected') .block-truncated diff --git a/changelogs/unreleased/fix-inconsistent-protected-branch-pill-baseline.yml b/changelogs/unreleased/fix-inconsistent-protected-branch-pill-baseline.yml new file mode 100644 index 00000000000..fb6dffaf226 --- /dev/null +++ b/changelogs/unreleased/fix-inconsistent-protected-branch-pill-baseline.yml @@ -0,0 +1,5 @@ +--- +title: Fixed inconsistent protected branch pill baseline +merge_request: +author: +type: fixed |