kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Backport members SCSS changes

Browse source 
This commit backports the changes in
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12304.
This commit is contained in:
Stan Hu 2019-05-06 03:27:38 -07:00
parent 8dd238ada2
commit 6f95be7d01
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/stylesheets/pages/members.scss
View file

@ -130,9 +130,6 @@
.members-ldap {
align-self: center;
height: 100%;
margin-right: 10px;
margin-left: -49px;
}
.alert-member-ldap {

2
app/views/shared/members/_member.html.haml
View file

@ -53,7 +53,7 @@
= time_ago_with_tooltip(member.created_at)
- if show_roles
- current_resource = @project || @group
.controls.member-controls
.controls.member-controls.row
- if show_controls && member.source == current_resource
- if member.can_resend_invite?