Merge branch 'sh-optimize-admin-projects-page' into 'master'

Fix timeouts loading /admin/projects page Closes #44338 See merge request gitlab-org/gitlab-ce!17785

Merge branch 'sh-optimize-admin-projects-page' into 'master'
e148e152 · Robert Speicher · Robert Speicher · db6948aa · e148e152 · e148e152
Commit e148e152 authored Mar 16, 2018 by Robert Speicher Committed by Robert Speicher Mar 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

projects_finder.rb app/finders/admin/projects_finder.rb +1 -2

sh-optimize-admin-projects-page.yml changelogs/unreleased/sh-optimize-admin-projects-page.yml +5 -0

No files found.
--- a/app/finders/admin/projects_finder.rb
+++ b/app/finders/admin/projects_finder.rb
@@ -16,8 +16,7 @@ class Admin::ProjectsFinder
    items = by_archived(items)
    items = by_personal(items)
    items = by_name(items)
-    items = sort(items)
-    items.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page])
+    sort(items).page(params[:page])
  end

  private

--- a/changelogs/unreleased/sh-optimize-admin-projects-page.yml
+++ b/changelogs/unreleased/sh-optimize-admin-projects-page.yml
+---
+title: Fix timeouts loading /admin/projects page
+merge_request:
+author:
+type: performance