Commit 2c792c75 authored by Robert Speicher's avatar Robert Speicher

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
parents 9fd2d9ea 351d0c28
...@@ -16,8 +16,7 @@ class Admin::ProjectsFinder ...@@ -16,8 +16,7 @@ class Admin::ProjectsFinder
items = by_archived(items) items = by_archived(items)
items = by_personal(items) items = by_personal(items)
items = by_name(items) items = by_name(items)
items = sort(items) sort(items).page(params[:page])
items.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page])
end end
private private
......
---
title: Fix timeouts loading /admin/projects page
merge_request:
author:
type: performance
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment