diff options
author | Tiago <tiagonbotelho@hotmail.com> | 2017-12-21 17:12:12 +0000 |
---|---|---|
committer | Tiago <tiagonbotelho@hotmail.com> | 2017-12-21 17:12:12 +0000 |
commit | 8c195b3944904db2609463d3c2b4fef0a3d61a95 (patch) | |
tree | 28e1889b77d7a8400193b2ab0117e07bfd69ecad | |
parent | 3e7f36da1ae4b084915d4bb685b1a9a33acce92a (diff) | |
parent | 3b5eab3c3c9c38dabd311264ade8a4e58b0bf640 (diff) | |
download | gitlab-ce-8c195b3944904db2609463d3c2b4fef0a3d61a95.tar.gz |
Merge branch 'revert-n-plus-1-fix-in-events' into '10-3-stable'
Reverting https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788
See merge request gitlab-org/gitlab-ce!16088
-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) } |