Commit 1a2a4378 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'gl-badge-branch-list' into 'master'

Apply new GitLab UI for badges in the project branch list

See merge request gitlab-org/gitlab!52868
parents 2b18e59e db42a7ea
......@@ -8,13 +8,13 @@
= link_to project_tree_path(@project, branch.name), class: 'item-title str-truncated-100 ref-name gl-ml-3 qa-branch-name' do
= branch.name
- if branch.name == @repository.root_ref
%span.badge.badge-primary.gl-ml-2 default
%span.badge.gl-badge.sm.badge-pill.badge-primary.gl-ml-2 default
- elsif merged
%span.badge.badge-info.has-tooltip.gl-ml-2{ title: s_('Branches|Merged into %{default_branch}') % { default_branch: @repository.root_ref } }
%span.badge.gl-badge.sm.badge-pill.badge-info.has-tooltip.gl-ml-2{ title: s_('Branches|Merged into %{default_branch}') % { default_branch: @repository.root_ref } }
= s_('Branches|merged')
- if protected_branch?(@project, branch)
%span.badge.badge-success.gl-ml-2
%span.badge.gl-badge.sm.badge-pill.badge-success.gl-ml-2
= s_('Branches|protected')
= render_if_exists 'projects/branches/diverged_from_upstream', branch: branch
......
---
title: Apply new GitLab UI for badges in the project branch list
merge_request: 52868
author: Yogi (@yo)
type: other
- if @project.mirror_ever_updated_successfully? && @repository.diverged_from_upstream?(branch.name)
%span.badge.badge-danger.gl-ml-2.has-tooltip{ data: { html: "true", title: branch_diverged_tooltip_message } }
= sprite_icon('warning-solid')
%span.badge.gl-badge.sm.badge-pill.badge-danger.gl-ml-2.has-tooltip{ data: { html: "true", title: branch_diverged_tooltip_message } }
= sprite_icon('warning-solid', size: 12, css_class: 'gl-mr-2')
= s_('Branches|diverged from upstream')
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