diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-01-21 09:30:14 -0500 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-01-21 09:30:14 -0500 |
| commit | 2fdfdaeff7a0bf29fd21eec6d4f48abe579d5048 (patch) | |
| tree | 154258fc711be98efa3adab82b9a070f18c88a14 | |
| parent | c9c40bcb2006d0f0f28fb08eeb306a6f8dad7c6a (diff) | |
| parent | 6f866f8c03dd4c3bdb8f1abddd10458d4ed2eb3c (diff) | |
| download | chat-2fdfdaeff7a0bf29fd21eec6d4f48abe579d5048.tar.gz chat-2fdfdaeff7a0bf29fd21eec6d4f48abe579d5048.tar.bz2 chat-2fdfdaeff7a0bf29fd21eec6d4f48abe579d5048.zip | |
Merge pull request #1922 from cloudron-io/check_auth_service
Check auth_service when constructing messages
| -rw-r--r-- | web/react/components/user_settings/user_settings_general.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx index 014038dd4..75a0e6b6a 100644 --- a/web/react/components/user_settings/user_settings_general.jsx +++ b/web/react/components/user_settings/user_settings_general.jsx @@ -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'; } |