Merge branch 'sh-revert-saas_user_caps' into 'master'

[RUN AS-IF-FOSS] Revert merge requests realted to saas_user_caps feature flag

See merge request gitlab-org/gitlab!69183

app/views/groups/settings/_permissions.html.haml

@@ -4,9 +4,8 @@
 
   %fieldset
     %h5= _('Permissions')
-    - unless ::Feature.enabled?(:saas_user_caps)
-      .form-group
-        = render 'shared/allow_request_access', form: f
+    .form-group
+      = render 'shared/allow_request_access', form: f
 
     - if @group.root?
       .form-group.gl-mb-3
@@ -44,6 +43,5 @@
     = render_if_exists 'groups/settings/prevent_forking', f: f, group: @group
     = render 'groups/settings/two_factor_auth', f: f, group: @group
     = render_if_exists 'groups/personal_access_token_expiration_policy', f: f, group: @group
-    = render_if_exists 'groups/settings/membership', f: f
     = render_if_exists 'groups/member_lock_setting', f: f, group: @group
   = f.submit _('Save changes'), class: 'btn gl-button btn-confirm gl-mt-3 js-dirty-submit', data: { qa_selector: 'save_permissions_changes_button' }

ee/app/views/groups/settings/_membership.html.haml

-- return unless ::Feature.enabled?(:saas_user_caps)
-
-%h5= _('Membership')
-
-.form-group{ data: { testid: 'membership-form-group' } }
-  = render 'shared/allow_request_access', form: f

locale/gitlab.pot

@@ -20820,9 +20820,6 @@ msgstr ""
 msgid "Members of a group may only view projects they have permission to access"
 msgstr ""
 
-msgid "Membership"
-msgstr ""
-
 msgid "Members|%{time} by %{user}"
 msgstr ""