Merge branch 'docs/openid-connect' into 'master'

Add link to OpenID Connect documentation See merge request gitlab-org/gitlab-ce!14368
2017-10-04 17:02:45 +00:00 · 2017-10-04 17:02:45 +00:00 · 5f32a511f8
parent 7c5d5402f4 f5c38eccbe
commit 5f32a511f8
2 changed files with 6 additions and 0 deletions
--- a/changelogs/unreleased/docs-openid-connect.yml
+++ b/changelogs/unreleased/docs-openid-connect.yml
@ -0,0 +1,5 @@
+---
+title: Add link to OpenID Connect documentation
+merge_request: 14368
+author: Markus Koller
+type: other
--- 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