summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2017-04-12 17:17:26 +0000
committerMarcia Ramos <virtua.creative@gmail.com>2017-04-12 17:17:26 +0000
commitfe36a9c8464253c5fe37bc5c8cf8a65ab8cb3776 (patch)
tree3c32a976e0d46e55ce4e7e1675cc13cf5e175dba
parent1585eaf64b3b791bbad712733f6f45c7103c8f89 (diff)
parentbea64d429268163cef28ae309f2d22f2135a900b (diff)
downloadgitlab-ce-fe36a9c8464253c5fe37bc5c8cf8a65ab8cb3776.tar.gz
Merge branch 'docs-add-auth-to-topics-page' into 'master'
Add auth to topics page See merge request !10643
-rw-r--r--doc/topics/authentication/index.md6
-rw-r--r--doc/topics/index.md3
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/topics/authentication/index.md b/doc/topics/authentication/index.md
index 47d3f05999d..eafd2fd9d04 100644
--- a/doc/topics/authentication/index.md
+++ b/doc/topics/authentication/index.md
@@ -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
diff --git a/doc/topics/index.md b/doc/topics/index.md
index 4a16f6f629c..ad388dff822 100644
--- a/doc/topics/index.md
+++ b/doc/topics/index.md
@@ -7,9 +7,10 @@ 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)
- [GitLab Pages](../user/project/pages/index.md)
->**Note:** More topics will be available soon. \ No newline at end of file
+>**Note:** More topics will be available soon.