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
This commit is contained in:
Robert Speicher 2018-03-16 18:30:21 +00:00
commit 2c792c7572
2 changed files with 6 additions and 2 deletions

View File

@ -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

View File

@ -0,0 +1,5 @@
---
title: Fix timeouts loading /admin/projects page
merge_request:
author:
type: performance