summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-01-26 05:12:45 +0000
committerStan Hu <stanhu@gmail.com>2016-01-26 05:12:45 +0000
commiteb7f669073b2b95a1956de5e22f97dc8f83711e8 (patch)
tree12db8fb7572b800e9adef42bc6f409e3ceb0ede5
parentfa9c6fa0caae511a37c0b134eafd9cb94a7cbc7a (diff)
parent468dbfe937b60cc0b06f062fd01dcfd70450bcf1 (diff)
downloadgitlab-ce-eb7f669073b2b95a1956de5e22f97dc8f83711e8.tar.gz
Merge branch 'patch-1' into 'master'
Update Slack integration configuration Adjusted to the current Slack version (as of I 2016). See merge request !2595
-rw-r--r--doc/integration/slack.md12
1 files changed, 7 insertions, 5 deletions
diff --git a/doc/integration/slack.md b/doc/integration/slack.md
index 84f1d74c058..ecbe0d3e887 100644
--- a/doc/integration/slack.md
+++ b/doc/integration/slack.md
@@ -6,15 +6,17 @@ To enable Slack integration you must create an Incoming WebHooks integration on
1. [Sign in to Slack](https://slack.com/signin)
-1. Select **Configure Integrations** from the dropdown next to your team name.
+1. Select **Apps & Custom Integrations** from the dropdown next to your team name.
-1. Select the **All Services** tab
+1. Click the **Configure** link (right-upper corner).
-1. Click **Add** next to Incoming Webhooks
+1. Select the **Custom integrations** tab.
-1. Pick Incoming WebHooks
+1. Click the **Incoming WebHooks** row.
-1. Choose the channel name you want to send notifications to
+1. Click the **Add configuration** button.
+
+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**.