Merge branch '1090-add-admin-note-to-user-show-page' into 'master'

Resolve "Add admin note to user show page"

Closes #1090

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

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

@@ -141,6 +141,13 @@
             %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
+        .panel.panel-info
+          .panel-heading
+            Admin Note
+          .panel-body
+            %p= text
       - if @user.blocked?
         .panel.panel-info
           .panel-heading

changelogs/unreleased-ee/4546-add-admin-note-to-user-show-page.yml

+---
+title: If admin note exists, display it in admin user view
+merge_request: 4546
+author:
+type: added