Merge branch '6099-move-ee-differences-for-app-views-admin-users-show-html-haml' into 'master'

Resolve "Move EE differences for `app/views/admin/users/show.html.haml`"

Closes #6099

See merge request gitlab-org/gitlab-ee!10469

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

@@ -6,7 +6,7 @@
         = image_tag avatar_icon_for_user(user), class: 'avatar s16 d-xs-flex d-md-none mr-1 prepend-top-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 }
 
-      = render_if_exists 'admin/users/user_detail_note', user: user
+      = render_if_exists 'admin/users/user_listing_note', user: user
 
       - user_badges_in_admin_section(user).each do |badge|
         - css_badge = "badge badge-#{badge[:variant]}" if badge[:variant].present?

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

@@ -53,7 +53,7 @@
             - else
               Disabled
 
-        = render 'admin/namespace_plan_info', namespace: @user.namespace
+        = render_if_exists 'admin/namespace_plan_info', namespace: @user.namespace
 
         %li
           %span.light External User:
@@ -136,7 +136,7 @@
             %strong
               = link_to @user.created_by.name, [:admin, @user.created_by]
 
-        = render partial: "namespaces/shared_runner_status", locals: { namespace: @user.namespace }
+        = render_if_exists 'namespaces/shared_runner_status', namespace: @user.namespace
 
   .col-md-6
     - unless @user == current_user
@@ -150,13 +150,9 @@
             %p This user has an unconfirmed email address#{email}. You may force a confirmation.
             %br
             = link_to 'Confirm user', confirm_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' }
-      - if @user.note.present?
-        - text = @user.note
-        .card.border-info
-          .card-header.bg-info.text-white
-            Admin Note
-          .card-body
-            %p= text
+
+      = render_if_exists 'admin/users/user_detail_note'
+
       - if @user.blocked?
         .card.border-info
           .card-header.bg-info.text-white

ee/app/views/admin/users/_user_detail_note.html.haml

-- if user.note.present?
-  %span.has-tooltip.user-note{ title: user.note }
-    = icon("sticky-note-o cgrey")
+- if @user.note.present?
+  - text = @user.note
+  .card.border-info
+    .card-header.bg-info.text-white
+      Admin Note
+    .card-body
+      %p= text

ee/app/views/admin/users/_user_listing_note.html.haml

+- if user.note.present?
+  %span.has-tooltip.user-note{ title: user.note }
+    = icon("sticky-note-o cgrey")