diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-23 08:38:15 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-23 08:38:15 -0700 |
| commit | 028657b43ed7d6e2b0adca322e2d47781c1b3eb4 (patch) | |
| tree | 7366462741ae8f980f8066d1daa8166ae8a3c17b /doc/integrations | |
| parent | 009982cd4514c6f0950138b15367df559c8f4dd2 (diff) | |
| parent | 0cf24be0662fb9ee2a3b52bfb8c3903bc8c32b72 (diff) | |
| download | chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.tar.gz chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.tar.bz2 chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.zip | |
Merge branch 'master' into PLT-25
Diffstat (limited to 'doc/integrations')
| -rw-r--r-- | doc/integrations/Single-Sign-On/Gitlab.md | 2 | ||||
| -rw-r--r-- | doc/integrations/webhooks/Incoming-Webhooks.md | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/integrations/Single-Sign-On/Gitlab.md b/doc/integrations/Single-Sign-On/Gitlab.md index e503a158b..0a8a1bd18 100644 --- a/doc/integrations/Single-Sign-On/Gitlab.md +++ b/doc/integrations/Single-Sign-On/Gitlab.md @@ -16,7 +16,7 @@ The following steps can be used to configure Mattermost to use GitLab as a singl * _TokenEndpoint_: `https://<your-gitlab-url>/oauth/token` * _UserApiEndpoint_: `https://<your-gitlab-url>/api/v3/user` - Note: Make sure your `HTTPS` or `HTTP` prefix for endpoint URLs matches how your server configuration. + Note: Make sure your `HTTPS` or `HTTP` prefix for endpoint URLs matches your server configuration. 5. (Optional) If you would like to force all users to sign-up with GitLab only, in the _ServiceSettings_ section of config/config.json please set _DisableEmailSignUp_ to `true`. diff --git a/doc/integrations/webhooks/Incoming-Webhooks.md b/doc/integrations/webhooks/Incoming-Webhooks.md index be17d6a8e..7340282be 100644 --- a/doc/integrations/webhooks/Incoming-Webhooks.md +++ b/doc/integrations/webhooks/Incoming-Webhooks.md @@ -90,3 +90,7 @@ As mentioned above, Mattermost makes it easy to take integrations written for Sl To see samples and community contributions, please visit <http://mattermost.org/webhooks>. +#### Limitations + +- The `attachments` payload used in Slack is not yet supported +- Overriding of usernames does not yet apply to notifications |