diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-21 17:38:37 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-21 17:38:37 +0100 |
| commit | 9832e60ffb801427453301c6da4675f81518cdeb (patch) | |
| tree | dc8e1b7692be8cde7e57b7059de23385e177beed /doc/integration/README.md | |
| parent | e209ba7002238459b56ced1f5b4a7ce8bd6e2b8b (diff) | |
| parent | 7fc2422c8d660d310b819b2b6ffbca9a9e4d8cd6 (diff) | |
| download | gitlab-ce-9832e60ffb801427453301c6da4675f81518cdeb.tar.gz | |
Merge branch 'tduehr/gitlab-ce-cas-support'
Diffstat (limited to 'doc/integration/README.md')
| -rw-r--r-- | doc/integration/README.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/integration/README.md b/doc/integration/README.md index 8ea4111bc8a..6263353851f 100644 --- a/doc/integration/README.md +++ b/doc/integration/README.md @@ -9,6 +9,7 @@ See the documentation below for details on how to configure these services. - [LDAP](ldap.md) Set up sign in via LDAP - [OmniAuth](omniauth.md) Sign in via Twitter, GitHub, GitLab, and Google via OAuth. - [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 - [OAuth2 provider](oauth_provider.md) OAuth2 application creation - [Gmail actions buttons](gmail_action_buttons_for_gitlab.md) Adds GitLab actions to messages |