summaryrefslogtreecommitdiff
path: root/app/views/admin/users/show.html.haml
diff options
context:
space:
mode:
authorLuke Bennett <lukeeeebennettplus@gmail.com>2018-06-05 11:55:32 +0100
committerLuke Bennett <lukeeeebennettplus@gmail.com>2018-06-05 11:55:32 +0100
commit3f9cdb9c9822f176ebe4ce8aa34a84e06bae60f0 (patch)
tree8b029adbe769e0c082f2e83ba831ba065648dbb4 /app/views/admin/users/show.html.haml
parent7e36fa398b6f2e0304d852b7c77ef30d83e62ed4 (diff)
parent7eb2f184e6a74c84a58ba07d78d2bcaab764a42d (diff)
downloadgitlab-ce-3f9cdb9c9822f176ebe4ce8aa34a84e06bae60f0.tar.gz
Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redesign-with-draggable-labels
Diffstat (limited to 'app/views/admin/users/show.html.haml')
-rw-r--r--app/views/admin/users/show.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index a74fcea65d8..b0562226f5f 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -8,7 +8,7 @@
.card
.card-header
= @user.name
- %ul.well-list
+ %ul.content-list
%li
= image_tag avatar_icon_for_user(@user, 60), class: "avatar s60"
%li
@@ -21,7 +21,7 @@
.card
.card-header
Account:
- %ul.well-list
+ %ul.content-list
%li
%span.light Name:
%strong= @user.name