diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /app/views/groups/group_members/index.html.haml | |
parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'app/views/groups/group_members/index.html.haml')
-rw-r--r-- | app/views/groups/group_members/index.html.haml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml index c5b8c5e25a3..97867e312af 100644 --- a/app/views/groups/group_members/index.html.haml +++ b/app/views/groups/group_members/index.html.haml @@ -2,11 +2,10 @@ - page_title _('Group members') - groups_select_tag_data = group_select_data(@group).merge({ skip_groups: @skip_groups }) -.js-remove-member-modal .row.gl-mt-3 .col-lg-12 .gl-display-flex.gl-flex-wrap - - if can_manage_members? + - if can_admin_group_member?(@group) .gl-w-half.gl-xs-w-full %h4 = _('Group members') @@ -21,7 +20,7 @@ trigger_source: 'group-members-page', display_text: _('Invite members') } } = render 'groups/invite_members_modal', group: @group - - if can_manage_members? && Feature.disabled?(:invite_members_group_modal, @group) + - if can_admin_group_member?(@group) && Feature.disabled?(:invite_members_group_modal, @group) %hr.gl-mt-4 %ul.nav-links.nav.nav-tabs.gitlab-tabs{ role: 'tablist' } %li.nav-tab{ role: 'presentation' } @@ -36,9 +35,9 @@ = render_if_exists 'groups/group_members/ldap_sync' - .js-group-members-list-app{ data: { members_data: group_members_app_data_json(@group, - members: @members, - invited: @invited_members, - access_requests: @requesters) } } + .js-group-members-list-app{ data: { members_data: group_members_app_data(@group, + members: @members, + invited: @invited_members, + access_requests: @requesters).to_json } } .loading .gl-spinner.gl-spinner-md |