Merge with upstream, add missing refs in CHANGELOG.md

scm-ui/ui-webapp/src/admin/components/form/ConfigForm.tsx

@@ -144,6 +144,7 @@ class ConfigForm extends React.Component<Props, State> {
           skipFailedAuthenticators={config.skipFailedAuthenticators}
           pluginUrl={config.pluginUrl}
           releaseFeedUrl={config.releaseFeedUrl}
+          mailDomainName={config.mailDomainName}
           enabledXsrfProtection={config.enabledXsrfProtection}
           namespaceStrategy={config.namespaceStrategy}
           onChange={(isValid, changedValue, name) => this.onChange(isValid, changedValue, name)}

scm-ui/ui-webapp/src/admin/components/form/GeneralSettings.tsx

@@ -36,6 +36,7 @@ type Props = WithTranslation & {
   skipFailedAuthenticators: boolean;
   pluginUrl: string;
   releaseFeedUrl: string;
+  mailDomainName: string;
   enabledXsrfProtection: boolean;
   namespaceStrategy: string;
   namespaceStrategies?: NamespaceStrategies;
@@ -51,6 +52,7 @@ class GeneralSettings extends React.Component<Props> {
       loginInfoUrl,
       pluginUrl,
       releaseFeedUrl,
+      mailDomainName,
       enabledXsrfProtection,
       anonymousMode,
       namespaceStrategy,
@@ -129,7 +131,7 @@ class GeneralSettings extends React.Component<Props> {
           </div>
         </div>
         <div className="columns">
-          <div className="column">
+          <div className="column is-half">
             <InputField
               label={t("general-settings.release-feed-url")}
               onChange={this.handleReleaseFeedUrlChange}
@@ -138,6 +140,15 @@ class GeneralSettings extends React.Component<Props> {
               helpText={t("help.releaseFeedUrlHelpText")}
             />
           </div>
+          <div className="column is-half">
+            <InputField
+              label={t("general-settings.mail-domain-name")}
+              onChange={this.handleMailDomainNameChange}
+              value={mailDomainName}
+              disabled={!hasUpdatePermission}
+              helpText={t("help.mailDomainNameHelpText")}
+            />
+          </div>
         </div>
       </div>
     );
@@ -164,6 +175,9 @@ class GeneralSettings extends React.Component<Props> {
   handleReleaseFeedUrlChange = (value: string) => {
     this.props.onChange(true, value, "releaseFeedUrl");
   };
+  handleMailDomainNameChange = (value: string) => {
+    this.props.onChange(true, value, "mailDomainName");
+  };
 }
 
 export default withTranslation("config")(GeneralSettings);

scm-ui/ui-webapp/src/users/components/UserForm.tsx

@@ -113,8 +113,7 @@ class UserForm extends React.Component<Props, State> {
       this.editUserComponentsAreUnchanged() ||
       this.state.mailValidationError ||
       this.state.displayNameValidationError ||
-      this.isFalsy(user.displayName) ||
-      this.isFalsy(user.mail)
+      this.isFalsy(user.displayName)
     );
   };
 
@@ -152,6 +151,7 @@ class UserForm extends React.Component<Props, State> {
       // edit existing user
       subtitle = <Subtitle subtitle={t("userForm.subtitle")} />;
     }
+
     return (
       <>
         {subtitle}
@@ -218,7 +218,7 @@ class UserForm extends React.Component<Props, State> {
 
   handleEmailChange = (mail: string) => {
     this.setState({
-      mailValidationError: !validator.isMailValid(mail),
+      mailValidationError: !!mail && !validator.isMailValid(mail),
       user: {
         ...this.state.user,
         mail