Commit ee721848 authored by Ammar Alakkad's avatar Ammar Alakkad Committed by Natalia Tepluhina

Move "Allow users to request access" setting to a new subsection "Membership"

parent c3a5d918
......@@ -4,8 +4,9 @@
%fieldset
%h5= _('Permissions')
.form-group
= render 'shared/allow_request_access', form: f
- unless ::Feature.enabled?(:saas_user_caps)
.form-group
= render 'shared/allow_request_access', form: f
- if @group.root?
.form-group.gl-mb-3
......@@ -43,5 +44,6 @@
= 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' }
- return unless ::Feature.enabled?(:saas_user_caps)
%h5= _('Membership')
.form-group{ data: { testid: 'membership-form-group' } }
= render 'shared/allow_request_access', form: f
......@@ -20760,6 +20760,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 ""
......
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