Fix nesting bug when rendering children of a shared subgroup

2 files changed, 2 insertions, 2 deletions

diff --git a/app/finders/group_descendants_finder.rb b/app/finders/group_descendants_finder.rb
index 07178a026e8..4ed9c0ea39a 100644
--- a/app/finders/group_descendants_finder.rb
+++ b/app/finders/group_descendants_finder.rb
@@ -64,7 +64,7 @@ class GroupDescendantsFinder
       subgroups_with_counts = ancestors_for_project_search.with_route.select(group_selects) | subgroups_with_counts
     end
 
-    @children = subgroups_with_counts + projects.preload(:route)
+    @children = subgroups_with_counts + projects.with_route
   end
 
   def direct_child_groups
diff --git a/app/serializers/group_child_serializer.rb b/app/serializers/group_child_serializer.rb
index ba81f99fff4..6fa269ee5c0 100644
--- a/app/serializers/group_child_serializer.rb
+++ b/app/serializers/group_child_serializer.rb
@@ -41,7 +41,7 @@ class GroupChildSerializer < BaseSerializer
           .merge(children: Array.wrap(serializer.represent_hierarchy(children, opts)))
       end
     elsif hierarchy.is_a?(Array)
-      hierarchy.map { |child| serializer.represent_hierarchy(child, opts) }
+      hierarchy.map { |child| serializer.represent_hierarchy(child, opts) }.flatten
     else
       serializer.represent(hierarchy, opts)
     end