diff options
author | Rémy Coutable <remy@rymai.me> | 2017-02-09 12:19:32 +0100 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-02-13 15:23:23 +0100 |
commit | a9924ee4d299b96da1e8dd58a6c9ed42b5dfacbd (patch) | |
tree | 1c3ad21debd9346c275a5ac96da4cd5edd0215a9 | |
parent | 85349c961c0c16cc2b2ed0e719cd549146e912d9 (diff) | |
download | gitlab-ce-a9924ee4d299b96da1e8dd58a6c9ed42b5dfacbd.tar.gz |
Don't instantiate AR objects in Event.in_projects
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r-- | app/models/event.rb | 2 | ||||
-rw-r--r-- | changelogs/unreleased/27395-reduce-group-activity-sql-queries.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/models/event.rb b/app/models/event.rb index 2662f170765..c90fee95426 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.map(&:id)).recent + where(project_id: projects).recent end scope :with_associations, -> { includes(project: :namespace) } diff --git a/changelogs/unreleased/27395-reduce-group-activity-sql-queries.yml b/changelogs/unreleased/27395-reduce-group-activity-sql-queries.yml new file mode 100644 index 00000000000..3f6d922f2a0 --- /dev/null +++ b/changelogs/unreleased/27395-reduce-group-activity-sql-queries.yml @@ -0,0 +1,4 @@ +--- +title: Don't instantiate AR objects in Event.in_projects +merge_request: +author: |