diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-08-23 17:31:27 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-08-23 17:31:27 +0300 |
| commit | 087cfc6f9dae50e0ecaf34eb0adcf88da4995fda (patch) | |
| tree | 61afe3e8b947b175d1912d8e4fdcfe3cdb720518 /lib | |
| parent | b4f7fa0e8b641c563c05b2ddd564b4530906035b (diff) | |
| parent | b26e5546c3a523742b39a0b5b0e376367ea4c649 (diff) | |
Merge branch '43096-controller-projects-issuescontroller-referenced_merge_requests-json-executes-more-than-100-sql-queries' into 'master'
Resolve "Controller Projects::IssuesController#referenced_merge_requests.json executes more than 100 SQL queries"
Closes #43096
See merge request gitlab-org/gitlab-ce!21237
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/banzai/reference_parser/merge_request_parser.rb | 5 |
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 |