diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
| commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
| tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/services/issuable | |
| parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) | |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/services/issuable')
| -rw-r--r-- | app/services/issuable/discussions_list_service.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/services/issuable/discussions_list_service.rb b/app/services/issuable/discussions_list_service.rb index 1e5e37e4e1b..10e7660289b 100644 --- a/app/services/issuable/discussions_list_service.rb +++ b/app/services/issuable/discussions_list_service.rb @@ -19,7 +19,7 @@ module Issuable return Note.none unless can_read_issuable_notes? notes = NotesFinder.new(current_user, params.merge({ target: issuable, project: issuable.project })) - .execute.with_web_entity_associations.inc_relations_for_view.fresh + .execute.with_web_entity_associations.inc_relations_for_view(issuable).fresh if paginator paginated_discussions_by_type = paginator.records.group_by(&:table_name) @@ -49,7 +49,6 @@ module Issuable def paginator return if params[:per_page].blank? - return if issuable.instance_of?(MergeRequest) && Feature.disabled?(:paginated_mr_discussions, issuable.project) strong_memoize(:paginator) do issuable |