diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2019-04-10 17:05:46 +0100 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2019-04-10 17:05:46 +0100 |
| commit | cbd6841cac8185f181a5dcec33704f6e7c040732 (patch) | |
| tree | 423bbc4fb873ab51590d0be4ae594769c80b739b /lib/banzai | |
| parent | 3402f8c817e9798eed9d86555f3f85fd10f49abf (diff) | |
| parent | 490b31f740d23b54a62588cd9fd0e0cf7fdd9370 (diff) | |
| download | gitlab-ce-docs-pages-intro.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into docs-pages-introdocs-pages-intro
Diffstat (limited to 'lib/banzai')
| -rw-r--r-- | lib/banzai/filter/relative_link_filter.rb | 2 | ||||
| -rw-r--r-- | lib/banzai/reference_parser/merge_request_parser.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/banzai/filter/relative_link_filter.rb b/lib/banzai/filter/relative_link_filter.rb index 2745905c5ff..199b3533cf4 100644 --- a/lib/banzai/filter/relative_link_filter.rb +++ b/lib/banzai/filter/relative_link_filter.rb @@ -150,7 +150,7 @@ module Banzai end def uri_type(path) - # https://gitlab.com/gitlab-org/gitlab-ce/issues/58011 + # https://gitlab.com/gitlab-org/gitlab-ce/issues/58657 Gitlab::GitalyClient.allow_n_plus_1_calls do @uri_types[path] ||= current_commit.uri_type(path) end diff --git a/lib/banzai/reference_parser/merge_request_parser.rb b/lib/banzai/reference_parser/merge_request_parser.rb index e8147ac591a..d7bf450465e 100644 --- a/lib/banzai/reference_parser/merge_request_parser.rb +++ b/lib/banzai/reference_parser/merge_request_parser.rb @@ -10,7 +10,7 @@ module Banzai nodes, MergeRequest.includes( :author, - :assignee, + :assignees, { # These associations are primarily used for checking permissions. # Eager loading these ensures we don't end up running dozens of |