From 315924d41c913856e05e82cfb864d4c6458e5f74 Mon Sep 17 00:00:00 2001 From: it33 Date: Tue, 13 Oct 2015 05:13:03 -0700 Subject: [PATCH 1/3] Update Gitlab.md --- doc/integrations/Single-Sign-On/Gitlab.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/integrations/Single-Sign-On/Gitlab.md b/doc/integrations/Single-Sign-On/Gitlab.md index 87889df66b..e503a158b6 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_: `/oauth/authorize` (example http://localhost:3000/oauth/authorize) - * _TokenEndpoint_: `/oauth/token` - * _UserApiEndpoint_: `/api/v3/user` + * _AuthEndpoint_: `https:///oauth/authorize` (example https://example.com/oauth/authorize) + * _TokenEndpoint_: `https:///oauth/token` + * _UserApiEndpoint_: `https:///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. From 5c3a1ae57fcf77fbfc577e3b9981d9a0e94b34e1 Mon Sep 17 00:00:00 2001 From: it33 Date: Tue, 13 Oct 2015 05:16:04 -0700 Subject: [PATCH 2/3] Update gitlab_settings.jsx --- web/react/components/admin_console/gitlab_settings.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/react/components/admin_console/gitlab_settings.jsx b/web/react/components/admin_console/gitlab_settings.jsx index 6b97287e4c..6aeb92f932 100644 --- a/web/react/components/admin_console/gitlab_settings.jsx +++ b/web/react/components/admin_console/gitlab_settings.jsx @@ -179,7 +179,7 @@ export default class GitLabSettings extends React.Component { onChange={this.handleChange} disabled={!this.state.Enable} /> -

{'Enter /oauth/authorize (example http://localhost:3000/oauth/authorize). Make sure you use HTTP or HTTPS in your URLs as appropriate.'}

+

{'Enter https:///oauth/authorize (example https://example.com:3000/oauth/authorize). Make sure you use HTTP or HTTPS in your URL depending on your server configuration.'}

@@ -201,7 +201,7 @@ export default class GitLabSettings extends React.Component { onChange={this.handleChange} disabled={!this.state.Enable} /> -

{'Enter /oauth/token. Make sure you use HTTP or HTTPS in your URLs as appropriate.'}

+

{'Enter https:///oauth/token. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.'}

@@ -223,7 +223,7 @@ export default class GitLabSettings extends React.Component { onChange={this.handleChange} disabled={!this.state.Enable} /> -

{'Enter /api/v3/user. Make sure you use HTTP or HTTPS in your URLs as appropriate.'}

+

{'Enter https:///api/v3/user. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.'}

From b2b641bb114c29f92eb41a4da2f5d612ec03643b Mon Sep 17 00:00:00 2001 From: it33 Date: Tue, 13 Oct 2015 05:20:20 -0700 Subject: [PATCH 3/3] Update Configuration-Settings.md --- doc/install/Configuration-Settings.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/install/Configuration-Settings.md b/doc/install/Configuration-Settings.md index 804a94c302..a928937531 100644 --- a/doc/install/Configuration-Settings.md +++ b/doc/install/Configuration-Settings.md @@ -257,19 +257,19 @@ Settings to configure account and team creation using GitLab OAuth. “true”: Allow team creation and account signup using GitLab OAuth. To configure, input the **Secret** and **Id** credentials. ```"Secret": ""``` -Obtain this value by logging into your GitLab account. Go to Profile Settings -> Applications -> New Application, enter a Name, then enter Redirect URLs "/login/gitlab/complete" (example: http://localhost:8065/login/gitlab/complete) and "/signup/gitlab/complete". +Obtain this value by logging into your GitLab account. Go to Profile Settings -> Applications -> New Application, enter a Name, then enter Redirect URLs "https:///login/gitlab/complete" (example: https://example.com:8065/login/gitlab/complete) and "https:///signup/gitlab/complete". ```"Id": ""``` -Obtain this value by logging into your GitLab account. Go to Applications -> Profile Settings. Enter Redirect URLs "/login/gitlab/complete" (example: http://localhost:8065/login/gitlab/complete) and "/signup/gitlab/complete". +Obtain this value by logging into your GitLab account. Go to Profile Settings -> Applications -> New Application, enter a Name, then enter Redirect URLs "https:///login/gitlab/complete" (example: https://example.com:8065/login/gitlab/complete) and "https:///signup/gitlab/complete". ```"AuthEndpoint": ""``` -Enter /oauth/authorize (example: http://localhost:3000/oauth/authorize). Use HTTP or HTTPS in your URLs as appropriate. +Enter https:///oauth/authorize (example: https://example.com:3000/oauth/authorize). Use HTTP or HTTPS depending on how your server is configured. ```"TokenEndpoint": ""``` -Enter /oauth/token (example: http://localhost:3000/oauth/token). Use HTTP or HTTPS in your URLs as appropriate. +Enter https:///oauth/authorize (example: https://example.com:3000/oauth/token). Use HTTP or HTTPS depending on how your server is configured. ```"UserApiEndpoint": ""``` -Enter /api/v3/user (example: http://localhost:3000/api/v3/user). Use HTTP or HTTPS in your URLs as appropriate. +Enter https:///oauth/authorize (example: https://example.com:3000/api/v3/user). Use HTTP or HTTPS depending on how your server is configured. ## Config.json Settings Not in System Console