Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 6 insertions, 0 deletions

diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb
index 63311ab983b..5df7ff0632a 100644
--- a/app/controllers/groups/group_members_controller.rb
+++ b/app/controllers/groups/group_members_controller.rb
@@ -19,6 +19,8 @@ class Groups::GroupMembersController < Groups::ApplicationController
                                   :approve_access_request, :leave, :resend_invite,
                                   :override
 
+  feature_category :authentication_and_authorization
+
   def index
     @sort = params[:sort].presence || sort_value_name
 
@@ -69,6 +71,10 @@ class Groups::GroupMembersController < Groups::ApplicationController
   def filter_params
     params.permit(:two_factor, :search).merge(sort: @sort)
   end
+
+  def membershipable_members
+    group.members
+  end
 end
 
 Groups::GroupMembersController.prepend_if_ee('EE::Groups::GroupMembersController')