Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/finders/merge_request_target_project_finder.rb')
-rw-r--r--app/finders/merge_request_target_project_finder.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/app/finders/merge_request_target_project_finder.rb b/app/finders/merge_request_target_project_finder.rb
index fdb3bac8935..ea1aa6d2e9e 100644
--- a/app/finders/merge_request_target_project_finder.rb
+++ b/app/finders/merge_request_target_project_finder.rb
@@ -11,9 +11,10 @@ class MergeRequestTargetProjectFinder
@project_feature = project_feature
end
- def execute(include_routes: false)
+ def execute(search: nil, include_routes: false)
if source_project.fork_network
- include_routes ? projects.inc_routes : projects
+ items = include_routes ? projects.inc_routes : projects
+ by_search(items, search)
else
Project.id_in(source_project.id)
end
@@ -31,4 +32,10 @@ class MergeRequestTargetProjectFinder
.non_archived
.with_feature_available_for_user(project_feature, current_user)
end
+
+ # rubocop: disable CodeReuse/ActiveRecord
+ def by_search(items, search)
+ items.joins(:route).fuzzy_search(search, [Route.arel_table[:path], Route.arel_table[:name], :description])
+ end
+ # rubocop: enable CodeReuse/ActiveRecord
end