Merge branch...

Merge branch '344412-make-badges-in-app-views-admin-users-_user_detail-html-haml-pajamas-compliant' into 'master'

Resolve "Make badges in app/views/admin/users/_user_detail.html.haml Pajamas-compliant"

See merge request gitlab-org/gitlab!75920

app/views/admin/users/_user_detail.html.haml

-.flex-list
-  .flex-row
-    = image_tag avatar_icon_for_user(user), class: 'avatar s32 d-none d-md-flex', alt: _('Avatar for %{name}') % { name: sanitize_name(user.name) }
-    .row-main-content
-      .row-title.str-truncated-100
-        = image_tag avatar_icon_for_user(user), class: 'avatar s16 d-xs-flex d-md-none mr-1 gl-mt-2', alt: _('Avatar for %{name}') % { name: sanitize_name(user.name) }
-        = link_to user.name, admin_user_path(user), class: 'text-plain js-user-link', data: { user_id: user.id, qa_selector: 'username_link' }
-
-      = render 'admin/users/user_listing_note', user: user
-
-      - user_badges_in_admin_section(user).each do |badge|
-        - css_badge = "badge gl-badge sm badge-pill badge-#{badge[:variant]}" if badge[:variant].present?
-        %span.px-1.py-1
-          %span{ class: css_badge }
-            = badge[:text]
-
-      .row-second-line.str-truncated-100
-        = mail_to user.email, user.email, class: 'text-secondary'
-        - unless Feature.disabled?(:security_auto_fix) || !user.internal? || user.website_url.blank?
-          = link_to "(#{_('more information')})", user.website_url

locale/gitlab.pot

@@ -5181,9 +5181,6 @@ msgstr ""
 msgid "Avatar for %{assigneeName}"
 msgstr ""
 
-msgid "Avatar for %{name}"
-msgstr ""
-
 msgid "Avatar will be removed. Are you sure?"
 msgstr ""
 
@@ -41888,9 +41885,6 @@ msgstr ""
 msgid "missing"
 msgstr ""
 
-msgid "more information"
-msgstr ""
-
 msgid "most recent deployment"
 msgstr ""
 

qa/qa/page/admin/overview/users/index.rb

@@ -15,10 +15,6 @@ module QA
               element :user_row_content
             end
 
-            view 'app/views/admin/users/_user_detail.html.haml' do
-              element :username_link
-            end
-
             def search_user(username)
               find_element(:user_search_field).set(username).send_keys(:return)
             end