diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-12-22 18:01:06 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-12-22 18:01:06 +0000 |
| commit | 8a488a02ce9cf6ea6cbddbb57991548e35cb3a0c (patch) | |
| tree | 6a14e995f61a90066667fdbe72f3987cf0a58b34 | |
| parent | b98c69470f52185117fcdb5e28096826b32363ca (diff) | |
| parent | 5d6fea1bb98355081fc94f299a4b01cd986c6bdb (diff) | |
| download | gitlab-ce-8a488a02ce9cf6ea6cbddbb57991548e35cb3a0c.tar.gz | |
Merge branch 'fj-revert-event-target-author-preloading' into 'master'
Reverted fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788
See merge request gitlab-org/gitlab-ce!16118
| -rw-r--r-- | app/models/event.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-event-target-author-preloading.yml | 5 |
2 files changed, 1 insertions, 6 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) } diff --git a/changelogs/unreleased/fix-event-target-author-preloading.yml b/changelogs/unreleased/fix-event-target-author-preloading.yml deleted file mode 100644 index c6154cc0835..00000000000 --- a/changelogs/unreleased/fix-event-target-author-preloading.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix N+1 query when displaying events -merge_request: -author: -type: performance |