mirror of
https://github.com/mattermost/mattermost.git
synced 2026-09-24 16:05:00 +08:00
Merge pull request #1922 from cloudron-io/check_auth_service
Check auth_service when constructing messages
This commit is contained in:
@@ -493,7 +493,7 @@ export default class UserSettingsGeneralTab extends React.Component {
|
||||
);
|
||||
|
||||
submit = this.submitEmail;
|
||||
} else {
|
||||
} else if (this.props.user.auth_service === Constants.GITLAB_SERVICE) {
|
||||
inputs.push(
|
||||
<div
|
||||
key='oauthEmailInfo'
|
||||
@@ -531,7 +531,7 @@ export default class UserSettingsGeneralTab extends React.Component {
|
||||
} else {
|
||||
describe = UserStore.getCurrentUser().email;
|
||||
}
|
||||
} else {
|
||||
} else if (this.props.user.auth_service === Constants.GITLAB_SERVICE) {
|
||||
describe = 'Log in done through GitLab';
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user