Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
9621ace1
Commit
9621ace1
authored
Apr 04, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
69860f22
13ace389
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
354 additions
and
147 deletions
+354
-147
doc/administration/auth/google_secure_ldap.md
doc/administration/auth/google_secure_ldap.md
+207
-0
doc/administration/auth/img/google_secure_ldap_add_step_1.png
...administration/auth/img/google_secure_ldap_add_step_1.png
+0
-0
doc/administration/auth/img/google_secure_ldap_add_step_2.png
...administration/auth/img/google_secure_ldap_add_step_2.png
+0
-0
doc/administration/auth/img/google_secure_ldap_client_settings.png
...istration/auth/img/google_secure_ldap_client_settings.png
+0
-0
doc/administration/auth/ldap.md
doc/administration/auth/ldap.md
+8
-0
doc/update/mysql_to_postgresql.md
doc/update/mysql_to_postgresql.md
+139
-147
No files found.
doc/administration/auth/google_secure_ldap.md
0 → 100644
View file @
9621ace1
This diff is collapsed.
Click to expand it.
doc/administration/auth/img/google_secure_ldap_add_step_1.png
0 → 100644
View file @
9621ace1
28.2 KB
doc/administration/auth/img/google_secure_ldap_add_step_2.png
0 → 100644
View file @
9621ace1
80.2 KB
doc/administration/auth/img/google_secure_ldap_client_settings.png
0 → 100644
View file @
9621ace1
62.5 KB
doc/administration/auth/ldap.md
View file @
9621ace1
...
...
@@ -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
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
NOTE:
**Note**
:
...
...
doc/update/mysql_to_postgresql.md
View file @
9621ace1
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment