diff options
| author | Evan Read <eread@gitlab.com> | 2019-08-28 00:52:54 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-08-28 00:52:54 +0000 |
| commit | 61066dc703e69c291d328503c1618ffd2ea7d08e (patch) | |
| tree | 0f175a1516d617371db8054747780a2b376ae1c3 | |
| parent | 0ef49746ad4ab732c9645fb709676c32cb3ea389 (diff) | |
| parent | 57064514837ab3b03f246382765b3371792f6ffe (diff) | |
| download | gitlab-ce-61066dc703e69c291d328503c1618ffd2ea7d08e.tar.gz | |
Merge branch 'docs/66091-change-mattermost-version-reference' into 'master'
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66091
Closes #66091
See merge request gitlab-org/gitlab-ce!32188
| -rw-r--r-- | doc/user/project/integrations/mattermost.md | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/doc/user/project/integrations/mattermost.md b/doc/user/project/integrations/mattermost.md index 6e0f39956d3..c240b6cb6b4 100644 --- a/doc/user/project/integrations/mattermost.md +++ b/doc/user/project/integrations/mattermost.md @@ -13,8 +13,13 @@ To enable Mattermost integration you must create an incoming webhook integration 1. Choose a display name, description and channel, those can be overridden on GitLab. 1. Save it, copy the **Webhook URL**, we'll need this later for GitLab. -There might be some cases that Incoming Webhooks are blocked by admin, ask your mattermost admin to enable -it on **Mattermost System Console > Integrations > Integration Management**, or on **Mattermost System Console > Integrations > Custom Integrations** in Mattermost versions 5.11 and earlier. +Incoming Webhooks might be blocked on your Mattermost instance. Ask your Mattermost admin +to enable it on: + +- **Mattermost System Console > Integrations > Integration Management** in Mattermost + versions 5.12 and later. +- **Mattermost System Console > Integrations > Custom Integrations** in Mattermost + versions 5.11 and earlier. Display name override is not enabled by default, you need to ask your admin to enable it on that same section. |