diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-16 18:30:21 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-03-16 18:30:21 +0000 |
| commit | 2c792c7572502807508add213be70db1b81685d4 (patch) | |
| tree | c6e0db68c81509928a76c1efc76976e2dfa8e1cc | |
| parent | 9fd2d9ea243e8691c7a7aa9575256ac636d59792 (diff) | |
| parent | 351d0c28dc8912075fdbb0a28e7356633c837931 (diff) | |
| download | gitlab-ce-2c792c7572502807508add213be70db1b81685d4.tar.gz | |
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
| -rw-r--r-- | app/finders/admin/projects_finder.rb | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-optimize-admin-projects-page.yml | 5 |
2 files changed, 6 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 diff --git a/changelogs/unreleased/sh-optimize-admin-projects-page.yml b/changelogs/unreleased/sh-optimize-admin-projects-page.yml new file mode 100644 index 00000000000..242ea758dab --- /dev/null +++ b/changelogs/unreleased/sh-optimize-admin-projects-page.yml @@ -0,0 +1,5 @@ +--- +title: Fix timeouts loading /admin/projects page +merge_request: +author: +type: performance |