Use BatchModelLoader for parent in GroupType

1 files changed, 4 insertions, 2 deletions

diff --git a/app/graphql/types/group_type.rb b/app/graphql/types/group_type.rb
index a2d615ee732..530aecc2bf9 100644
--- a/app/graphql/types/group_type.rb
+++ b/app/graphql/types/group_type.rb
@@ -8,14 +8,16 @@ module Types
 
     expose_permissions Types::PermissionTypes::Group
 
-    field :web_url, GraphQL::STRING_TYPE, null: true
+    field :web_url, GraphQL::STRING_TYPE, null: false
 
     field :avatar_url, GraphQL::STRING_TYPE, null: true, resolve: -> (group, args, ctx) do
       group.avatar_url(only_path: false)
     end
 
     if ::Group.supports_nested_objects?
-      field :parent, GroupType, null: true
+      field :parent, GroupType,
+            null: true,
+            resolve: -> (obj, _args, _ctx) { Gitlab::Graphql::Loaders::BatchModelLoader.new(Group, obj.parent_id).find }
     end
   end
 end