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
fe36a9c8
Commit
fe36a9c8
authored
Apr 12, 2017
by
Marcia Ramos
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'docs-add-auth-to-topics-page' into 'master'
Add auth to topics page See merge request !10643
parents
1585eaf6
bea64d42
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
doc/topics/authentication/index.md
doc/topics/authentication/index.md
+3
-3
doc/topics/index.md
doc/topics/index.md
+2
-1
No files found.
doc/topics/authentication/index.md
View file @
fe36a9c8
...
...
@@ -15,11 +15,11 @@ This page gathers all the resources for the topic **Authentication** within GitL
## GitLab administrators
-
[
LDAP (Community Edition)
](
../../administration/auth/ldap.md
)
-
[
LDAP (Enterprise Edition)
](
https://docs.gitlab.com/ee/administration/auth/ldap-ee.
md
)
-
[
LDAP (Enterprise Edition)
](
https://docs.gitlab.com/ee/administration/auth/ldap-ee.
html
)
-
[
Enforce Two-factor Authentication (2FA)
](
../../security/two_factor_authentication.md#enforce-two-factor-authentication-2fa
)
-
**Articles:**
-
[
Feature Highlight: LDAP Integration
](
https://about.gitlab.com/2014/07/10/feature-highlight-ldap-sync/
)
-
[
Debugging LDAP
](
https://about.gitlab.com/handbook/support/workflows/ldap/debugging_ldap.
md
)
-
[
Debugging LDAP
](
https://about.gitlab.com/handbook/support/workflows/ldap/debugging_ldap.
html
)
-
**Integrations:**
-
[
OmniAuth
](
../../integration/omniauth.md
)
-
[
Authentiq OmniAuth Provider
](
../../administration/auth/authentiq.md#authentiq-omniauth-provider
)
...
...
@@ -27,7 +27,7 @@ This page gathers all the resources for the topic **Authentication** within GitL
-
[
CAS OmniAuth Provider
](
../../integration/cas.md
)
-
[
SAML OmniAuth Provider
](
../../integration/saml.md
)
-
[
Okta SSO provider
](
../../administration/auth/okta.md
)
-
[
Kerberos integration (GitLab EE)
](
https://docs.gitlab.com/ee/integration/kerberos.
md
)
-
[
Kerberos integration (GitLab EE)
](
https://docs.gitlab.com/ee/integration/kerberos.
html
)
## API
...
...
doc/topics/index.md
View file @
fe36a9c8
...
...
@@ -7,6 +7,7 @@ you through better understanding GitLab's concepts
through our regular docs, and, when available, through articles (guides,
tutorials, technical overviews, blog posts) and videos.
-
[
Authentication
](
authentication/index.md
)
-
[
Continuous Integration (GitLab CI)
](
../ci/README.md
)
-
[
Git
](
git/index.md
)
-
[
GitLab Installation
](
../install/README.md
)
...
...
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