Merge branch 'tpresa-using-license-seat' into 'master'

Show if a user is using a license seat See merge request gitlab-org/gitlab-ce!28790
2019-05-29 09:40:16 +00:00 · 2019-05-29 09:40:16 +00:00 · f139ce9d64
parent 12b9255eeb 4f14ec1d63
commit f139ce9d64
1 changed files with 2 additions and 0 deletions
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@ -124,6 +124,8 @@
          %strong
            = Gitlab::Access.human_access_with_none(@user.highest_role)

+        = render_if_exists 'admin/users/using_license_seat', user: @user
+
        - if @user.ldap_user?
          %li
            %span.light LDAP uid: