diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-23 12:09:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-23 12:09:47 +0000 |
| commit | 8f9beefac3774b30e911fb00a68f4c7a5244cf27 (patch) | |
| tree | 919c3a043f8c10bc3f78f3f6e029acfb6b972556 /app/finders | |
| parent | e4bf776a8829e5186a0f63603c0be627b891d80e (diff) | |
| download | gitlab-ce-8f9beefac3774b30e911fb00a68f4c7a5244cf27.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/finders')
| -rw-r--r-- | app/finders/autocomplete/move_to_project_finder.rb | 2 | ||||
| -rw-r--r-- | app/finders/projects_finder.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/finders/autocomplete/move_to_project_finder.rb b/app/finders/autocomplete/move_to_project_finder.rb index 491cce2232e..af6defc1fc6 100644 --- a/app/finders/autocomplete/move_to_project_finder.rb +++ b/app/finders/autocomplete/move_to_project_finder.rb @@ -25,7 +25,7 @@ module Autocomplete def execute current_user .projects_where_can_admin_issues - .optionally_search(search) + .optionally_search(search, include_namespace: true) .excluding_project(project_id) .eager_load_namespace_and_owner .sorted_by_name_asc_limited(LIMIT) diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb index c319d2fed87..961694bd91f 100644 --- a/app/finders/projects_finder.rb +++ b/app/finders/projects_finder.rb @@ -17,6 +17,7 @@ # tags: string[] # personal: boolean # search: string +# search_namespaces: boolean # non_archived: boolean # archived: 'only' or boolean # min_access_level: integer @@ -171,7 +172,7 @@ class ProjectsFinder < UnionFinder def by_search(items) params[:search] ||= params[:name] - params[:search].present? ? items.search(params[:search]) : items + items.optionally_search(params[:search], include_namespace: params[:search_namespaces].present?) end def by_deleted_status(items) |