summaryrefslogtreecommitdiffstats
path: root/doc/integrations
diff options
context:
space:
mode:
authorlfbrock <lf.brock@spinpunch.com>2015-10-05 14:42:29 -0400
committerlfbrock <lf.brock@spinpunch.com>2015-10-05 14:42:29 -0400
commit9fe011a86e0c88cefffbc6b991c31bb923ee0f76 (patch)
treec3351f13b9ca29dec4d44cbe133462fa24d61e24 /doc/integrations
parent193732ffbf1107fd146412ce38a053354d972e25 (diff)
downloadchat-9fe011a86e0c88cefffbc6b991c31bb923ee0f76.tar.gz
chat-9fe011a86e0c88cefffbc6b991c31bb923ee0f76.tar.bz2
chat-9fe011a86e0c88cefffbc6b991c31bb923ee0f76.zip
Added when to use https vs http to GitLab SSO instructions
Diffstat (limited to 'doc/integrations')
-rw-r--r--doc/integrations/Single-Sign-On/Gitlab.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/integrations/Single-Sign-On/Gitlab.md b/doc/integrations/Single-Sign-On/Gitlab.md
index 6110db504..87889df66 100644
--- a/doc/integrations/Single-Sign-On/Gitlab.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