summaryrefslogtreecommitdiff
path: root/doc/integration
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-07-19 19:33:02 +0300
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-07-22 12:37:05 +0300
commita93323cd9449ec59464727c7758401d25c4801d4 (patch)
tree9ca0567d1953ed565dd5fd4b7f1aac325d64294d /doc/integration
parentcbe787c5872318befb9d3cbd2918a44878e04497 (diff)
downloadgitlab-ce-a93323cd9449ec59464727c7758401d25c4801d4.tar.gz
Refactor Slack service documentation
[ci skip]
Diffstat (limited to 'doc/integration')
-rw-r--r--doc/integration/README.md1
-rw-r--r--doc/integration/slack.md41
2 files changed, 1 insertions, 41 deletions
diff --git a/doc/integration/README.md b/doc/integration/README.md
index fd330dd7a7d..ddbd570ac6c 100644
--- a/doc/integration/README.md
+++ b/doc/integration/README.md
@@ -11,7 +11,6 @@ See the documentation below for details on how to configure these services.
- [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
- [OAuth2 provider](oauth_provider.md) OAuth2 application creation
- [Gmail actions buttons](gmail_action_buttons_for_gitlab.md) Adds GitLab actions to messages
- [reCAPTCHA](recaptcha.md) Configure GitLab to use Google reCAPTCHA for new users
diff --git a/doc/integration/slack.md b/doc/integration/slack.md
index 11f956fed3e..8cd151fbf95 100644
--- a/doc/integration/slack.md
+++ b/doc/integration/slack.md
@@ -1,40 +1 @@
-# Slack integration
-
-## On Slack
-
-To enable Slack integration you must create an Incoming WebHooks integration on Slack:
-
-1. [Sign in to Slack](https://slack.com/signin)
-
-1. Visit [Incoming WebHooks](https://my.slack.com/services/new/incoming-webhook/)
-
-1. Choose the channel name you want to send notifications to.
-
-1. Click **Add Incoming WebHooks Integration**
- - Optional step; You can change bot's name and avatar by clicking modifying the bot name or avatar under **Integration Settings**.
-
-1. Copy the **Webhook URL**, we'll need this later for GitLab.
-
-
-## On GitLab
-
-After Slack is ready we need to setup GitLab. Here are the steps to achieve this.
-
-1. Sign in to GitLab
-
-1. Pick the repository you want.
-
-1. Navigate to Settings -> Services -> Slack
-
-1. Pick the triggers you want to activate and respective channel (`#general` by default).
-
-1. Fill in your Slack details
- - Webhook: Paste the Webhook URL from the step above
- - Username: Fill this in if you want to change the username of the bot
- - Mark it as active
-
-1. Save your settings
-
-Have fun :)
-
-*P.S. You can set "branch,pushed,Compare changes" as highlight words on your Slack profile settings, so that you can be aware of new commits when somebody pushes them.*
+This document was moved to [project_services/slack.md](../project_services/slack.md).