diff options
| author | Corey Hulen <corey@hulen.com> | 2015-10-13 09:51:55 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-10-13 09:51:55 -0700 |
| commit | a2979924a430e9e9bb70d30653035af77ecb1ef2 (patch) | |
| tree | f721454bf9cc22e8a35a5c7e2d94a3ffe53816a0 /web/react | |
| parent | 1dbc6c5d0e760a1780a401f54503451d6a240192 (diff) | |
| parent | b2b641bb114c29f92eb41a4da2f5d612ec03643b (diff) | |
| download | chat-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 'web/react')
| -rw-r--r-- | web/react/components/admin_console/gitlab_settings.jsx | 6 |
1 files 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 6b97287e4..6aeb92f93 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} /> - <p className='help-text'>{'Enter <your-gitlab-url>/oauth/authorize (example http://localhost:3000/oauth/authorize). Make sure you use HTTP or HTTPS in your URLs as appropriate.'}</p> + <p className='help-text'>{'Enter https://<your-gitlab-url>/oauth/authorize (example https://example.com:3000/oauth/authorize). Make sure you use HTTP or HTTPS in your URL depending on your server configuration.'}</p> </div> </div> @@ -201,7 +201,7 @@ export default class GitLabSettings extends React.Component { onChange={this.handleChange} disabled={!this.state.Enable} /> - <p className='help-text'>{'Enter <your-gitlab-url>/oauth/token. Make sure you use HTTP or HTTPS in your URLs as appropriate.'}</p> + <p className='help-text'>{'Enter https://<your-gitlab-url>/oauth/token. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.'}</p> </div> </div> @@ -223,7 +223,7 @@ export default class GitLabSettings extends React.Component { onChange={this.handleChange} disabled={!this.state.Enable} /> - <p className='help-text'>{'Enter <your-gitlab-url>/api/v3/user. Make sure you use HTTP or HTTPS in your URLs as appropriate.'}</p> + <p className='help-text'>{'Enter https://<your-gitlab-url>/api/v3/user. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.'}</p> </div> </div> |