summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console/gitlab_settings.jsx
diff options
context:
space:
mode:
authorEric Sethna <eric@spinpunch.com>2016-07-05 07:26:22 -0400
committerJoram Wilander <jwawilander@gmail.com>2016-07-05 07:26:22 -0400
commitd2e93e1bee8bbf18c88bbabd7bf43239c4d23199 (patch)
tree6e12d8e99ba6f70f4031bf786fc8fbca8cac07b6 /webapp/components/admin_console/gitlab_settings.jsx
parent0557c03d11f3620b03db809dbe34f184341fea0d (diff)
downloadchat-d2e93e1bee8bbf18c88bbabd7bf43239c4d23199.tar.gz
chat-d2e93e1bee8bbf18c88bbabd7bf43239c4d23199.tar.bz2
chat-d2e93e1bee8bbf18c88bbabd7bf43239c4d23199.zip
Major update to System Console labelling (#3398)
Diffstat (limited to 'webapp/components/admin_console/gitlab_settings.jsx')
-rw-r--r--webapp/components/admin_console/gitlab_settings.jsx8
1 files changed, 4 insertions, 4 deletions
diff --git a/webapp/components/admin_console/gitlab_settings.jsx b/webapp/components/admin_console/gitlab_settings.jsx
index 48be597ca..e175e8580 100644
--- a/webapp/components/admin_console/gitlab_settings.jsx
+++ b/webapp/components/admin_console/gitlab_settings.jsx
@@ -59,7 +59,7 @@ export default class GitLabSettings extends AdminSettings {
label={
<FormattedMessage
id='admin.gitlab.enableTitle'
- defaultMessage='Enable Sign Up With GitLab: '
+ defaultMessage='Enable authentication with GitLab: '
/>
}
helpText={
@@ -71,7 +71,7 @@ export default class GitLabSettings extends AdminSettings {
<br/>
<FormattedHTMLMessage
id='admin.gitlab.EnableHtmlDesc'
- 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>'
+ 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 "Application Secret Key" and "Application ID" fields from GitLab to complete the options below.</li><li>Complete the Endpoint URLs below. </li></ol>'
/>
</div>
}
@@ -83,7 +83,7 @@ export default class GitLabSettings extends AdminSettings {
label={
<FormattedMessage
id='admin.gitlab.clientIdTitle'
- defaultMessage='Id:'
+ defaultMessage='Application ID:'
/>
}
placeholder={Utils.localizeMessage('admin.gitlab.clientIdExample', 'Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')}
@@ -102,7 +102,7 @@ export default class GitLabSettings extends AdminSettings {
label={
<FormattedMessage
id='admin.gitlab.clientSecretTitle'
- defaultMessage='Secret:'
+ defaultMessage='Application Secret Key:'
/>
}
placeholder={Utils.localizeMessage('admin.gitlab.clientSecretExample', 'Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')}