PLT-7706 Change Mattermost GitLab configuration to use GitLab APIv4

components/admin_console/gitlab_settings.jsx

@@ -124,11 +124,11 @@ export default class GitLabSettings extends AdminSettings {
  defaultMessage='User API Endpoint:'
  />
  }
- placeholder={Utils.localizeMessage('admin.gitlab.userExample', 'Ex "https://<your-gitlab-url>/api/v3/user"')}
+ placeholder={Utils.localizeMessage('admin.gitlab.userExample', 'Ex "https://<your-gitlab-url>/api/v4/user"')}
  helpText={
  <FormattedMessage
  id='admin.gitlab.userDescription'
- defaultMessage='Enter https://<your-gitlab-url>/api/v3/user. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.'
+ defaultMessage='Enter https://<your-gitlab-url>/api/v4/user. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.'
  />
  }
  value={this.state.userApiEndpoint}

components/admin_console/oauth_settings.jsx

@@ -317,11 +317,11 @@ export default class OAuthSettings extends AdminSettings {
  defaultMessage='User API Endpoint:'
  />
  }
- placeholder={Utils.localizeMessage('admin.gitlab.userExample', 'Ex "https://<your-gitlab-url>/api/v3/user"')}
+ placeholder={Utils.localizeMessage('admin.gitlab.userExample', 'Ex "https://<your-gitlab-url>/api/v4/user"')}
  helpText={
  <FormattedMessage
  id='admin.gitlab.userDescription'
- defaultMessage='Enter https://<your-gitlab-url>/api/v3/user. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.'
+ defaultMessage='Enter https://<your-gitlab-url>/api/v4/user. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.'
  />
  }
  value={this.state.userApiEndpoint}

i18n/en.json

@@ -473,8 +473,8 @@
  "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": "E.g.: \"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": "E.g.: \"https://<your-gitlab-url>/api/v3/user\"",
+ "admin.gitlab.userDescription": "Enter https://<your-gitlab-url>/api/v4/user. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.",
+ "admin.gitlab.userExample": "E.g.: \"https://<your-gitlab-url>/api/v4/user\"",
  "admin.gitlab.userTitle": "User API Endpoint:",
  "admin.google.EnableHtmlDesc": "<ol><li><a target='_blank' href='https://accounts.google.com/login'>Log in</a> to your Google account.</li><li>Go to <a target='_blank' href='https://console.developers.google.com'>https://console.developers.google.com</a>, click <strong>Credentials</strong> in the left hand sidebar and enter \"Mattermost - your-company-name\" as the <strong>Project Name</strong>, then click <strong>Create</strong>.</li><li>Click the <strong>OAuth consent screen</strong> header and enter \"Mattermost\" as the <strong>Product name shown to users</strong>, then click <strong>Save</strong>.</li><li>Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.</li><li>Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong>your-mattermost-url/signup/google/complete</strong> (example: https://localhost:8065/signup/google/complete). Click <strong>Create</strong>.</li><li>Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.</li><li>Finally, go to <a target='_blank' href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> and click <strong>Enable</strong>. This might take a few minutes to propagate through Google's systems.</li></ol>",
  "admin.google.authTitle": "Auth Endpoint:",