Commit c6d4c188 authored by Phil Hughes's avatar Phil Hughes

Merge branch...

Merge branch '344395-make-badges-in-app-views-projects-starrers-_starrer-html-haml-pajamas-compliant' into 'master'

Make badges in starrers/_starrer partial Pajamas-compliant

See merge request gitlab-org/gitlab!76663
parents 00739d57 894e58fb
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
%span.cgray= starrer.user.to_reference %span.cgray= starrer.user.to_reference
- if starrer.user == current_user - if starrer.user == current_user
%span.badge-pill.badge-success.gl-badge.gl-ml-2.sm= _("It's you") = gl_badge_tag _("It's you"), variant: :success, size: :sm, class: 'gl-ml-2'
.block-truncated .block-truncated
= time_ago_with_tooltip(starrer.starred_since) = time_ago_with_tooltip(starrer.starred_since)
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