summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2016-07-13 16:49:47 -0300
committerFelipe Artur <felipefac@gmail.com>2016-07-20 12:11:37 -0300
commit323d796a0e7b5f1ef5a170f9918897f6a2d4121e (patch)
tree73a2939ff4a647e00c251171f3c8094acba355e0 /doc
parentede048b930b2ceb89013793d878524eb20248d1f (diff)
downloadgitlab-ce-323d796a0e7b5f1ef5a170f9918897f6a2d4121e.tar.gz
Refactor service settings viewissue_8110
Diffstat (limited to 'doc')
-rw-r--r--doc/integration/slack.md2
-rw-r--r--doc/project_services/img/slack_configuration.pngbin67350 -> 72072 bytes
-rw-r--r--doc/project_services/slack.md4
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/integration/slack.md b/doc/integration/slack.md
index 8dc6c4a24bb..11f956fed3e 100644
--- a/doc/integration/slack.md
+++ b/doc/integration/slack.md
@@ -26,7 +26,7 @@ After Slack is ready we need to setup GitLab. Here are the steps to achieve this
1. Navigate to Settings -> Services -> Slack
-1. Pick the triggers you want to activate and respective channel(#general by default).
+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
diff --git a/doc/project_services/img/slack_configuration.png b/doc/project_services/img/slack_configuration.png
index 0cc672c47c9..d3ebe5969af 100644
--- a/doc/project_services/img/slack_configuration.png
+++ b/doc/project_services/img/slack_configuration.png
Binary files differ
diff --git a/doc/project_services/slack.md b/doc/project_services/slack.md
index 1503d9cd983..4ed33838f7c 100644
--- a/doc/project_services/slack.md
+++ b/doc/project_services/slack.md
@@ -10,8 +10,8 @@ Go to your project's **Settings > Services > Slack** and you will see a checkbox
* Build
* Wiki page
-Bellow each of these event checkboxes you will have a input to insert which Slack channel do you want to send that event message,
-#general channel is default.
+Below each of these event checkboxes you will have an input to insert which Slack channel do you want to send that event message,
+`#general` channel is default.
![Slack configuration](img/slack_configuration.png)