Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/helpers/notes_helper.rb')
-rw-r--r--app/helpers/notes_helper.rb9
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)