diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-17 21:07:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-17 21:07:17 +0300 |
| commit | 3fbd6ba74ee268ad739599ae14dcf5c9b6acfc2c (patch) | |
| tree | eea3db86df012fd59b4db8c4ec132e494bdac8fb /app/models/concerns | |
| parent | d41edc2e93480db35e48ad770ebe95075fbca871 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/noteable.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/noteable.rb b/app/models/concerns/noteable.rb index 36b134fdb65..eed396f785b 100644 --- a/app/models/concerns/noteable.rb +++ b/app/models/concerns/noteable.rb @@ -88,7 +88,7 @@ module Noteable def discussions @discussions ||= discussion_notes - .inc_relations_for_view + .inc_relations_for_view(self) .discussions(self) end @@ -126,7 +126,7 @@ module Noteable def grouped_diff_discussions(*args) # Doesn't use `discussion_notes`, because this may include commit diff notes # besides MR diff notes, that we do not want to display on the MR Changes tab. - notes.inc_relations_for_view.grouped_diff_discussions(*args) + notes.inc_relations_for_view(self).grouped_diff_discussions(*args) end # rubocop:disable Gitlab/ModuleWithInstanceVariables |