Merge branch 'remove-projects-finder-from-todos-finder' into 'master'
Don't use ProjectsFinder in TodosFinder Closes #43767 See merge request gitlab-org/gitlab-ce!17462
This commit is contained in:
commit
d50caa64f8
2 changed files with 11 additions and 9 deletions
|
@ -110,10 +110,6 @@ class TodosFinder
|
|||
ids
|
||||
end
|
||||
|
||||
def projects(items)
|
||||
ProjectsFinder.new(current_user: current_user, project_ids_relation: project_ids(items)).execute
|
||||
end
|
||||
|
||||
def type?
|
||||
type.present? && %w(Issue MergeRequest).include?(type)
|
||||
end
|
||||
|
@ -152,13 +148,14 @@ class TodosFinder
|
|||
|
||||
def by_project(items)
|
||||
if project?
|
||||
items = items.where(project: project)
|
||||
items.where(project: project)
|
||||
else
|
||||
item_projects = projects(items)
|
||||
items = items.merge(item_projects).joins(:project)
|
||||
end
|
||||
projects = Project
|
||||
.public_or_visible_to_user(current_user)
|
||||
.order_id_desc
|
||||
|
||||
items
|
||||
items.joins(:project).merge(projects)
|
||||
end
|
||||
end
|
||||
|
||||
def by_state(items)
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Don't use ProjectsFinder in TodosFinder
|
||||
merge_request:
|
||||
author:
|
||||
type: performance
|
Loading…
Reference in a new issue