Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-21 09:06:32 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-21 09:06:32 +0300
commit80e5134020483299c039114e76b734436f006c66 (patch)
treec01e1b0451c336f2349cc7db9c9dc317b98bed54 /doc/administration/auth
parent8d78e95a9c5b352fb0498ca9c46d068eb93e6e27 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/auth')
-rw-r--r--doc/administration/auth/ldap-ee.md21
1 files changed, 16 insertions, 5 deletions
diff --git a/doc/administration/auth/ldap-ee.md b/doc/administration/auth/ldap-ee.md
index b1d4c8e4298..ba104a4c574 100644
--- a/doc/administration/auth/ldap-ee.md
+++ b/doc/administration/auth/ldap-ee.md
@@ -110,12 +110,23 @@ following.
1. [Restart GitLab][restart] for the changes to take effect.
-To take advantage of group sync, group owners or maintainers will need to create an
-LDAP group link in their group **Settings > LDAP Groups** page.
+To take advantage of group sync, group owners or maintainers will need to [create one
+or more LDAP group links](#adding-group-links).
-Multiple LDAP groups and [filters](#filters-premium-only) can be linked with
-a single GitLab group. When the link is created, an access level/role is
-specified (Guest, Reporter, Developer, Maintainer, or Owner).
+### Adding group links
+
+Once [group sync has been configured](#group-sync) on the instance, one or more LDAP
+groups can be linked to a GitLab group to grant their members access to its
+contents.
+
+Group owners or maintainers can add and use LDAP group links by:
+
+1. Navigating to the group's **Settings > LDAP Synchronization** page. Here, one or more
+ LDAP groups and [filters](#filters-premium-only) can be linked to this GitLab group,
+ each one with a configured [permission level](../../user/permissions.md#group-members-permissions)
+ for its members.
+1. Updating the group's membership by navigating to the group's **Settings > Members**
+ page and clicking **Sync now**.
### Filters **(PREMIUM ONLY)**