summaryrefslogtreecommitdiff
path: root/doc/project_services
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2016-12-09 09:49:38 +0100
committerZ.J. van de Weg <git@zjvandeweg.nl>2016-12-09 09:49:38 +0100
commitb9b2ca47b3bcc7dfc56a3199994063988ff8218e (patch)
treeea62cd1e51d3074db2136b92b2cf1531fea12b96 /doc/project_services
parentb40c26b59dd2bebb4dd5af6f62438d92cc16f58c (diff)
downloadgitlab-ce-b9b2ca47b3bcc7dfc56a3199994063988ff8218e.tar.gz
Update docs to reflect new defaults on omnibuszj-update-chatops-docs
For mattermost chat commands, new defaults are set in the next release making configuring easier. This commit reflects that in the doc. [ci skip]
Diffstat (limited to 'doc/project_services')
-rw-r--r--doc/project_services/img/mattermost_console_integrations.pngbin41186 -> 314642 bytes
-rw-r--r--doc/project_services/mattermost_slash_commands.md8
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/project_services/img/mattermost_console_integrations.png b/doc/project_services/img/mattermost_console_integrations.png
index b3b8c20d7bf..92a30da5be0 100644
--- a/doc/project_services/img/mattermost_console_integrations.png
+++ b/doc/project_services/img/mattermost_console_integrations.png
Binary files differ
diff --git a/doc/project_services/mattermost_slash_commands.md b/doc/project_services/mattermost_slash_commands.md
index 1507dfa3abd..6fcbf6f1642 100644
--- a/doc/project_services/mattermost_slash_commands.md
+++ b/doc/project_services/mattermost_slash_commands.md
@@ -22,6 +22,9 @@ commands in Mattermost and then enable the service in GitLab.
### Step 1. Enable custom slash commands in Mattermost
+This step is only required when using a source install, omnibus installs will be
+preconfigured with the right settings.
+
The first thing to do in Mattermost is to enable custom slash commands from
the administrator console.
@@ -32,8 +35,9 @@ the administrator console.
---
-1. Click **Custom integrations** and set **Enable Custom Slash Commands** to
- true.
+1. Click **Custom integrations** and set **Enable Custom Slash Commands**,
+ **Enable custom integrations to override usernames**, and **Override
+ custom integrations to override profile picture icons** to true
![Mattermost console](img/mattermost_console_integrations.png)