summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2017-09-19 10:45:34 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2017-09-19 10:45:34 +0000
commit39dd7736585d3e35d5c6f391e6a94c312da09056 (patch)
tree045f672c8fd146b8b118c0b94063dafdf8396d9c
parentbfca22b825df2b3f113c91f7ddb0c145934790f2 (diff)
parent0a2f93aa6a791714fb35557f60b20a1a92682684 (diff)
downloadgitlab-ce-39dd7736585d3e35d5c6f391e6a94c312da09056.tar.gz
Merge branch 'sh-project-feature-eager-load' into 'master'
Eliminate N+1 queries referencing issues Closes #38033 See merge request gitlab-org/gitlab-ce!14349
-rw-r--r--changelogs/unreleased/sh-project-feature-eager-load.yml5
-rw-r--r--lib/banzai/reference_parser/issue_parser.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/changelogs/unreleased/sh-project-feature-eager-load.yml b/changelogs/unreleased/sh-project-feature-eager-load.yml
new file mode 100644
index 00000000000..406ef119a14
--- /dev/null
+++ b/changelogs/unreleased/sh-project-feature-eager-load.yml
@@ -0,0 +1,5 @@
+---
+title: Eliminate N+1 queries referencing issues
+merge_request:
+author:
+type: fixed
diff --git a/lib/banzai/reference_parser/issue_parser.rb b/lib/banzai/reference_parser/issue_parser.rb
index a65bbe23958..e0a8ca653cb 100644
--- a/lib/banzai/reference_parser/issue_parser.rb
+++ b/lib/banzai/reference_parser/issue_parser.rb
@@ -34,7 +34,8 @@ module Banzai
{ namespace: :owner },
{ group: [:owners, :group_members] },
:invited_groups,
- :project_members
+ :project_members,
+ :project_feature
]
}
),