Merge branch 'revert-0e663188' into 'master'

Revert "Merge branch '337611-update-user-cap-description' into 'master'" See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119944 Merged-by: Simon Knox <simon@gitlab.com> Approved-by: Stanislav Lashmanov <slashmanov@gitlab.com> Approved-by: Simon Knox <simon@gitlab.com> Co-authored-by: Ammar Alakkad <aalakkad@gitlab.com>

Merge branch 'revert-0e663188' into 'master'
Revert "Merge branch '337611-update-user-cap-description' into 'master'" See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119944 Merged-by: Simon Knox <simon@gitlab.com> Approved-by: Stanislav Lashmanov <slashmanov@gitlab.com> Approved-by: Simon Knox <simon@gitlab.com> Co-authored-by: Ammar Alakkad <aalakkad@gitlab.com>
cbfa0961 · Simon Knox · 23d173c2 · d2426435 · cbfa0961 · cbfa0961
--- 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
@@ -58,8 +58,6 @@ export default {
    'emailRestrictions',
    'afterSignUpText',
    'pendingUserCount',
-    'projectSharingHelpLink',
-    'groupSharingHelpLink',
  ],
  data() {
    return {
@@ -83,8 +81,6 @@ export default {
        supportedSyntaxLinkUrl: this.supportedSyntaxLinkUrl,
        emailRestrictions: this.emailRestrictions,
        afterSignUpText: this.afterSignUpText,
-        projectSharingHelpLink: this.projectSharingHelpLink,
-        groupSharingHelpLink: this.groupSharingHelpLink,
      },
    };
  },
@@ -224,7 +220,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 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}.',
+      '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.',
    ),
    domainDenyListGroupLabel: s__('ApplicationSettings|Domain denylist'),
    domainDenyListLabel: s__('ApplicationSettings|Enable domain denylist for sign-ups'),
@@ -313,7 +309,6 @@ export default {
      <gl-form-group
        :label="$options.i18n.userCapLabel"
        :description="$options.i18n.userCapDescription"
-        data-testid="user-cap-form-group"
      >
        <gl-form-input
          v-model="form.userCap"
@@ -321,17 +316,6 @@ 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">

--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -580,9 +580,7 @@ def signup_form_data
      supported_syntax_link_url: 'https://github.com/google/re2/wiki/Syntax',
      email_restrictions: @application_setting.email_restrictions.to_s,
      after_sign_up_text: @application_setting[:after_sign_up_text].to_s,
-      pending_user_count: pending_user_count,
+      pending_user_count: pending_user_count
-      project_sharing_help_link: help_page_path('user/group/access_and_permissions', anchor: 'prevent-a-project-from-being-shared-with-groups'),
-      group_sharing_help_link: help_page_path('user/group/access_and_permissions', anchor: 'prevent-group-sharing-outside-the-group-hierarchy')
    }
  end
 end

--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -5328,7 +5328,7 @@ msgstr ""
 msgid "ApplicationSettings|After sign-up text"
 msgstr ""
-msgid "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}."
+msgid "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."
 msgstr ""
 msgid "ApplicationSettings|Allowed domains for sign-ups"
--- a/spec/frontend/admin/signup_restrictions/components/signup_form_spec.js
+++ b/spec/frontend/admin/signup_restrictions/components/signup_form_spec.js
-import { GlButton, GlModal, GlLink } from '@gitlab/ui';
+import { GlButton, GlModal } from '@gitlab/ui';
 import { within } from '@testing-library/dom';
 import { shallowMount, mount, createWrapper } from '@vue/test-utils';
 import { stubComponent } from 'helpers/stub_component';
@@ -36,7 +36,6 @@ describe('Signup Form', () => {
  const findDenyListRawInputGroup = () => wrapper.findByTestId('domain-denylist-raw-input-group');
  const findDenyListFileInputGroup = () => wrapper.findByTestId('domain-denylist-file-input-group');
  const findUserCapInput = () => wrapper.findByTestId('user-cap-input');
-  const findUserCapFormGroup = () => wrapper.findByTestId('user-cap-form-group');
  const findModal = () => wrapper.findComponent(GlModal);
  afterEach(() => {
@@ -212,19 +211,4 @@ describe('Signup Form', () => {
      });
    });
  });
-  describe('rendering help links within user cap description', () => {
-    beforeEach(() => {
-      mountComponent({ mountFn: mount });
-    });
-    it('renders projectSharingHelpLink and groupSharingHelpLink', () => {
-      const [projectSharingLink, groupSharingLink] = findUserCapFormGroup().findAllComponents(
-        GlLink,
-      ).wrappers;
-      expect(projectSharingLink.attributes('href')).toBe(mockData.projectSharingHelpLink);
-      expect(groupSharingLink.attributes('href')).toBe(mockData.groupSharingHelpLink);
-    });
-  });
 });
--- a/spec/frontend/admin/signup_restrictions/mock_data.js
+++ b/spec/frontend/admin/signup_restrictions/mock_data.js
@@ -22,8 +22,6 @@ export const rawMockData = {
  passwordLowercaseRequired: 'true',
  passwordUppercaseRequired: 'true',
  passwordSymbolRequired: 'true',
-  projectSharingHelpLink: 'project-sharing/help/link',
-  groupSharingHelpLink: 'group-sharing/help/link',
 };
 export const mockData = {
@@ -50,6 +48,4 @@ export const mockData = {
  passwordLowercaseRequired: true,
  passwordUppercaseRequired: true,
  passwordSymbolRequired: true,
-  projectSharingHelpLink: 'project-sharing/help/link',
-  groupSharingHelpLink: 'group-sharing/help/link',
 };