summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorit33 <iantien@gmail.com>2015-11-16 14:42:32 -0800
committerit33 <iantien@gmail.com>2015-11-16 14:42:32 -0800
commitb5bb08221302ef76e64a6f372a1b3d4f5b528706 (patch)
treeccf0c05bb8531fdaad43f3dae92db0f0d2f87f4e
parentadc5b387010a7c8a52e03b5d6f995c30d4d2116c (diff)
downloadchat-b5bb08221302ef76e64a6f372a1b3d4f5b528706.tar.gz
chat-b5bb08221302ef76e64a6f372a1b3d4f5b528706.tar.bz2
chat-b5bb08221302ef76e64a6f372a1b3d4f5b528706.zip
Update Administration.md
-rw-r--r--doc/install/Administration.md14
1 files changed, 6 insertions, 8 deletions
diff --git a/doc/install/Administration.md b/doc/install/Administration.md
index 2d157638b..e8a9153e7 100644
--- a/doc/install/Administration.md
+++ b/doc/install/Administration.md
@@ -33,17 +33,15 @@ For help and support around your GitLab Mattermost deployment please see:
- [GitLab Mattermost discussion forum](https://forum.mattermost.org/c/general/gitlab)
- [GitLab Mattermost issue tracker on GitLab.com](https://gitlab.com/gitlab-org/gitlab-mattermost/issues)
-### Setting up realtime notifications from GitLab to Mattermost
-
-
+### Connecting Mattermost to integrations with incoming webhooks
#### 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.
+Mattermost is designed to be _Slack-compatible, not Slack-limited_ and supports integration via the Slack UI in GitLab, as well as fully customizable integrations.
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**
+1. In Mattermost, from a team site where you have System Administration privileges, from the main menu go to **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)).
@@ -51,17 +49,17 @@ To enable this:
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**
+1. In Mattermost, from a team site where you have System Administration privileges, from the main menu go to **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
+### 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**
+1. In Mattermost, from a team site where you have System Administration privileges, from the main menu go to **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.