diff options
| author | Jeff Stubler <brunsa2@gmail.com> | 2015-11-12 09:05:29 -0600 |
|---|---|---|
| committer | Jeff Stubler <brunsa2@gmail.com> | 2015-11-12 09:05:29 -0600 |
| commit | 64ca9cf3e4a56a19f09160a91c5433d2ddb632cf (patch) | |
| tree | f114ab02adb4815058fe7b84a1527ac5ed7a597e /doc/integration/omniauth.md | |
| parent | e0c64fac68b4b3acc48300956146b85e03b426ce (diff) | |
| parent | 12b35c6fe85073d809a764d24b51937f63b9d098 (diff) | |
| download | gitlab-ce-64ca9cf3e4a56a19f09160a91c5433d2ddb632cf.tar.gz | |
Merge branch 'master' into diverging-branch-graphs
Diffstat (limited to 'doc/integration/omniauth.md')
| -rw-r--r-- | doc/integration/omniauth.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md index c5cecbc2f2d..bd9550c6ddb 100644 --- a/doc/integration/omniauth.md +++ b/doc/integration/omniauth.md @@ -73,8 +73,9 @@ Now we can choose one or more of the Supported Providers below to continue confi - [Bitbucket](bitbucket.md) - [GitLab.com](gitlab.md) - [Google](google.md) -- [Shibboleth](shibboleth.md) +- [Facebook](facebook.md) - [Twitter](twitter.md) +- [Shibboleth](shibboleth.md) - [SAML](saml.md) - [Crowd](crowd.md) |