1 files changed, 46 insertions, 1 deletions

diff --git a/app/assets/javascripts/pages/admin/application_settings/general/components/signup_form.vue b/app/assets/javascripts/pages/admin/application_settings/general/components/signup_form.vue
index ccb449f96e1..b68148e5461 100644
--- a/app/assets/javascripts/pages/admin/application_settings/general/components/signup_form.vue
+++ b/app/assets/javascripts/pages/admin/application_settings/general/components/signup_form.vue
@@ -44,6 +44,7 @@ export default {
     'signupEnabled',
     'requireAdminApprovalAfterUserSignup',
     'sendUserConfirmationEmail',
+    'emailConfirmationSetting',
     'minimumPasswordLength',
     'minimumPasswordLengthMin',
     'minimumPasswordLengthMax',
@@ -58,6 +59,8 @@ export default {
     'emailRestrictions',
     'afterSignUpText',
     'pendingUserCount',
+    'projectSharingHelpLink',
+    'groupSharingHelpLink',
   ],
   data() {
     return {
@@ -66,6 +69,7 @@ export default {
         signupEnabled: this.signupEnabled,
         requireAdminApproval: this.requireAdminApprovalAfterUserSignup,
         sendConfirmationEmail: this.sendUserConfirmationEmail,
+        emailConfirmationSetting: this.emailConfirmationSetting,
         minimumPasswordLength: this.minimumPasswordLength,
         minimumPasswordLengthMin: this.minimumPasswordLengthMin,
         minimumPasswordLengthMax: this.minimumPasswordLengthMax,
@@ -81,6 +85,8 @@ export default {
         supportedSyntaxLinkUrl: this.supportedSyntaxLinkUrl,
         emailRestrictions: this.emailRestrictions,
         afterSignUpText: this.afterSignUpText,
+        projectSharingHelpLink: this.projectSharingHelpLink,
+        groupSharingHelpLink: this.groupSharingHelpLink,
       },
     };
   },
@@ -199,6 +205,15 @@ export default {
     signupEnabledLabel: s__('ApplicationSettings|Sign-up enabled'),
     requireAdminApprovalLabel: s__('ApplicationSettings|Require admin approval for new sign-ups'),
     sendConfirmationEmailLabel: s__('ApplicationSettings|Send confirmation email on sign-up'),
+    emailConfirmationSettingsLabel: s__('ApplicationSettings|Email confirmation settings'),
+    emailConfirmationSettingsOffLabel: s__('ApplicationSettings|Off'),
+    emailConfirmationSettingsOffHelpText: s__(
+      'ApplicationSettings|New users can sign up without confirming their email address.',
+    ),
+    emailConfirmationSettingsHardLabel: s__('ApplicationSettings|Hard'),
+    emailConfirmationSettingsHardHelpText: s__(
+      'ApplicationSettings|Send a confirmation email during sign up. New users must confirm their email address before they can log in.',
+    ),
     minimumPasswordLengthLabel: s__(
       'ApplicationSettings|Minimum password length (number of characters)',
     ),
@@ -208,7 +223,7 @@ export default {
     ),
     userCapLabel: s__('ApplicationSettings|User cap'),
     userCapDescription: s__(
-      'ApplicationSettings|After the instance reaches the user cap, any user who is added or requests access must be approved by an administrator. Leave blank for unlimited.',
+      'ApplicationSettings|After the instance reaches the user cap, any user who is added or requests access must be approved by an administrator. Leave blank for an unlimited user cap. If you change the user cap to unlimited, you must re-enable %{projectSharingLinkStart}project sharing%{projectSharingLinkEnd} and %{groupSharingLinkStart}group sharing%{groupSharingLinkEnd}.',
     ),
     domainDenyListGroupLabel: s__('ApplicationSettings|Domain denylist'),
     domainDenyListLabel: s__('ApplicationSettings|Enable domain denylist for sign-ups'),
@@ -276,9 +291,28 @@ export default {
         :label="$options.i18n.sendConfirmationEmailLabel"
       />
 
+      <gl-form-group :label="$options.i18n.emailConfirmationSettingsLabel">
+        <gl-form-radio-group
+          v-model="form.emailConfirmationSetting"
+          name="application_setting[email_confirmation_setting]"
+        >
+          <gl-form-radio value="hard">
+            {{ $options.i18n.emailConfirmationSettingsHardLabel }}
+
+            <template #help> {{ $options.i18n.emailConfirmationSettingsHardHelpText }} </template>
+          </gl-form-radio>
+          <gl-form-radio value="off">
+            {{ $options.i18n.emailConfirmationSettingsOffLabel }}
+
+            <template #help> {{ $options.i18n.emailConfirmationSettingsOffHelpText }} </template>
+          </gl-form-radio>
+        </gl-form-radio-group>
+      </gl-form-group>
+
       <gl-form-group
         :label="$options.i18n.userCapLabel"
         :description="$options.i18n.userCapDescription"
+        data-testid="user-cap-form-group"
       >
         <gl-form-input
           v-model="form.userCap"
@@ -286,6 +320,17 @@ export default {
           name="application_setting[new_user_signups_cap]"
           data-testid="user-cap-input"
         />
+
+        <template #description>
+          <gl-sprintf :message="$options.i18n.userCapDescription">
+            <template #projectSharingLink="{ content }">
+              <gl-link :href="projectSharingHelpLink" target="_blank">{{ content }}</gl-link>
+            </template>
+            <template #groupSharingLink="{ content }">
+              <gl-link :href="groupSharingHelpLink" target="_blank">{{ content }}</gl-link>
+            </template>
+          </gl-sprintf>
+        </template>
       </gl-form-group>
 
       <gl-form-group :label="$options.i18n.minimumPasswordLengthLabel">