diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-15 15:45:40 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-15 15:45:40 +0000 |
| commit | cc0c2d18445a9115e87594c22cb47fcb1e8e5c41 (patch) | |
| tree | a0e27c4337e3b6bfd3701fba0a98f40ade1e3eae /doc/integration/omniauth.md | |
| parent | 178b6014f856dbca1653961a1f8341d7d1d38d2f (diff) | |
| parent | 4ca6a719a9f961efa8e9b2a9401319cbfc6403df (diff) | |
| download | gitlab-ce-zj-remove-deprecated-ci-service.tar.gz | |
Merge branch 'master' into 'zj-remove-deprecated-ci-service'zj-remove-deprecated-ci-service
# Conflicts:
# db/schema.rb
Diffstat (limited to 'doc/integration/omniauth.md')
| -rw-r--r-- | doc/integration/omniauth.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md index 98a680d0dbe..47e20d7566a 100644 --- a/doc/integration/omniauth.md +++ b/doc/integration/omniauth.md @@ -31,6 +31,7 @@ contains some settings that are common for all providers. - [Azure](azure.md) - [Auth0](auth0.md) - [Authentiq](../administration/auth/authentiq.md) +- [OAuth2Generic](oauth2_generic.md) ## Initial OmniAuth Configuration |