diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-10-05 16:56:46 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-10-05 16:56:46 -0400 |
| commit | 04f9193206cc32e4f7e08ab151be867bc2e3710e (patch) | |
| tree | d0a5d9a80e4bc3b564d6a11ac8b9647f231ab34d | |
| parent | da61bb38ff04b4e93d952b37aae02fa43360aa49 (diff) | |
| parent | 9fe011a86e0c88cefffbc6b991c31bb923ee0f76 (diff) | |
| download | chat-04f9193206cc32e4f7e08ab151be867bc2e3710e.tar.gz chat-04f9193206cc32e4f7e08ab151be867bc2e3710e.tar.bz2 chat-04f9193206cc32e4f7e08ab151be867bc2e3710e.zip | |
Merge pull request #927 from mattermost/lfbrock-patch-1
Added when to use https vs http to GitLab SSO instructions
| -rw-r--r-- | doc/integrations/Single-Sign-On/Gitlab.md | 2 |
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 |