summaryrefslogtreecommitdiffstats
path: root/doc/integrations
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-10-13 09:51:55 -0700
committerCorey Hulen <corey@hulen.com>2015-10-13 09:51:55 -0700
commita2979924a430e9e9bb70d30653035af77ecb1ef2 (patch)
treef721454bf9cc22e8a35a5c7e2d94a3ffe53816a0 /doc/integrations
parent1dbc6c5d0e760a1780a401f54503451d6a240192 (diff)
parentb2b641bb114c29f92eb41a4da2f5d612ec03643b (diff)
downloadchat-a2979924a430e9e9bb70d30653035af77ecb1ef2.tar.gz
chat-a2979924a430e9e9bb70d30653035af77ecb1ef2.tar.bz2
chat-a2979924a430e9e9bb70d30653035af77ecb1ef2.zip
Merge pull request #1027 from mattermost/check-https
Updating SSO help on HTTP/HTTPS
Diffstat (limited to 'doc/integrations')
-rw-r--r--doc/integrations/Single-Sign-On/Gitlab.md12
1 files changed, 7 insertions, 5 deletions
diff --git a/doc/integrations/Single-Sign-On/Gitlab.md b/doc/integrations/Single-Sign-On/Gitlab.md
index 87889df66..e503a158b 100644
--- a/doc/integrations/Single-Sign-On/Gitlab.md
+++ b/doc/integrations/Single-Sign-On/Gitlab.md
@@ -12,10 +12,12 @@ The following steps can be used to configure Mattermost to use GitLab as a singl
3. Submit the application and copy the given _Id_ and _Secret_ into the appropriate _SSOSettings_ fields in config/config.json
4. Also in config/config.json, set _Allow_ to `true` for the _gitlab_ section, leave _Scope_ blank and use the following for the endpoints:
- * _AuthEndpoint_: `<your-gitlab-url>/oauth/authorize` (example http://localhost:3000/oauth/authorize)
- * _TokenEndpoint_: `<your-gitlab-url>/oauth/token`
- * _UserApiEndpoint_: `<your-gitlab-url>/api/v3/user`
+ * _AuthEndpoint_: `https://<your-gitlab-url>/oauth/authorize` (example https://example.com/oauth/authorize)
+ * _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.
-6. (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`.
+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`.
-7. Restart your Mattermost server to see the changes take effect.
+6. Restart your Mattermost server to see the changes take effect.