summaryrefslogtreecommitdiff
path: root/doc/topics
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-10-04 17:02:45 +0000
committerRémy Coutable <remy@rymai.me>2017-10-04 17:02:45 +0000
commit5f32a511f8e6b6c3d84e8ea4d1c9e14521888af2 (patch)
treedb8740a3f5e377e1e032176002313c63b5dc57a2 /doc/topics
parent7c5d5402f43cb1a0291150739f3960bd35ed63bf (diff)
parentf5c38eccbe4c8f554f7f112b0233722dbb2c3628 (diff)
downloadgitlab-ce-5f32a511f8e6b6c3d84e8ea4d1c9e14521888af2.tar.gz
Merge branch 'docs/openid-connect' into 'master'
Add link to OpenID Connect documentation See merge request gitlab-org/gitlab-ce!14368
Diffstat (limited to 'doc/topics')
-rw-r--r--doc/topics/authentication/index.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/topics/authentication/index.md b/doc/topics/authentication/index.md
index fac91935a45..597c98fbf6b 100644
--- a/doc/topics/authentication/index.md
+++ b/doc/topics/authentication/index.md
@@ -11,6 +11,7 @@ This page gathers all the resources for the topic **Authentication** within GitL
- [Security Webcast with Yubico](https://about.gitlab.com/2016/08/31/gitlab-and-yubico-security-webcast/)
- **Integrations:**
- [GitLab as OAuth2 authentication service provider](../../integration/oauth_provider.md#introduction-to-oauth)
+ - [GitLab as OpenID Connect identity provider](../../integration/openid_connect_provider.md)
## GitLab administrators