diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-22 21:42:04 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-22 21:42:04 +0000 |
| commit | 59e469572e5cc99ee50934c50025e3b726ac2c06 (patch) | |
| tree | a7d8330b3e648a6726492571d5ad57eac9079661 | |
| parent | 3fbdc6368a0df46eaa974dec4e4e9c34018d0486 (diff) | |
| parent | fd00646b5b82b6a890c5cf0a825fa420abd29799 (diff) | |
| download | gitlab-ce-59e469572e5cc99ee50934c50025e3b726ac2c06.tar.gz | |
Merge branch 'name-azure-in-general-readme' into 'master'
Name more OmniAuth providers in the general readme.
See merge request !2566
| -rw-r--r-- | doc/integration/README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/integration/README.md b/doc/integration/README.md index 5edac746c7b..846526f4e80 100644 --- a/doc/integration/README.md +++ b/doc/integration/README.md @@ -8,7 +8,7 @@ See the documentation below for details on how to configure these services. - [Jira](jira.md) Integrate with the JIRA issue tracker - [External issue tracker](external-issue-tracker.md) Redmine, JIRA, etc. - [LDAP](ldap.md) Set up sign in via LDAP -- [OmniAuth](omniauth.md) Sign in via Twitter, GitHub, GitLab, and Google via OAuth. +- [OmniAuth](omniauth.md) Sign in via Twitter, GitHub, GitLab.com, Google, Bitbucket, Facebook, Shibboleth, SAML, Crowd and Azure - [SAML](saml.md) Configure GitLab as a SAML 2.0 Service Provider - [CAS](cas.md) Configure GitLab to sign in using CAS - [Slack](slack.md) Integrate with the Slack chat service |