From 3b5eab3c3c9c38dabd311264ade8a4e58b0bf640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Javier=20L=C3=B3pez?= Date: Thu, 21 Dec 2017 18:06:59 +0100 Subject: Reverting https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788 --- app/models/event.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') 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) } -- cgit v1.2.3