diff options
Diffstat (limited to 'doc/integrations')
-rw-r--r-- | doc/integrations/Single-Sign-On/Gitlab.md (renamed from doc/integrations/sso/gitlab-sso.md) | 2 | ||||
-rw-r--r-- | doc/integrations/webhooks/Incoming.md (renamed from doc/integrations/webhook/incoming.md) | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/integrations/sso/gitlab-sso.md b/doc/integrations/Single-Sign-On/Gitlab.md index 6110db504..87889df66 100644 --- a/doc/integrations/sso/gitlab-sso.md +++ b/doc/integrations/Single-Sign-On/Gitlab.md @@ -6,6 +6,8 @@ The following steps can be used to configure Mattermost to use GitLab as a singl 2. Add a new application called "Mattermost" with the following as Redirect URIs: * `<your-mattermost-url>/login/gitlab/complete` (example: http://localhost:8065/login/gitlab/complete) * `<your-mattermost-url>/signup/gitlab/complete` + + (Note: If your GitLab instance is set up to use SSL, your URIs must begin with https://. Otherwise, use http://). 3. Submit the application and copy the given _Id_ and _Secret_ into the appropriate _SSOSettings_ fields in config/config.json diff --git a/doc/integrations/webhook/incoming.md b/doc/integrations/webhooks/Incoming.md index e391cba92..6e25f182e 100644 --- a/doc/integrations/webhook/incoming.md +++ b/doc/integrations/webhooks/Incoming.md @@ -25,7 +25,7 @@ In addition, if `Content-Type` is specified as `application/json` in the headers {"text": "Hello, this is some text."} ``` -It is also possible to post richly formatted messages using [Markdown](../../help/enduser/markdown.md). +It is also possible to post richly formatted messages using [Markdown](../../usage/Markdown.md). ``` payload={"text": "# A Header\nThe _text_ below **the** header."} ``` |