1 files changed, 28 insertions, 5 deletions

diff --git a/lib/api/groups.rb b/lib/api/groups.rb
index ca99e30fbf7..23db10dbdbf 100644
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
@@ -100,7 +100,7 @@ module API
         options = {
           with: serializer,
           current_user: current_user,
-          statistics: params[:statistics] && current_user&.admin?
+          statistics: params[:statistics] && current_user&.can_read_all_resources?
         }
 
         groups = groups.with_statistics if options[:statistics]
@@ -186,7 +186,7 @@ module API
       end
 
       def check_subscription!(group)
-        render_api_error!("This group can't be removed because it is linked to a subscription.", :bad_request) if group.paid?
+        render_api_error!("This group can't be removed because it is linked to a subscription.", :bad_request) if group.prevent_delete?
       end
     end
 
@@ -195,6 +195,8 @@ module API
 
       desc 'Get a groups list' do
         success Entities::Group
+        is_array true
+        tags %w[groups]
       end
       params do
         use :group_list_params
@@ -207,6 +209,7 @@ module API
 
       desc 'Create a group. Available only for users who can create groups.' do
         success Entities::Group
+        tags %w[groups]
       end
       params do
         requires :name, type: String, desc: 'The name of the group'
@@ -240,6 +243,7 @@ module API
     resource :groups, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
       desc 'Update a group. Available only for users who can administrate groups.' do
         success Entities::Group
+        tags %w[groups]
       end
       params do
         optional :name, type: String, desc: 'The name of the group'
@@ -265,6 +269,7 @@ module API
 
       desc 'Get a single group, with containing projects.' do
         success Entities::GroupDetail
+        tags %w[groups]
       end
       params do
         use :with_custom_attributes
@@ -278,7 +283,9 @@ module API
         present_group_details(params, group, with_projects: params[:with_projects])
       end
 
-      desc 'Remove a group.'
+      desc 'Remove a group.' do
+        tags %w[groups]
+      end
       delete ":id", feature_category: :subgroups, urgency: :low do
         group = find_group!(params[:id])
         authorize! :admin_group, group
@@ -289,6 +296,8 @@ module API
 
       desc 'Get a list of projects in this group.' do
         success Entities::Project
+        is_array true
+        tags %w[groups]
       end
       params do
         optional :archived, type: Boolean, desc: 'Limit by archived status'
@@ -329,6 +338,8 @@ module API
 
       desc 'Get a list of shared projects in this group' do
         success Entities::Project
+        is_array true
+        tags %w[groups]
       end
       params do
         optional :archived, type: Boolean, desc: 'Limit by archived status'
@@ -357,6 +368,8 @@ module API
 
       desc 'Get a list of subgroups in this group.' do
         success Entities::Group
+        is_array true
+        tags %w[groups]
       end
       params do
         use :group_list_params
@@ -369,6 +382,8 @@ module API
 
       desc 'Get a list of descendant groups of this group.' do
         success Entities::Group
+        is_array true
+        tags %w[groups]
       end
       params do
         use :group_list_params
@@ -382,6 +397,7 @@ module API
 
       desc 'Transfer a project to the group namespace. Available only for admin.' do
         success Entities::GroupDetail
+        tags %w[groups]
       end
       params do
         requires :project_id, type: String, desc: 'The ID or path of the project'
@@ -400,7 +416,11 @@ module API
         end
       end
 
-      desc 'Get the groups to where the current group can be transferred to'
+      desc 'Get the groups to where the current group can be transferred to' do
+        success Entities::Group
+        is_array true
+        tags %w[groups]
+      end
       params do
         optional :search, type: String, desc: 'Return list of namespaces matching the search criteria'
         use :pagination
@@ -415,7 +435,9 @@ module API
         present_groups params, groups, serializer: Entities::PublicGroupDetails
       end
 
-      desc 'Transfer a group to a new parent group or promote a subgroup to a root group'
+      desc 'Transfer a group to a new parent group or promote a subgroup to a root group' do
+        tags %w[groups]
+      end
       params do
         optional :group_id,
                  type: Integer,
@@ -440,6 +462,7 @@ module API
 
       desc 'Share a group with a group' do
         success Entities::GroupDetail
+        tags %w[groups]
       end
       params do
         requires :group_id, type: Integer, desc: 'The ID of the group to share'