diff options
| author | Sean Packham <sean@seanpackham.com> | 2016-12-22 15:41:24 +0000 |
|---|---|---|
| committer | Sean Packham <sean@seanpackham.com> | 2016-12-22 15:41:24 +0000 |
| commit | 19b0af4e876050dc31028f711057618846421d70 (patch) | |
| tree | 5e349707e841883715b920c457c9771b0f33f39e /doc | |
| parent | fbd8fd883bfc1c1c6e5fda132c8759c608fa7980 (diff) | |
| parent | 68e1c3cbe6e9c6987b7e1d0e8bb23d69bf7e8f54 (diff) | |
| download | gitlab-ce-19b0af4e876050dc31028f711057618846421d70.tar.gz | |
Merge branch 'zj-mattermost-auto-config-docs' into 'master'
Docs on MM auto config
See merge request !8230
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/project_services/mattermost_slash_commands.md | 10 |
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 |