summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2016-12-21 16:32:00 +0100
committerZ.J. van de Weg <git@zjvandeweg.nl>2016-12-21 16:50:20 +0100
commit68e1c3cbe6e9c6987b7e1d0e8bb23d69bf7e8f54 (patch)
tree16dc3c8f2a6d173e01b2fa87d26b4d41085d15aa /doc
parent845e2d3667ed697fea49123c9251226b1f7126ac (diff)
downloadgitlab-ce-zj-mattermost-auto-config-docs.tar.gz
Docs on MM auto configzj-mattermost-auto-config-docs
[ci skip]
Diffstat (limited to 'doc')
-rw-r--r--doc/project_services/mattermost_slash_commands.md10
1 files changed, 8 insertions, 2 deletions
diff --git a/doc/project_services/mattermost_slash_commands.md b/doc/project_services/mattermost_slash_commands.md
index 1a7c13a29b4..67cb88104c1 100644
--- a/doc/project_services/mattermost_slash_commands.md
+++ b/doc/project_services/mattermost_slash_commands.md
@@ -14,12 +14,18 @@ If you have the Omnibus GitLab package installed, Mattermost is already bundled
in it. All you have to do is configure it. Read more in the
[Omnibus GitLab Mattermost documentation][omnimmdocs].
-## Configuration
+## Automated Configuration
+
+If Mattermost is installed on the same server as GitLab, the configuration process can be
+done for you by GitLab.
+
+Go to the Mattermost Slash Command service on your project and click the 'Add to Mattermost' button.
+
+## Manual Configuration
The configuration consists of two parts. First you need to enable the slash
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