diff options
| author | Jon Cairns <jon@joncairns.com> | 2015-11-12 12:06:19 +0000 |
|---|---|---|
| committer | Jon Cairns <jon@joncairns.com> | 2015-11-12 12:06:19 +0000 |
| commit | 1c89db5e395cb3e5c90bab5d3587dbd07229a248 (patch) | |
| tree | 9f040e0194dcc21aa455e859049f14919090e640 /doc/integration/omniauth.md | |
| parent | e073b09f1f0d7b37ece6ecb3e7e485eb3f5e2e6f (diff) | |
| parent | 63144cd062f6d259f1f30b6e06eb92a16caa8dec (diff) | |
| download | gitlab-ce-1c89db5e395cb3e5c90bab5d3587dbd07229a248.tar.gz | |
Merge remote-tracking branch 'gitlab/master' into omniauth-doc-fix
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 3348ada0157..f2b1721fc03 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) |