diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-03 10:02:49 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-03 10:02:49 +0000 |
| commit | d811004d023cee1ae5cbcb5792faca34b30336a3 (patch) | |
| tree | 227de924c080ef082557e094509c76c8f0ee490f | |
| parent | 6201f4c2b59748f14c4899af7077aee1cf751f04 (diff) | |
| parent | 52d049b4f82b1a3ed358188e02ab3518e5eae5fa (diff) | |
| download | gitlab-ce-d811004d023cee1ae5cbcb5792faca34b30336a3.tar.gz | |
Merge branch 'fix-n-plus-one-project-features' into 'master'
Remove N+1 queries when checking nodes visible to user
See merge request !11040
| -rw-r--r-- | changelogs/unreleased/fix-n-plus-one-project-features.yml | 4 | ||||
| -rw-r--r-- | lib/banzai/reference_parser/merge_request_parser.rb | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/fix-n-plus-one-project-features.yml b/changelogs/unreleased/fix-n-plus-one-project-features.yml new file mode 100644 index 00000000000..1b19bd65224 --- /dev/null +++ b/changelogs/unreleased/fix-n-plus-one-project-features.yml @@ -0,0 +1,4 @@ +--- +title: Remove N+1 queries in processing MR references +merge_request: +author: diff --git a/lib/banzai/reference_parser/merge_request_parser.rb b/lib/banzai/reference_parser/merge_request_parser.rb index 84a28b33d7c..8b0662749fd 100644 --- a/lib/banzai/reference_parser/merge_request_parser.rb +++ b/lib/banzai/reference_parser/merge_request_parser.rb @@ -33,7 +33,8 @@ module Banzai { namespace: :owner }, { group: [:owners, :group_members] }, :invited_groups, - :project_members + :project_members, + :project_feature ] }), self.class.data_attribute |