Merge branch '330029-add-membership-section-to-group-settings-ce' into 'master'

[RUN AS-IF-FOSS] Move "Allow users to request access" setting to a new subsection "Membership"

See merge request gitlab-org/gitlab!69217

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

+%h5= _('Membership')
+
+.form-group
+  = render 'shared/allow_request_access', form: f
+
+= render_if_exists 'groups/member_lock_setting', f: f, group: @group

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

@@ -4,9 +4,6 @@
 
   %fieldset
     %h5= _('Permissions')
-    .form-group
-      = render 'shared/allow_request_access', form: f
-
     - if @group.root?
       .form-group.gl-mb-3
         = f.gitlab_ui_checkbox_component :prevent_sharing_groups_outside_hierarchy,
@@ -43,5 +40,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/member_lock_setting', f: f, group: @group
+    = render 'groups/settings/membership', 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/_member_lock_setting.html.haml

 - return unless can?(current_user, :admin_group, group) && License.feature_available?(:member_lock)
 
-%h5= _('Member lock')
 .form-group
   = f.gitlab_ui_checkbox_component :membership_lock,
       _('Prevent adding new members to project membership within this group'),

ee/spec/features/groups/group_settings_spec.rb

@@ -76,7 +76,7 @@ RSpec.describe 'Edit group settings' do
       it 'is not visible' do
         visit edit_group_path(group)
 
-        expect(page).not_to have_content('Member lock')
+        expect(page).not_to have_content('Prevent adding new members to project membership within this group')
       end
     end
 
@@ -84,7 +84,7 @@ RSpec.describe 'Edit group settings' do
       it 'is visible' do
         visit edit_group_path(group)
 
-        expect(page).to have_content('Member lock')
+        expect(page).to have_content('Prevent adding new members to project membership within this group')
       end
 
       context 'when current user is not the Owner' do

locale/gitlab.pot

@@ -20873,9 +20873,6 @@ msgstr ""
 msgid "Medium vulnerabilities present"
 msgstr ""
 
-msgid "Member lock"
-msgstr ""
-
 msgid "Member since"
 msgstr ""
 
@@ -20912,6 +20909,9 @@ 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 ""