diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/helpers/notes_helper.rb | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/helpers/notes_helper.rb')
-rw-r--r-- | app/helpers/notes_helper.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index fff7e5d1c7f..2dadaa0be0a 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -167,11 +167,11 @@ module NotesHelper } end - def discussions_path(issuable) + def discussions_path(issuable, **params) if issuable.is_a?(Issue) - discussions_project_issue_path(@project, issuable, format: :json) + discussions_project_issue_path(@project, issuable, params.merge(format: :json)) else - discussions_project_merge_request_path(@project, issuable, format: :json) + discussions_project_merge_request_path(@project, issuable, params.merge(format: :json)) end end @@ -188,7 +188,8 @@ module NotesHelper reopenPath: reopen_issuable_path(issuable), notesPath: notes_url, prerenderedNotesCount: issuable.capped_notes_count(MAX_PRERENDERED_NOTES), - lastFetchedAt: initial_last_fetched_at + lastFetchedAt: initial_last_fetched_at, + notesFilter: current_user&.notes_filter_for(issuable) } if issuable.is_a?(MergeRequest) |