diff options
| author | Sean Packham <sean@seanpackham.com> | 2016-12-09 11:04:41 +0000 |
|---|---|---|
| committer | Sean Packham <sean@seanpackham.com> | 2016-12-09 11:04:41 +0000 |
| commit | 16b9ecb5810abc6221a0187c76c0e859a9ff7db3 (patch) | |
| tree | 802c31a293718a12429a50d62a51c62eec0c2a76 /doc | |
| parent | aa0a7aa3b5ba59b772f4d0c0bd061d278295b01f (diff) | |
| parent | b9b2ca47b3bcc7dfc56a3199994063988ff8218e (diff) | |
| download | gitlab-ce-16b9ecb5810abc6221a0187c76c0e859a9ff7db3.tar.gz | |
Merge branch 'zj-update-chatops-docs' into 'master'
Update docs to reflect new defaults on omnibus
## What does this MR do?
Updates docs, after gitlab-org/omnibus-gitlab!1154 the flow has changed.
See merge request !8006
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/project_services/img/mattermost_console_integrations.png | bin | 41186 -> 314642 bytes | |||
| -rw-r--r-- | doc/project_services/mattermost_slash_commands.md | 8 |
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 Binary files differindex b3b8c20d7bf..92a30da5be0 100644 --- a/doc/project_services/img/mattermost_console_integrations.png +++ b/doc/project_services/img/mattermost_console_integrations.png 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  |
