Handle case where 2 matches in the same tree are found

1 files changed, 2 insertions, 4 deletions

diff --git a/app/finders/group_children_finder.rb b/app/finders/group_children_finder.rb
index eb0129947e2..bac3fb208d0 100644
--- a/app/finders/group_children_finder.rb
+++ b/app/finders/group_children_finder.rb
@@ -52,7 +52,7 @@ class GroupChildrenFinder
   end
 
   def subgroups_matching_filter
-    all_subgroups.search(params[:filter]).include(:parent)
+    all_subgroups.search(params[:filter])
   end
 
   def subgroups
@@ -64,7 +64,7 @@ class GroupChildrenFinder
              else
                base_groups
              end
-    groups = groups.includes(:route).includes(:children)
+    groups = groups
     groups.sort(params[:sort])
   end
 
@@ -75,7 +75,6 @@ class GroupChildrenFinder
   def projects_matching_filter
     ProjectsFinder.new(current_user: current_user).execute
       .search(params[:filter])
-      .include(:namespace)
       .where(namespace: all_subgroups)
   end
 
@@ -87,7 +86,6 @@ class GroupChildrenFinder
                else
                  base_projects
                end
-    projects = projects.includes(:route)
     projects.sort(params[:sort])
   end
 end