summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-05-09 13:59:54 +0000
committerPhil Hughes <me@iamphill.com>2019-05-09 13:59:54 +0000
commit6b2f4ea58957b542415054a81aaebdb3b0fc76f4 (patch)
tree61a3cc2ed82759d5a9663c0e58327f4ccb4c2f2e /app
parent269110b9bbce21cac2b5ef328e5e20618bd5181f (diff)
parent5f54e2e9cb917c444b9aa2f4db764e7e00c8979b (diff)
downloadgitlab-ce-6b2f4ea58957b542415054a81aaebdb3b0fc76f4.tar.gz
Merge branch '6105-move-ee-differences-group-members' into 'master'
CE: Move EE differences for app/views/groups/group_members/index.html.haml See merge request gitlab-org/gitlab-ce!28026
Diffstat (limited to 'app')
-rw-r--r--app/views/groups/group_members/index.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml
index 09cc713e3af..021c0b6c429 100644
--- a/app/views/groups/group_members/index.html.haml
+++ b/app/views/groups/group_members/index.html.haml
@@ -14,6 +14,8 @@
= render 'shared/members/requests', membership_source: @group, requesters: @requesters
+ = render_if_exists 'groups/group_members/ldap_sync'
+
.clearfix
%h5.member.existing-title
Existing members