diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-10-04 17:02:45 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-10-04 17:02:45 +0000 |
| commit | 5f32a511f8e6b6c3d84e8ea4d1c9e14521888af2 (patch) | |
| tree | db8740a3f5e377e1e032176002313c63b5dc57a2 | |
| parent | 7c5d5402f43cb1a0291150739f3960bd35ed63bf (diff) | |
| parent | f5c38eccbe4c8f554f7f112b0233722dbb2c3628 (diff) | |
| download | gitlab-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
| -rw-r--r-- | changelogs/unreleased/docs-openid-connect.yml | 5 | ||||
| -rw-r--r-- | doc/topics/authentication/index.md | 1 |
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 |