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

1 files changed, 6 insertions, 9 deletions

diff --git a/app/finders/todos_finder.rb b/app/finders/todos_finder.rb
index 3502bf08971..f07fb1c064d 100644
--- a/app/finders/todos_finder.rb
+++ b/app/finders/todos_finder.rb
@@ -105,10 +105,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
@@ -147,13 +143,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)