Merge branch '27267-events-project-query-performance-regression' into 'master'

Query performance regression fix affecting "Dashboard::ProjectsController#index.atom" Closes #27267 See merge request !9526

Merge branch '27267-events-project-query-performance-regression' into 'master'
39569ee9 · Sean McGivern · Ruben Davila · 588d68be · 39569ee9 · 39569ee9
Commit 39569ee9 authored Feb 27, 2017 by Sean McGivern Committed by Ruben Davila Feb 27, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

event.rb app/models/event.rb +1 -1

27267-events-project-query-performance-regression.yml ...sed/27267-events-project-query-performance-regression.yml +4 -0

No files found.
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -36,7 +36,7 @@ class Event < ActiveRecord::Base
  scope :code_push, -> { where(action: PUSHED) }

  scope :in_projects, ->(projects) do
-    where(project_id: projects).recent
+    where(project_id: projects.pluck(:id)).recent
  end

  scope :with_associations, -> { includes(:author, :project, project: :namespace).preload(:target) }

--- a/changelogs/unreleased/27267-events-project-query-performance-regression.yml
+++ b/changelogs/unreleased/27267-events-project-query-performance-regression.yml
+---
+title: 'Add performance query regression fix for !9088 affecting #27267'
+merge_request:
+author: