From ce6c46e25bc77146c886609c68393e00603248cf Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Mon, 25 Aug 2014 13:46:07 +0200 Subject: [PATCH 1/2] Add short explanation on what to expect when doing group sync. --- app/views/groups/members.html.haml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/groups/members.html.haml b/app/views/groups/members.html.haml index d00397c26a..dbeb32fb88 100644 --- a/app/views/groups/members.html.haml +++ b/app/views/groups/members.html.haml @@ -19,7 +19,7 @@ .pull-right - if ldap_enabled? && @group.ldap_cn.present? = link_to reset_access_group_ldap_path(@group), class: 'btn btn-grouped', data: { confirm: "Reset the access level of all other LDAP group team members to '#{@group.human_ldap_access}'?" }, method: :put do - Reset access + Reset access to #{@group.human_ldap_access} = link_to '#', class: 'btn btn-new js-toggle-button' do Add members @@ -30,12 +30,12 @@ - if ldap_enabled? && @group.ldap_cn.present? .bs-callout.bs-callout-info - The members of this group are synced with the LDAP group with cn + The members of this group are synced with the LDAP group with cn %code #{@group.ldap_cn} - \. They are given + \. They are given %code #{@group.human_ldap_access} - access. - + access. Depending on LDAP group size it can take time for LDAP user to get shown on the page. + .panel.panel-default.prepend-top-20 .panel-heading %strong #{@group.name} From fa1c44ba1ad71b4b1156ea93c6b1ab7e6ef26e34 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Mon, 25 Aug 2014 15:48:50 +0200 Subject: [PATCH 2/2] Rewrite explanation text for ldap group members. --- app/views/groups/members.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/groups/members.html.haml b/app/views/groups/members.html.haml index dbeb32fb88..c64a13de9e 100644 --- a/app/views/groups/members.html.haml +++ b/app/views/groups/members.html.haml @@ -34,7 +34,7 @@ %code #{@group.ldap_cn} \. They are given %code #{@group.human_ldap_access} - access. Depending on LDAP group size it can take time for LDAP user to get shown on the page. + access. Because LDAP permissions in GitLab get updated one user at a time and because GitLab caches LDAP check results, changes on your LDAP server or in this group's LDAP sync settings may take up to #{Gitlab.config.ldap['sync_time']}s to show in the list below. .panel.panel-default.prepend-top-20 .panel-heading