Commit ed2c9ac1 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'yo-gl-badge-users-admin' into 'master'

Apply new GitLab UI badge for users in the admin page

See merge request gitlab-org/gitlab!52289
parents 02c1315b 6d2fc4a0
...@@ -9,9 +9,10 @@ ...@@ -9,9 +9,10 @@
= render 'admin/users/user_listing_note', user: user = render 'admin/users/user_listing_note', user: user
- user_badges_in_admin_section(user).each do |badge| - user_badges_in_admin_section(user).each do |badge|
- css_badge = "badge badge-#{badge[:variant]}" if badge[:variant].present? - css_badge = "badge gl-badge sm badge-pill badge-#{badge[:variant]}" if badge[:variant].present?
%span{ class: css_badge } %span.px-1.py-1
= badge[:text] %span{ class: css_badge }
= badge[:text]
.row-second-line.str-truncated-100 .row-second-line.str-truncated-100
= mail_to user.email, user.email, class: 'text-secondary' = mail_to user.email, user.email, class: 'text-secondary'
......
---
title: Apply new GitLab UI badge for users in the admin page
merge_request: 52289
author: Yogi (@yo)
type: other
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