Commit 05377f23 authored by Mark Florian's avatar Mark Florian

Merge branch...

Merge branch '344331-make-badges-in-ee-app-views-projects-branches-_diverged_from_upstream-html-haml-pajamas' into 'master'

Make badge in _diverged_from_upstream partial Pajamas-compliant

See merge request gitlab-org/gitlab!78984
parents 7976ea9c 78e8a289
- if @project.mirror_ever_updated_successfully? && @repository.diverged_from_upstream?(branch.name) - if @project.mirror_ever_updated_successfully? && @repository.diverged_from_upstream?(branch.name)
%span.badge.gl-badge.sm.badge-pill.badge-danger.gl-ml-2.has-tooltip{ data: { html: "true", title: branch_diverged_tooltip_message } } = gl_badge_tag({ variant: :danger, size: :sm, icon: 'warning-solid' }, { class: 'has-tooltip gl-ml-2', data: { html: 'true', title: branch_diverged_tooltip_message } }) do
= sprite_icon('warning-solid', size: 12, css_class: 'gl-mr-2')
= s_('Branches|diverged from upstream') = 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