diff options
| author | Dennis Tang <dtang@gitlab.com> | 2019-04-02 16:40:10 +0000 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2019-04-09 05:34:50 +0000 |
| commit | a3bbfbaeb7359ebe28b826c02ba4c545f7705ac8 (patch) | |
| tree | 659cf719debea63bd5b2180aebe5464af0eb3224 | |
| parent | f15caf0109998308e7f960baaa541d73be8bcacb (diff) | |
| download | gitlab-ce-ce-6099-move-ee-differences-for-app-views-admin-users-show-html-haml.tar.gz | |
CE port: Move EE differences for `app/views/admin/users/show.html.haml`ce-6099-move-ee-differences-for-app-views-admin-users-show-html-haml
| -rw-r--r-- | app/views/admin/users/_user_detail.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/users/show.html.haml | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/views/admin/users/_user_detail.html.haml b/app/views/admin/users/_user_detail.html.haml index 3319b4bad3a..13d10dcd625 100644 --- a/app/views/admin/users/_user_detail.html.haml +++ b/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? diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index 4ffa8d89504..c4178296e67 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -53,6 +53,8 @@ - else Disabled + = render_if_exists 'admin/namespace_plan_info', namespace: @user.namespace + %li %span.light External User: %strong @@ -134,6 +136,8 @@ %strong = link_to @user.created_by.name, [:admin, @user.created_by] + = render_if_exists partial: "namespaces/shared_runner_status", locals: { namespace: @user.namespace } + .col-md-6 - unless @user == current_user - unless @user.confirmed? @@ -146,6 +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?' } + + = render_if_exists 'admin/users/user_detail_note' + - if @user.blocked? .card.border-info .card-header.bg-info.text-white |