summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytse@gitlab.com>2014-04-30 11:35:55 +0000
committerSytse Sijbrandij <sytse@gitlab.com>2014-04-30 11:35:55 +0000
commite2843373075933f43d714f32e6a5d62e08128ad1 (patch)
tree71439d436b9acf1caf02bbb55dd3b5a770d0a950
parentdc55127c1dce5f3563a090f65f20b689749f5297 (diff)
parent193a9e7d4c7b516fa1ed1c23eeb89ab71c316019 (diff)
downloadgitlab-ce-e2843373075933f43d714f32e6a5d62e08128ad1.tar.gz
Merge branch 'slack-doc-readme' into 'master'
Slack doc readme
-rw-r--r--doc/integration/README.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/integration/README.md b/doc/integration/README.md
index 3e8d329d558..8318113ce92 100644
--- a/doc/integration/README.md
+++ b/doc/integration/README.md
@@ -6,3 +6,4 @@ 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, and Google via OAuth.
++ [Slack](slack.md) Integrate with the Slack chat service