diff options
| -rw-r--r-- | webapp/components/admin_console/gitlab_settings.jsx | 8 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/webapp/components/admin_console/gitlab_settings.jsx b/webapp/components/admin_console/gitlab_settings.jsx index bd3cd8dec..cc8f7cdcf 100644 --- a/webapp/components/admin_console/gitlab_settings.jsx +++ b/webapp/components/admin_console/gitlab_settings.jsx @@ -131,7 +131,7 @@ export default class GitLabSettings extends AdminSettings { defaultMessage='User API Endpoint:' /> } - placeholder={Utils.localizeMessage('admin.gitlab.userExample', 'Ex ""')} + placeholder={Utils.localizeMessage('admin.gitlab.userExample', 'Ex "https://<your-gitlab-url>/api/v3/user"')} helpText={ <FormattedMessage id='admin.gitlab.userDescription' @@ -150,7 +150,7 @@ export default class GitLabSettings extends AdminSettings { defaultMessage='Auth Endpoint:' /> } - placeholder={Utils.localizeMessage('admin.gitlab.authExample', 'Ex ""')} + placeholder={Utils.localizeMessage('admin.gitlab.authExample', 'Ex "https://<your-gitlab-url>/oauth/authorize"')} helpText={ <FormattedMessage id='admin.gitlab.authDescription' @@ -169,7 +169,7 @@ export default class GitLabSettings extends AdminSettings { defaultMessage='Token Endpoint:' /> } - placeholder={Utils.localizeMessage('admin.gitlab.tokenExample', 'Ex ""')} + placeholder={Utils.localizeMessage('admin.gitlab.tokenExample', 'Ex "https://<your-gitlab-url>/oauth/token"')} helpText={ <FormattedMessage id='admin.gitlab.tokenDescription' @@ -183,4 +183,4 @@ export default class GitLabSettings extends AdminSettings { </SettingsGroup> ); } -}
\ No newline at end of file +} diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 1daeb6a3c..40fb30437 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -183,7 +183,7 @@ "admin.gitab.clientSecretDescription": "Obtain this value via the instructions above for logging into GitLab.", "admin.gitlab.EnableHtmlDesc": "<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>", "admin.gitlab.authDescription": "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.", - "admin.gitlab.authExample": "Ex \"\"", + "admin.gitlab.authExample": "Ex \"https://<your-gitlab-url>/oauth/authorize\"", "admin.gitlab.authTitle": "Auth Endpoint:", "admin.gitlab.clientIdDescription": "Obtain this value via the instructions above for logging into GitLab", "admin.gitlab.clientIdExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"", @@ -194,10 +194,10 @@ "admin.gitlab.enableTitle": "Enable Sign Up With GitLab: ", "admin.gitlab.settingsTitle": "GitLab Settings", "admin.gitlab.tokenDescription": "Enter https://<your-gitlab-url>/oauth/token. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.", - "admin.gitlab.tokenExample": "Ex \"\"", + "admin.gitlab.tokenExample": "Ex \"https://<your-gitlab-url>/oauth/token\"", "admin.gitlab.tokenTitle": "Token Endpoint:", "admin.gitlab.userDescription": "Enter https://<your-gitlab-url>/api/v3/user. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.", - "admin.gitlab.userExample": "Ex \"\"", + "admin.gitlab.userExample": "Ex \"https://<your-gitlab-url>/api/v3/user\"", "admin.gitlab.userTitle": "User API Endpoint:", "admin.image.amazonS3BucketDescription": "Name you selected for your S3 bucket in AWS.", "admin.image.amazonS3BucketExample": "Ex \"mattermost-media\"", |