summaryrefslogtreecommitdiff
path: root/doc/integration
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2019-05-06 08:29:39 +0000
committerAsh McKenzie <amckenzie@gitlab.com>2019-05-06 08:29:39 +0000
commit8b55b794cb48c726cde7cf0ad24180d8e6bb975f (patch)
treea0d30241a9703e611c188197661b398c3aea21b9 /doc/integration
parentf741a7dd3258f2f0d19d8e95642d35934ca59a36 (diff)
parent6018d5bb87a09a4e624983a3bfbb2e573fbb0dd9 (diff)
downloadgitlab-ce-8b55b794cb48c726cde7cf0ad24180d8e6bb975f.tar.gz
Merge branch 'feature/omniauth_oidc_strategy' into 'master'
Added Omniauth OpenID Connect strategy See merge request gitlab-org/gitlab-ce!27383
Diffstat (limited to 'doc/integration')
-rw-r--r--doc/integration/omniauth.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md
index 7fd39b02fbe..ef1f2df77f8 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -33,6 +33,7 @@ contains some settings that are common for all providers.
- [Authentiq](../administration/auth/authentiq.md)
- [OAuth2Generic](oauth2_generic.md)
- [JWT](../administration/auth/jwt.md)
+- [OpenID Connect](../administration/auth/oidc.md)
- [UltraAuth](ultra_auth.md)
## Initial OmniAuth Configuration