Commit b9ce664c authored by Stan Hu's avatar Stan Hu

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

This reverts commit b50ffcb5, reversing
changes made to c33e60d9.
parent b4513ca5
......@@ -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' }
- return unless ::Feature.enabled?(:saas_user_caps)
%h5= _('Membership')
.form-group{ data: { testid: 'membership-form-group' } }
= render 'shared/allow_request_access', form: f
......@@ -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 ""
......
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