diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /app/controllers/groups/group_members_controller.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'app/controllers/groups/group_members_controller.rb')
-rw-r--r-- | app/controllers/groups/group_members_controller.rb | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb index c2ac56ccc63..8d9059d271f 100644 --- a/app/controllers/groups/group_members_controller.rb +++ b/app/controllers/groups/group_members_controller.rb @@ -25,7 +25,6 @@ class Groups::GroupMembersController < Groups::ApplicationController helper_method :can_manage_members? def index - preload_max_access @sort = params[:sort].presence || sort_value_name @members = GroupMembersFinder @@ -54,14 +53,6 @@ class Groups::GroupMembersController < Groups::ApplicationController private - def preload_max_access - return unless current_user - - # this allows the can? against admin type queries in this action to - # only perform the query once, even if it is cached - current_user.max_access_for_group[@group.id] = @group.max_member_access(current_user) - end - def can_manage_members? strong_memoize(:can_manage_members) do can?(current_user, :admin_group_member, @group) @@ -87,6 +78,22 @@ class Groups::GroupMembersController < Groups::ApplicationController def membershipable_members group.members end + + def plain_source_type + 'group' + end + + def source_type + _("group") + end + + def members_page_url + polymorphic_url([group, :members]) + end + + def root_params_key + :group_member + end end Groups::GroupMembersController.prepend_mod_with('Groups::GroupMembersController') |