Merge pull request #927 from mattermost/lfbrock-patch-1

Added when to use https vs http to GitLab SSO instructions
Этот коммит содержится в:
Christopher Speller
2015-10-05 16:56:46 -04:00
родитель da61bb38ff 9fe011a86e
Коммит 04f9193206

Просмотреть файл

@@ -7,6 +7,8 @@ The following steps can be used to configure Mattermost to use GitLab as a singl
* `<your-mattermost-url>/login/gitlab/complete` (example: http://localhost:8065/login/gitlab/complete) * `<your-mattermost-url>/login/gitlab/complete` (example: http://localhost:8065/login/gitlab/complete)
* `<your-mattermost-url>/signup/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 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: 4. Also in config/config.json, set _Allow_ to `true` for the _gitlab_ section, leave _Scope_ blank and use the following for the endpoints: