diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-10-23 09:49:45 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-10-23 09:49:45 +0000 |
| commit | 86ead874e217fb1aceb2d09daf29a9a6ade0ff62 (patch) | |
| tree | 16d7130d8b4ce09bff582e4506ca191253a2895c /app/controllers/projects | |
| parent | 10bb8297ebe5fc01540b20c3fd365234779b6837 (diff) | |
| download | gitlab-ce-86ead874e217fb1aceb2d09daf29a9a6ade0ff62.tar.gz | |
Resolve "Filter discussion (tab) by comments or activity in issues and merge requests"
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/notes_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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! |