summaryrefslogtreecommitdiffstats
path: root/doc/install/Administration.md
diff options
context:
space:
mode:
authorit33 <iantien@gmail.com>2015-11-16 14:39:09 -0800
committerit33 <iantien@gmail.com>2015-11-16 14:39:09 -0800
commitadc5b387010a7c8a52e03b5d6f995c30d4d2116c (patch)
treea65fcb204e517b990b0e82a32f5fc3b122f96e4e /doc/install/Administration.md
parent51f59ec869415e6a4c8eeff0e29d14854f1ad434 (diff)
downloadchat-adc5b387010a7c8a52e03b5d6f995c30d4d2116c.tar.gz
chat-adc5b387010a7c8a52e03b5d6f995c30d4d2116c.tar.bz2
chat-adc5b387010a7c8a52e03b5d6f995c30d4d2116c.zip
Updating given webhooks off by default
Diffstat (limited to 'doc/install/Administration.md')
-rw-r--r--doc/install/Administration.md30
1 files changed, 28 insertions, 2 deletions
diff --git a/doc/install/Administration.md b/doc/install/Administration.md
index 76ec78abd..2d157638b 100644
--- a/doc/install/Administration.md
+++ b/doc/install/Administration.md
@@ -35,9 +35,35 @@ For help and support around your GitLab Mattermost deployment please see:
### Setting up realtime notifications from GitLab to Mattermost
-To set up standard notification from GitLab to Mattermost [follow these steps](https://github.com/mattermost/platform/blob/master/doc/integrations/webhooks/Incoming-Webhooks.md#connecting-mattermost-to-gitlab-using-slack-ui).
-To set up a set of fully customizable realtime notifications from GitLab to Mattermost you can run the [GitLab Integration Service for Mattermost](https://github.com/mattermost/mattermost-integration-gitlab).
+
+#### Connecting Mattermost to GitLab for Slack-equivalent functionality.
+
+Mattermost is designed to be _Slack compatible, not Slack-limited_ and supports integration via the Slack UI in GitLab.
+
+To enable this:
+
+1. In Mattermost, from a team site where you have System Administration privileges, from the main menu **System Console** > **Serice Settings** > **Enable Incoming Webhooks** and select **true** then click **Save**
+
+2. Follow the step-by-step example of [connecting Mattermost incoming webhooks to GitLab's Slack webhooks UI]((https://github.com/mattermost/platform/blob/master/doc/integrations/webhooks/Incoming-Webhooks.md#connecting-mattermost-to-gitlab-using-slack-ui)).
+
+#### Connecting Mattermost to GitLab for functionality exceeding Slack integration.
+
+To enable this:
+
+1. In Mattermost, from a team site where you have System Administration privileges, from the main menu **System Console** > **Serice Settings** > **Enable Incoming Webhooks** and select **true** then click **Save**
+
+2. Set up the [GitLab Integration Service for Mattermost](https://github.com/mattermost/mattermost-integration-gitlab).
+
+#### Connecting Mattermost to integrations with outgoing webhooks
+
+Mattermost offers Slack-compatible outgoing webhooks, that can connect to applications created by the Mattermost community, such as [Hubot](https://www.npmjs.com/package/hubot-mattermost) and [IRC](https://github.com/42wim/matterbridge) support.
+
+To enable this:
+
+1. In Mattermost, from a team site where you have System Administration privileges, from the main menu **System Console** > **Serice Settings** > **Enable Outgoing Webhooks** and select **true** then click **Save**
+
+2. Select a [Mattermost community application](http://www.mattermost.org/community-applications/) using outgoing webhooks--or adapt a Slack application using the same outgoing webhook standard--and follow the setup instructions provided.
### Upgrading GitLab Mattermost manually