summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Koller <markus-koller@gmx.ch>2017-09-19 16:32:52 +0200
committerMarkus Koller <markus-koller@gmx.ch>2017-09-19 16:35:19 +0200
commitf5c38eccbe4c8f554f7f112b0233722dbb2c3628 (patch)
tree36bcfc5af332debfd04155b77b94d028440de62b
parent7e69f1889b1e7d86aee4faf01089a32eda35786c (diff)
downloadgitlab-ce-f5c38eccbe4c8f554f7f112b0233722dbb2c3628.tar.gz
Add link to OpenID Connect documentation
-rw-r--r--changelogs/unreleased/docs-openid-connect.yml5
-rw-r--r--doc/topics/authentication/index.md1
2 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/docs-openid-connect.yml b/changelogs/unreleased/docs-openid-connect.yml
new file mode 100644
index 00000000000..3989ec53cfa
--- /dev/null
+++ 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
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