Merge branch 'yo-gl-badge-user-emails' into 'master'

Move email badges to new GitLab UI badges

See merge request gitlab-org/gitlab!51915

app/views/profiles/emails/index.html.haml

@@ -37,23 +37,23 @@
       %li
         = render partial: 'shared/email_with_badge', locals: { email: @primary_email, verified: current_user.confirmed? }
         %span.float-right
-          %span.badge.badge-success= s_('Profiles|Primary email')
+          %span.badge.badge-muted.badge-pill.gl-badge.badge-success= s_('Profiles|Primary email')
           - if @primary_email === current_user.commit_email
-            %span.badge.badge-info= s_('Profiles|Commit email')
+            %span.badge.badge-muted.badge-pill.gl-badge.badge-info= s_('Profiles|Commit email')
           - if @primary_email === current_user.public_email
-            %span.badge.badge-info= s_('Profiles|Public email')
+            %span.badge.badge-muted.badge-pill.gl-badge.badge-info= s_('Profiles|Public email')
           - if @primary_email === current_user.notification_email
-            %span.badge.badge-info= s_('Profiles|Default notification email')
+            %span.badge.badge-muted.badge-pill.gl-badge.badge-info= s_('Profiles|Default notification email')
       - @emails.each do |email|
         %li{ data: { qa_selector: 'email_row_content' } }
           = render partial: 'shared/email_with_badge', locals: { email: email.email, verified: email.confirmed? }
           %span.float-right
             - if email.email === current_user.commit_email
-              %span.badge.badge-info= s_('Profiles|Commit email')
+              %span.badge.badge-muted.badge-pill.gl-badge.badge-info= s_('Profiles|Commit email')
             - if email.email === current_user.public_email
-              %span.badge.badge-info= s_('Profiles|Public email')
+              %span.badge.badge-muted.badge-pill.gl-badge.badge-info= s_('Profiles|Public email')
             - if email.email === current_user.notification_email
-              %span.badge.badge-info= s_('Profiles|Notification email')
+              %span.badge.badge-muted.badge-pill.gl-badge.badge-info= s_('Profiles|Notification email')
             - unless email.confirmed?
               - confirm_title = "#{email.confirmation_sent_at ? _('Resend confirmation email') : _('Send confirmation email')}"
               = link_to confirm_title, resend_confirmation_instructions_profile_email_path(email), method: :put, class: 'gl-button btn btn-sm btn-warning gl-ml-3'

changelogs/unreleased/yo-gl-badge-user-emails.yml

+---
+title: Move email badges to new GitLab UI badges
+merge_request: 51915
+author: Yogi (@yo)
+type: other