summaryrefslogtreecommitdiff
path: root/doc/user/project
diff options
context:
space:
mode:
authorJoshua Lambert <joshua@gitlab.com>2019-06-19 07:11:24 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-06-19 07:11:24 +0000
commitecf5ef9a41224a390ec30793a05607320ed7d496 (patch)
treeb150c2afae6398e0f4f497e515b5127f76191c4c /doc/user/project
parentc1d51e09aceb57ee1dceebb10533f25c1816386b (diff)
downloadgitlab-ce-ecf5ef9a41224a390ec30793a05607320ed7d496.tar.gz
Crosslink Mattermost integrations, simplify components list
Diffstat (limited to 'doc/user/project')
-rw-r--r--doc/user/project/integrations/mattermost.md4
-rw-r--r--doc/user/project/integrations/mattermost_slash_commands.md3
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/user/project/integrations/mattermost.md b/doc/user/project/integrations/mattermost.md
index d7fd75fd728..ea58a08e127 100644
--- a/doc/user/project/integrations/mattermost.md
+++ b/doc/user/project/integrations/mattermost.md
@@ -1,5 +1,9 @@
# Mattermost Notifications Service
+The Mattermost Notifications Service allows your GitLab project to send events (e.g., `issue created`) to your existing Mattermost team as notifications. This requires configurations in both Mattermost and GitLab.
+
+You can also use Mattermost slash commands to control GitLab inside Mattermost. This is the separately configured [Mattermost slash commands](mattermost_slash_commands.md).
+
## On Mattermost
To enable Mattermost integration you must create an incoming webhook integration:
diff --git a/doc/user/project/integrations/mattermost_slash_commands.md b/doc/user/project/integrations/mattermost_slash_commands.md
index 9c69437537a..41be26c1d30 100644
--- a/doc/user/project/integrations/mattermost_slash_commands.md
+++ b/doc/user/project/integrations/mattermost_slash_commands.md
@@ -6,6 +6,9 @@ Mattermost commands give users an extra interface to perform common operations
from the chat environment. This allows one to, for example, create an issue as
soon as the idea was discussed in Mattermost.
+GitLab can also send events (e.g., `issue created`) to Mattermost as notifications.
+This is the separately configured [Mattermost Notifications Service](mattermost.md).
+
## Prerequisites
Mattermost 3.4 and up is required.