diff options
| author | Francisco Javier López <fjlopez@gitlab.com> | 2017-12-21 17:58:03 +0100 |
|---|---|---|
| committer | Francisco Javier López <fjlopez@gitlab.com> | 2017-12-21 17:58:03 +0100 |
| commit | 5226ac587a20b0633f698757c7762bd50ae31f8e (patch) | |
| tree | 982e5251b18a5df320e952490d52a8ea9f2345e5 | |
| parent | 92e15071c13f65cf7250315f1a138284880b0074 (diff) | |
| download | gitlab-ce-fj-fix-revert-n-plus-1-fix.tar.gz | |
Reverting fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788fj-fix-revert-n-plus-1-fix
| -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 6053594fab5..0997b056c6a 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(:push_event_payload, target: :author) + .preload(:target, :push_event_payload) end scope :for_milestone_id, ->(milestone_id) { where(target_type: "Milestone", target_id: milestone_id) } |