diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-08-01 16:27:02 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-08-01 16:27:02 +0000 |
| commit | dbc6c2440348578be0e9dfb2197adfe3e9c457dd (patch) | |
| tree | c3a9a851c4505946c9bd4dbab460e9c6e9835c14 /app/controllers/projects | |
| parent | 536ebecf7eec95bd2cc1b542f1c35d70f814731e (diff) | |
| parent | e13b5dc7540b85673e066a7a7c26fc3abbecbfe7 (diff) | |
| download | gitlab-ce-dbc6c2440348578be0e9dfb2197adfe3e9c457dd.tar.gz | |
Merge branch '52123-issuable-actions-notesfinder-pderichs' into 'master'
Use NotesFinder to fetch notes on API and Controllers
Closes #52123
See merge request gitlab-org/gitlab-ce!31300
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 3152a38fd8e..65d9b074eee 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, notes_filter: notes_filter) + params.merge(project: project, last_fetched_at: last_fetched_at, notes_filter: notes_filter) end def authorize_admin_note! |