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/controllers/concerns/notes_actions.rb | |
| parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) | |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/controllers/concerns/notes_actions.rb')
| -rw-r--r-- | app/controllers/concerns/notes_actions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/notes_actions.rb b/app/controllers/concerns/notes_actions.rb index a41e2d840ac..512dbf0de5d 100644 --- a/app/controllers/concerns/notes_actions.rb +++ b/app/controllers/concerns/notes_actions.rb @@ -100,7 +100,7 @@ module NotesActions def gather_all_notes now = Time.current - notes = merge_resource_events(notes_finder.execute.inc_relations_for_view) + notes = merge_resource_events(notes_finder.execute.inc_relations_for_view(noteable)) [notes, { last_fetched_at: (now.to_i * MICROSECOND) + now.usec }] end |