From 06ae63dbd0201683c2516e14bc53f9014abbcaa7 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Mon, 8 Aug 2016 04:09:59 +0000 Subject: [PATCH 1/4] Update ldap-ee.md - EE feautures --- doc/administration/auth/ldap-ee.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/doc/administration/auth/ldap-ee.md b/doc/administration/auth/ldap-ee.md index b040607e12529b..8b4099abb50bc3 100644 --- a/doc/administration/auth/ldap-ee.md +++ b/doc/administration/auth/ldap-ee.md @@ -1,3 +1,26 @@ +---- + +## What is LDAP about? + +[LDAP](https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol) +stands for Lightweight Directory Access Protocol, which +is a standard application protocol for +accessing and maintaining distributed directory information services +over an Internet Protocol (IP) network. + +GitLab integrates with LDAP to support **user authentication**. This integration +works with most LDAP-compliant directory servers, including Microsoft Active +Directory, Apple Open Directory, Open LDAP, and 389 Server. GitLab EE includes +enhanced integration, including group membership syncing. + +## Use-cases + +- User Sync: Once per day, GitLab will update users against LDAP +- Group Sync: Once an hour, GitLab will update group membership +based on LDAP group members + +---- + # LDAP Additions in GitLab EE This is a continuation of the main [LDAP documentation](ldap.md), detailing LDAP -- GitLab From d20c3e9c5d21dc92b18f91802840d54e619fecd9 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Mon, 8 Aug 2016 04:22:01 +0000 Subject: [PATCH 2/4] small edits --- doc/administration/auth/ldap-ee.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/administration/auth/ldap-ee.md b/doc/administration/auth/ldap-ee.md index 8b4099abb50bc3..cea3f091f05aef 100644 --- a/doc/administration/auth/ldap-ee.md +++ b/doc/administration/auth/ldap-ee.md @@ -3,7 +3,7 @@ ## What is LDAP about? [LDAP](https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol) -stands for Lightweight Directory Access Protocol, which +stands for **Lightweight Directory Access Protocol**, which is a standard application protocol for accessing and maintaining distributed directory information services over an Internet Protocol (IP) network. @@ -15,7 +15,7 @@ enhanced integration, including group membership syncing. ## Use-cases -- User Sync: Once per day, GitLab will update users against LDAP +- User Sync: Once a day, GitLab will update users against LDAP - Group Sync: Once an hour, GitLab will update group membership based on LDAP group members -- GitLab From b0e5485fb5097f0a2ba39f8a1a9831edd1ef2523 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Thu, 18 Aug 2016 02:33:06 +0000 Subject: [PATCH 3/4] adjustments based on https://gitlab.com/gitlab-com/marketing/issues/336#note_13718538 --- doc/administration/auth/ldap-ee.md | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/doc/administration/auth/ldap-ee.md b/doc/administration/auth/ldap-ee.md index cea3f091f05aef..af8769c66e099c 100644 --- a/doc/administration/auth/ldap-ee.md +++ b/doc/administration/auth/ldap-ee.md @@ -1,6 +1,10 @@ ----- -## What is LDAP about? +# LDAP Additions in GitLab EE + +This is a continuation of the main [LDAP documentation](ldap.md), detailing LDAP +features specific to GitLab Enterprise Edition. + +## Overview [LDAP](https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol) stands for **Lightweight Directory Access Protocol**, which @@ -10,7 +14,7 @@ over an Internet Protocol (IP) network. GitLab integrates with LDAP to support **user authentication**. This integration works with most LDAP-compliant directory servers, including Microsoft Active -Directory, Apple Open Directory, Open LDAP, and 389 Server. GitLab EE includes +Directory, Apple Open Directory, Open LDAP, and 389 Server. **GitLab EE** includes enhanced integration, including group membership syncing. ## Use-cases @@ -19,13 +23,6 @@ enhanced integration, including group membership syncing. - Group Sync: Once an hour, GitLab will update group membership based on LDAP group members ----- - -# LDAP Additions in GitLab EE - -This is a continuation of the main [LDAP documentation](ldap.md), detailing LDAP -features specific to GitLab Enterprise Edition. - ## User Sync Once per day, GitLab will run a worker to check and update GitLab -- GitLab From 8693b970c0019b32ecd15d9effa793712005e837 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Thu, 18 Aug 2016 06:31:29 +0000 Subject: [PATCH 4/4] trying to make the build pass --- doc/administration/auth/ldap-ee.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/administration/auth/ldap-ee.md b/doc/administration/auth/ldap-ee.md index af8769c66e099c..70eecce5d1f73c 100644 --- a/doc/administration/auth/ldap-ee.md +++ b/doc/administration/auth/ldap-ee.md @@ -1,9 +1,10 @@ - # LDAP Additions in GitLab EE This is a continuation of the main [LDAP documentation](ldap.md), detailing LDAP features specific to GitLab Enterprise Edition. +--- + ## Overview [LDAP](https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol) -- GitLab