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

Add link to OpenID Connect documentation See merge request gitlab-org/gitlab-ce!14368

Merge branch 'docs/openid-connect' into 'master'
5f32a511 · Rémy Coutable · 7c5d5402 · f5c38ecc · 5f32a511 · 5f32a511
Commit 5f32a511 authored Oct 04, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

docs-openid-connect.yml changelogs/unreleased/docs-openid-connect.yml +5 -0

index.md doc/topics/authentication/index.md +1 -0

No files found.
--- a/changelogs/unreleased/docs-openid-connect.yml
+++ b/changelogs/unreleased/docs-openid-connect.yml
+---
+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