summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJob van der Voort <job@gitlab.com>2015-04-22 13:48:12 +0000
committerJob van der Voort <job@gitlab.com>2015-04-22 13:48:12 +0000
commitb5ee60c51263c981098d3268a8cb7105376651fa (patch)
treeab4e35d6a2fd9e3530664b11dbf6aecb782ae2f6
parent0e0325ee993eee2e9aac04186c46a0fde1d726a3 (diff)
parent65c83f8a22ba9747ba6bf01f14d30cd096e3f343 (diff)
downloadgitlab-ce-b5ee60c51263c981098d3268a8cb7105376651fa.tar.gz
Merge branch 'update_slack_doc' into 'master'
Updated Slack documentation Fixes #2234 Updated the Slack documentation to include the new fields located in the service's settings. /cc @karen See merge request !1788
-rw-r--r--doc/integration/slack.md11
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/integration/slack.md b/doc/integration/slack.md
index 2fd22c513ad..84f1d74c058 100644
--- a/doc/integration/slack.md
+++ b/doc/integration/slack.md
@@ -16,7 +16,7 @@ To enable Slack integration you must create an Incoming WebHooks integration on
1. Choose the channel name you want to send notifications to
-1. Click **Add Incoming WebHooks Integration**Add Integrations.
+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.
@@ -32,10 +32,15 @@ After Slack is ready we need to setup GitLab. Here are the steps to achieve this
1. Navigate to Settings -> Services -> Slack
-1. Fill in your Slack details
+1. Pick the triggers you want to activate
+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
+ - Channel: Fill this in if you want to change the channel where the messages will be posted
- Mark it as active
- - Paste in the webhook URL you got from Slack
+
+1. Save your settings
Have fun :)