Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

PLT-7706 Change Mattermost GitLab configuration to use GitLab APIv4 #113

Merged
merged 3 commits into from
Oct 6, 2017
Merged

PLT-7706 Change Mattermost GitLab configuration to use GitLab APIv4 #113

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a045aec
Update en.json
jasonblais Oct 5, 2017
dbf616e
Update oauth_settings.jsx
jasonblais Oct 5, 2017
51aca20
Update gitlab_settings.jsx
jasonblais Oct 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update gitlab_settings.jsx
  • Loading branch information
@jasonblais
jasonblais committed Oct 5, 2017
commit 51aca20673c8f902ab91a296b2b305bfe6034b94
4 changes: 2 additions & 2 deletions components/admin_console/gitlab_settings.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down