diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-05-29 09:40:16 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-05-29 09:40:16 +0000 |
| commit | f139ce9d64e4053a33ead292a8dce46b510e8848 (patch) | |
| tree | 8886b23dd1a4f0b07fd53e5779746ac6c0fbbcd6 | |
| parent | 12b9255eebd2f467cbe9eb7e78a7c9e71da4977e (diff) | |
| parent | 4f14ec1d63706994963c55edea1637d9155e2cd1 (diff) | |
| download | gitlab-ce-f139ce9d64e4053a33ead292a8dce46b510e8848.tar.gz | |
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
| -rw-r--r-- | app/views/admin/users/show.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index c4178296e67..dcd6f7c8078 100644 --- 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: |