summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Javier López <fjlopez@gitlab.com>2017-12-21 18:06:59 +0100
committerFrancisco Javier López <fjlopez@gitlab.com>2017-12-21 18:06:59 +0100
commit3b5eab3c3c9c38dabd311264ade8a4e58b0bf640 (patch)
tree28e1889b77d7a8400193b2ab0117e07bfd69ecad
parent3e7f36da1ae4b084915d4bb685b1a9a33acce92a (diff)
downloadgitlab-ce-3b5eab3c3c9c38dabd311264ade8a4e58b0bf640.tar.gz
Reverting https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788
-rw-r--r--app/models/event.rb2
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) }