Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2018-08-16 14:17:41 +0300
committerSean McGivern <sean@gitlab.com>2018-08-21 14:40:44 +0300
commit2017c5c62abde0d6f24e3afc120365ee1aaaca4b (patch)
tree88aee49fa975ddebc57911c22acad733551cb4fc /lib/banzai
parent22d8fbacaf153c0b29738e812a22764129483eee (diff)
Fix routes N+1 in Issues::ReferencedMergeRequestsService#execute
Sorting here needs the project routes to be loaded, including the namespace routes.
Diffstat (limited to 'lib/banzai')
-rw-r--r--lib/banzai/reference_parser/merge_request_parser.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/banzai/reference_parser/merge_request_parser.rb b/lib/banzai/reference_parser/merge_request_parser.rb
index a370ff5b5b3..9e5d55f72bc 100644
--- a/lib/banzai/reference_parser/merge_request_parser.rb
+++ b/lib/banzai/reference_parser/merge_request_parser.rb
@@ -14,11 +14,12 @@ module Banzai
# Eager loading these ensures we don't end up running dozens of
# queries in this process.
target_project: [
- { namespace: :owner },
+ { namespace: [:owner, :route] },
{ group: [:owners, :group_members] },
:invited_groups,
:project_members,
- :project_feature
+ :project_feature,
+ :route
]
}),
self.class.data_attribute