diff options
| author | Job van der Voort <job@gitlab.com> | 2015-06-29 11:09:44 +0000 |
|---|---|---|
| committer | Job van der Voort <job@gitlab.com> | 2015-06-29 11:09:44 +0000 |
| commit | 4b69c0a9e75d35bdd9e46e7bdc7bb53e8a58d639 (patch) | |
| tree | 768757cc121d467a76b1ee95feafee81c481a343 | |
| parent | 32330e8c285a4b8b8ebfd83441ade47423bc9fed (diff) | |
| parent | 3c01ab10fe255436d681df463bc78f4fa50115e5 (diff) | |
| download | gitlab-ce-4b69c0a9e75d35bdd9e46e7bdc7bb53e8a58d639.tar.gz | |
Merge branch 'link-to-saml' into 'master'
Link to SAML docs from doc index
Without this link, the SAML docs are hard to discover.
See merge request !1882
| -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 286bd34a0bd..6d856951d4e 100644 --- a/doc/integration/README.md +++ b/doc/integration/README.md @@ -7,6 +7,7 @@ See the documentation below for details on how to configure these services. - [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. +- [SAML](saml.md) Configure GitLab as a SAML 2.0 Service Provider - [Slack](slack.md) Integrate with the Slack chat service - [OAuth2 provider](oauth_provider.md) OAuth2 application creation - [Gmail](gitlab_buttons_in_gmail.md) Adds GitLab actions to messages |