diff options
author | Stan Hu <stanhu@gmail.com> | 2018-03-18 15:13:17 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-03-18 15:15:27 -0700 |
commit | ccca369fd8d3a863a1ed236e0b663763dd841550 (patch) | |
tree | 7afcc26c5cea580da46a1d3e585da58521f1864e | |
parent | ea5221aeb358ef6c349cfa09b9c6993bd7bd027d (diff) | |
download | gitlab-ce-sh-admin-projects-remove-n-plus-one.tar.gz |
Remove N+1 queries in /admin/projects pagesh-admin-projects-remove-n-plus-one
-rw-r--r-- | app/finders/admin/projects_finder.rb | 1 | ||||
-rw-r--r-- | spec/controllers/admin/projects_controller_spec.rb | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/app/finders/admin/projects_finder.rb b/app/finders/admin/projects_finder.rb index 5c507fe8d50..2c8f21c2400 100644 --- a/app/finders/admin/projects_finder.rb +++ b/app/finders/admin/projects_finder.rb @@ -16,6 +16,7 @@ class Admin::ProjectsFinder items = by_archived(items) items = by_personal(items) items = by_name(items) + items = items.includes(namespace: [:owner]) sort(items).page(params[:page]) end diff --git a/spec/controllers/admin/projects_controller_spec.rb b/spec/controllers/admin/projects_controller_spec.rb index d5a3c250f31..e556df0e2bb 100644 --- a/spec/controllers/admin/projects_controller_spec.rb +++ b/spec/controllers/admin/projects_controller_spec.rb @@ -31,5 +31,15 @@ describe Admin::ProjectsController do expect(response.body).not_to match(pending_delete_project.name) expect(response.body).to match(project.name) end + + it 'does not have N+1 queries', :use_clean_rails_memory_store_caching, :request_store do + get :index + + control_count = ActiveRecord::QueryRecorder.new { get :index}.count + + create(:project) + + expect { get :index }.not_to exceed_query_limit(control_count) + end end end |