diff options
| author | ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com> | 2018-02-05 08:01:12 +0100 |
|---|---|---|
| committer | ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com> | 2018-02-05 08:01:12 +0100 |
| commit | bf512ec601e12a5b0705c6f02d58a24812f8aef3 (patch) | |
| tree | 2471e06bf72989601bcae76854c53953345952a8 /server | |
| parent | 791b82251ddd50f549f992e4de8dfc783e885b34 (diff) | |
| parent | 824c80f0ab2fd9e8e9359e0816575fb80416ec92 (diff) | |
| download | sonarqube-bf512ec601e12a5b0705c6f02d58a24812f8aef3.tar.gz sonarqube-bf512ec601e12a5b0705c6f02d58a24812f8aef3.zip | |
Automatic merge from branch-7.0
* origin/branch-7.0:
Prepare version 7.0-SNAPSHOT
Release 7.0
SONAR-10384 No more possible to remove an email of a user
SONAR-10296 Connection to PostgreSQL database fails if SOCKS proxy is enabled
Diffstat (limited to 'server')
| -rw-r--r-- | server/sonar-web/src/main/js/apps/users/components/UserForm.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx b/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx index 072f4663107..d7052b3d49b 100644 --- a/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx @@ -121,7 +121,7 @@ export default class UserForm extends React.PureComponent<Props, State> { event.preventDefault(); this.setState({ submitting: true }); updateUser({ - email: this.state.email || undefined, + email: this.state.email, login: this.state.login, name: this.state.name, scmAccount: uniq(this.state.scmAccounts).join(',') |