summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2017-02-24 16:56:34 -0300
committerOswaldo Ferreira <oswaldo@gitlab.com>2017-02-24 20:15:39 -0300
commit1286151578af69e88d267d0dc3294ef1ed0062c2 (patch)
treeb499dae9f7b82f6b956745c6e75e380e8422798d
parent2fb3fcf0c0446c9a1568e26e81d49f3b5ce159dc (diff)
downloadgitlab-ce-27267-events-project-query-performance-regression.tar.gz
Add performance query regression fix for !9088 affecting #2726727267-events-project-query-performance-regression
-rw-r--r--app/models/event.rb2
-rw-r--r--changelogs/unreleased/27267-events-project-query-performance-regression.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/models/event.rb b/app/models/event.rb
index 4b8eac9accf..d7ca8e3c599 100644
--- 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) }
diff --git a/changelogs/unreleased/27267-events-project-query-performance-regression.yml b/changelogs/unreleased/27267-events-project-query-performance-regression.yml
new file mode 100644
index 00000000000..a1697b57eac
--- /dev/null
+++ b/changelogs/unreleased/27267-events-project-query-performance-regression.yml
@@ -0,0 +1,4 @@
+---
+title: 'Add performance query regression fix for !9088 affecting #27267'
+merge_request:
+author: