Commit 13ace389 authored by Evan Read's avatar Evan Read

Merge branch 'docs-google_secure_ldap' into 'master'

Add documentation for Google Secure LDAP

See merge request gitlab-org/gitlab-ce!26064
parents 91f441c1 1a0856ea
This diff is collapsed.
...@@ -48,6 +48,14 @@ LDAP-enabled users can always authenticate with Git using their GitLab username ...@@ -48,6 +48,14 @@ LDAP-enabled users can always authenticate with Git using their GitLab username
or email and LDAP password, even if password authentication for Git is disabled or email and LDAP password, even if password authentication for Git is disabled
in the application settings. in the application settings.
## Google Secure LDAP **[CORE ONLY]**
> Introduced in GitLab 11.9.
[Google Cloud Identity](https://cloud.google.com/identity/) provides a Secure
LDAP service that can be configured with GitLab for authentication and group sync.
See [Google Secure LDAP](google_secure_ldap.md) for detailed configuration instructions.
## Configuration ## Configuration
NOTE: **Note**: NOTE: **Note**:
......
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