Commit b9dc8e59 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'ldap_group_sync_hints' into 'master'

Ldap group sync hints

See merge request !157
parents 64434261 fa1c44ba
......@@ -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. 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
%strong #{@group.name}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment