Merge pull request #1922 from cloudron-io/check_auth_service
Check auth_service when constructing messages
Этот коммит содержится в:
@@ -493,7 +493,7 @@ export default class UserSettingsGeneralTab extends React.Component {
|
|||||||
);
|
);
|
||||||
|
|
||||||
submit = this.submitEmail;
|
submit = this.submitEmail;
|
||||||
} else {
|
} else if (this.props.user.auth_service === Constants.GITLAB_SERVICE) {
|
||||||
inputs.push(
|
inputs.push(
|
||||||
<div
|
<div
|
||||||
key='oauthEmailInfo'
|
key='oauthEmailInfo'
|
||||||
@@ -531,7 +531,7 @@ export default class UserSettingsGeneralTab extends React.Component {
|
|||||||
} else {
|
} else {
|
||||||
describe = UserStore.getCurrentUser().email;
|
describe = UserStore.getCurrentUser().email;
|
||||||
}
|
}
|
||||||
} else {
|
} else if (this.props.user.auth_service === Constants.GITLAB_SERVICE) {
|
||||||
describe = 'Log in done through GitLab';
|
describe = 'Log in done through GitLab';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user