BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
d1b06cbe
Commit
d1b06cbe
authored
Aug 01, 2017
by
Douwe Maan
Committed by
James Edwards-Jones
Aug 11, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'mk-fix-ldap-ca-file-docs' into 'master'
Fix LDAP documentation and example config Closes #35770 See merge request !13196
parent
2a345b07
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
gitlab.yml.example
config/gitlab.yml.example
+1
-1
ldap.md
doc/administration/auth/ldap.md
+1
-1
No files found.
config/gitlab.yml.example
View file @
d1b06cbe
...
...
@@ -282,7 +282,7 @@ production: &base
#
# Example: '/etc/ca.pem'
#
ca_
cert
: ''
ca_
file
: ''
# Specifies the SSL version for OpenSSL to use, if the OpenSSL default
# is not appropriate.
...
...
doc/administration/auth/ldap.md
View file @
d1b06cbe
...
...
@@ -96,7 +96,7 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server
#
# Example: '/etc/ca.pem'
#
ca_
cert
: ''
ca_
file
: ''
# Specifies the SSL version for OpenSSL to use, if the OpenSSL default
# is not appropriate.
...
...
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