diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-12-08 16:58:32 +0000 |
---|---|---|
committer | LUKE BENNETT <lbennett@gitlab.com> | 2017-12-13 13:35:02 +0000 |
commit | 4ddf0c69e1a62039d77a68241189085fa32dbe2a (patch) | |
tree | 44838db1208cd89a3f4027aa519d9f83340b2ae9 /app | |
parent | ea63ce0d0d592791d5015255533ee6004c12cdd2 (diff) | |
download | gitlab-ce-4ddf0c69e1a62039d77a68241189085fa32dbe2a.tar.gz |
Merge branch 'fix-event-target-author-preloading' into 'master'
Fix N+1 query when displaying events
See merge request gitlab-org/gitlab-ce!15788
(cherry picked from commit 53026c4282f41397e984009545fbec8f77a8fc8a)
c52a36e8 Fix N+1 query when displaying events
Diffstat (limited to 'app')
-rw-r--r-- | app/models/event.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/event.rb b/app/models/event.rb index 0997b056c6a..6053594fab5 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -72,7 +72,7 @@ class Event < ActiveRecord::Base # We're using preload for "push_event_payload" as otherwise the association # is not always available (depending on the query being built). includes(:author, :project, project: :namespace) - .preload(:target, :push_event_payload) + .preload(:push_event_payload, target: :author) end scope :for_milestone_id, ->(milestone_id) { where(target_type: "Milestone", target_id: milestone_id) } |