diff --git a/app/views/admin/users/_user_detail.html.haml b/app/views/admin/users/_user_detail.html.haml deleted file mode 100644 index 05e387e64798d7cbd3ef098967383eb01be7d40b..0000000000000000000000000000000000000000 --- a/app/views/admin/users/_user_detail.html.haml +++ /dev/null @@ -1,20 +0,0 @@ -.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 diff --git a/locale/gitlab.pot b/locale/gitlab.pot index d659f46906d2845eaab2881ba8d47bd8180bf47d..f9dab340bb13a62cab0ff5899aa0d1c4c91915a5 100644 --- a/locale/gitlab.pot +++ b/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 "" diff --git a/qa/qa/page/admin/overview/users/index.rb b/qa/qa/page/admin/overview/users/index.rb index 8a2c2303ff74f9bac39a23a9297d0e66bbf1a2c3..2ad45e4a0fa6f4f7ed192967371d4578963a4ee5 100644 --- a/qa/qa/page/admin/overview/users/index.rb +++ b/qa/qa/page/admin/overview/users/index.rb @@ -15,10 +15,6 @@ class Index < QA::Page::Base 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