Commit f205ed41 authored by Ammar Alakkad's avatar Ammar Alakkad

Move group's "allow request access" to new section

Adding new "Membership" section inside "Permissions, LFS, 2FA" and move
"Allow users to request access" option to be under Membership.

Changelog: changed
parent 6b00ee80
%h5= _('Membership')
.form-group
= render 'shared/allow_request_access', form: f
= render_if_exists 'groups/member_lock_setting', f: f, group: @group
...@@ -4,9 +4,6 @@ ...@@ -4,9 +4,6 @@
%fieldset %fieldset
%h5= _('Permissions') %h5= _('Permissions')
.form-group
= render 'shared/allow_request_access', form: f
- if @group.root? - if @group.root?
.form-group.gl-mb-3 .form-group.gl-mb-3
= f.gitlab_ui_checkbox_component :prevent_sharing_groups_outside_hierarchy, = f.gitlab_ui_checkbox_component :prevent_sharing_groups_outside_hierarchy,
...@@ -43,5 +40,5 @@ ...@@ -43,5 +40,5 @@
= render_if_exists 'groups/settings/prevent_forking', f: f, group: @group = render_if_exists 'groups/settings/prevent_forking', f: f, group: @group
= render 'groups/settings/two_factor_auth', 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/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' } = f.submit _('Save changes'), class: 'btn gl-button btn-confirm gl-mt-3 js-dirty-submit', data: { qa_selector: 'save_permissions_changes_button' }
- return unless can?(current_user, :admin_group, group) && License.feature_available?(:member_lock) - return unless can?(current_user, :admin_group, group) && License.feature_available?(:member_lock)
%h5= _('Member lock')
.form-group .form-group
= f.gitlab_ui_checkbox_component :membership_lock, = f.gitlab_ui_checkbox_component :membership_lock,
_('Prevent adding new members to project membership within this group'), _('Prevent adding new members to project membership within this group'),
......
...@@ -76,7 +76,7 @@ RSpec.describe 'Edit group settings' do ...@@ -76,7 +76,7 @@ RSpec.describe 'Edit group settings' do
it 'is not visible' do it 'is not visible' do
visit edit_group_path(group) 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
end end
...@@ -84,7 +84,7 @@ RSpec.describe 'Edit group settings' do ...@@ -84,7 +84,7 @@ RSpec.describe 'Edit group settings' do
it 'is visible' do it 'is visible' do
visit edit_group_path(group) 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 end
context 'when current user is not the Owner' do context 'when current user is not the Owner' do
......
...@@ -20822,9 +20822,6 @@ msgstr "" ...@@ -20822,9 +20822,6 @@ msgstr ""
msgid "Medium vulnerabilities present" msgid "Medium vulnerabilities present"
msgstr "" msgstr ""
msgid "Member lock"
msgstr ""
msgid "Member since" msgid "Member since"
msgstr "" msgstr ""
...@@ -20861,6 +20858,9 @@ msgstr "" ...@@ -20861,6 +20858,9 @@ msgstr ""
msgid "Members of a group may only view projects they have permission to access" msgid "Members of a group may only view projects they have permission to access"
msgstr "" msgstr ""
msgid "Membership"
msgstr ""
msgid "Members|%{time} by %{user}" msgid "Members|%{time} by %{user}"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment