diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-16 21:30:21 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-03-19 20:39:32 +0300 |
| commit | e148e15209e45704af79b0a9e00fdae1e9f3fb48 (patch) | |
| tree | 799d7b7c7d384f04a5e75fbf9a217405e0964f31 /app/finders | |
| parent | db6948aa8daf99576b545e1cbfdebe023630ea14 (diff) | |
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
Diffstat (limited to 'app/finders')
| -rw-r--r-- | app/finders/admin/projects_finder.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/finders/admin/projects_finder.rb b/app/finders/admin/projects_finder.rb index d6bcd939522..5c507fe8d50 100644 --- 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 |