Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 24 insertions, 10 deletions

diff --git a/app/helpers/groups/group_members_helper.rb b/app/helpers/groups/group_members_helper.rb
index 3e7d6febabf..79191616c8f 100644
--- a/app/helpers/groups/group_members_helper.rb
+++ b/app/helpers/groups/group_members_helper.rb
@@ -13,31 +13,45 @@ module Groups::GroupMembersHelper
     render 'shared/members/invite_member', submit_url: group_group_members_path(group), access_levels: group.access_level_roles, default_access_level: default_access_level
   end
 
-  def group_group_links_data_json(group_links)
-    GroupLink::GroupGroupLinkSerializer.new.represent(group_links, { current_user: current_user }).to_json
+  def group_members_list_data_json(group, members, pagination = {})
+    group_members_list_data(group, members, pagination).to_json
   end
 
-  def members_data_json(group, members)
-    MemberSerializer.new.represent(members, { current_user: current_user, group: group, source: group }).to_json
+  def group_group_links_list_data_json(group)
+    group_group_links_list_data(group).to_json
+  end
+
+  private
+
+  def group_members_serialized(group, members)
+    MemberSerializer.new.represent(members, { current_user: current_user, group: group, source: group })
+  end
+
+  def group_group_links_serialized(group_links)
+    GroupLink::GroupGroupLinkSerializer.new.represent(group_links, { current_user: current_user })
   end
 
   # Overridden in `ee/app/helpers/ee/groups/group_members_helper.rb`
-  def group_members_list_data_attributes(group, members)
+  def group_members_list_data(group, members, pagination)
     {
-      members: members_data_json(group, members),
+      members: group_members_serialized(group, members),
+      pagination: members_pagination_data(members, pagination),
       member_path: group_group_member_path(group, ':id'),
       source_id: group.id,
-      can_manage_members: can?(current_user, :admin_group_member, group).to_s
+      can_manage_members: can?(current_user, :admin_group_member, group)
     }
   end
 
-  def group_group_links_list_data_attributes(group)
+  def group_group_links_list_data(group)
+    group_links = group.shared_with_group_links
+
     {
-      members: group_group_links_data_json(group.shared_with_group_links),
+      members: group_group_links_serialized(group_links),
+      pagination: members_pagination_data(group_links),
       member_path: group_group_link_path(group, ':id'),
       source_id: group.id
     }
   end
 end
 
-Groups::GroupMembersHelper.prepend_if_ee('EE::Groups::GroupMembersHelper')
+Groups::GroupMembersHelper.prepend_mod_with('Groups::GroupMembersHelper')