merge with develop

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

@@ -145,6 +145,7 @@ class ConfigForm extends React.Component<Props, State> {
           skipFailedAuthenticators={config.skipFailedAuthenticators}
           pluginUrl={config.pluginUrl}
           releaseFeedUrl={config.releaseFeedUrl}
+          mailDomainName={config.mailDomainName}
           enabledXsrfProtection={config.enabledXsrfProtection}
           enabledUserConverter={config.enabledUserConverter}
           namespaceStrategy={config.namespaceStrategy}

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;
   enabledUserConverter: boolean;
   namespaceStrategy: string;
@@ -52,6 +53,7 @@ class GeneralSettings extends React.Component<Props> {
       loginInfoUrl,
       pluginUrl,
       releaseFeedUrl,
+      mailDomainName,
       enabledXsrfProtection,
       enabledUserConverter,
       anonymousMode,
@@ -140,6 +142,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 className="column is-half">
             <Checkbox
               label={t("general-settings.enabled-user-converter")}
@@ -179,6 +190,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);