From 86ead874e217fb1aceb2d09daf29a9a6ade0ff62 Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreira Date: Tue, 23 Oct 2018 09:49:45 +0000 Subject: Resolve "Filter discussion (tab) by comments or activity in issues and merge requests" --- app/controllers/projects/notes_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/projects/notes_controller.rb') diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 4bac763d000..3152a38fd8e 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -68,7 +68,7 @@ class Projects::NotesController < Projects::ApplicationController alias_method :awardable, :note def finder_params - params.merge(last_fetched_at: last_fetched_at) + params.merge(last_fetched_at: last_fetched_at, notes_filter: notes_filter) end def authorize_admin_note! -- cgit v1.2.3