summaryrefslogtreecommitdiff
path: root/app/finders
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2017-09-10 17:20:27 +0200
committerBob Van Landuyt <bob@vanlanduyt.co>2017-10-04 22:49:41 +0200
commitbb5187bb2a71f87b3ff49388f70dbcb27dfe4c6a (patch)
tree3049fc8a014ea93fdee87d1cb3ac9eefd8ea88c6 /app/finders
parent8f6dac4991ba7f5771a24175784f19dc1bbd4103 (diff)
downloadgitlab-ce-bb5187bb2a71f87b3ff49388f70dbcb27dfe4c6a.tar.gz
Handle case where 2 matches in the same tree are found
Diffstat (limited to 'app/finders')
-rw-r--r--app/finders/group_children_finder.rb6
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