Skip to content

Commit 2c792c7

Browse files
author
Robert Speicher
committed
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
2 parents 9fd2d9e + 351d0c2 commit 2c792c7

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

app/finders/admin/projects_finder.rb

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ def execute
1616
items = by_archived(items)
1717
items = by_personal(items)
1818
items = by_name(items)
19-
items = sort(items)
20-
items.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page])
19+
sort(items).page(params[:page])
2120
end
2221

2322
private
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Fix timeouts loading /admin/projects page
3+
merge_request:
4+
author:
5+
type: performance

0 commit comments

Comments
 (0)