summaryrefslogtreecommitdiffstats
path: root/web/react/components/admin_console/gitlab_settings.jsx
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-03-01 10:50:15 -0500
committerJoram Wilander <jwawilander@gmail.com>2016-03-01 10:50:15 -0500
commit4f9885b691e7dfc03c352cd9875e9bd3f67b6fc0 (patch)
tree99c832222028a6ae86d6faeb9f174670beba6d16 /web/react/components/admin_console/gitlab_settings.jsx
parent8aa4e28932ec43090ca6b481929fafbe0119a660 (diff)
parent2da3c508eef2dff28163572fbfc3f6a5469fa0ef (diff)
downloadchat-4f9885b691e7dfc03c352cd9875e9bd3f67b6fc0.tar.gz
chat-4f9885b691e7dfc03c352cd9875e9bd3f67b6fc0.tar.bz2
chat-4f9885b691e7dfc03c352cd9875e9bd3f67b6fc0.zip
Merge pull request #2293 from mattermost/esethna-patch-2
Update sys console GitLab set up help text
Diffstat (limited to 'web/react/components/admin_console/gitlab_settings.jsx')
-rw-r--r--web/react/components/admin_console/gitlab_settings.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/admin_console/gitlab_settings.jsx b/web/react/components/admin_console/gitlab_settings.jsx
index 744fa3b19..ad9950eea 100644
--- a/web/react/components/admin_console/gitlab_settings.jsx
+++ b/web/react/components/admin_console/gitlab_settings.jsx
@@ -167,7 +167,7 @@ class GitLabSettings extends React.Component {
<div className='help-text'>
<FormattedHTMLMessage
id='admin.gitlab.EnableHtmlDesc'
- defaultMessage='<ol><li>Log in to your GitLab account and go to Applications -> Profile Settings.</li><li>Enter Redirect URIs "<your-mattermost-url>/login/gitlab/complete" (example: http://localhost:8065/login/gitlab/complete) and "<your-mattermost-url>/signup/gitlab/complete". </li><li>Then use "Secret" and "Id" fields from GitLab to complete the options below.</li><li>Complete the Endpoint URLs below. </li></ol>'
+ defaultMessage='<ol><li>Log in to your GitLab account and go to Profile Settings -> Applications.</li><li>Enter Redirect URIs "<your-mattermost-url>/login/gitlab/complete" (example: http://localhost:8065/login/gitlab/complete) and "<your-mattermost-url>/signup/gitlab/complete". </li><li>Then use "Secret" and "Id" fields from GitLab to complete the options below.</li><li>Complete the Endpoint URLs below. </li></ol>'
/>
</div>
</div>
@@ -376,4 +376,4 @@ GitLabSettings.propTypes = {
config: React.PropTypes.object
};
-export default injectIntl(GitLabSettings); \ No newline at end of file
+export default injectIntl(GitLabSettings);