diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-08-29 17:17:37 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-08-29 17:17:37 -0500 |
| commit | 7698d405506bc10dfd7fb2e6e02b419dd5925725 (patch) | |
| tree | b2c188fd3bc588f15d04d8ce6137f9447f7a72c7 /lib/api/helpers | |
| parent | fa160c26b14d233eb2e3b861a0742766d1ac734b (diff) | |
| parent | 090956259c47d839b136f9391c3f74255764da81 (diff) | |
| download | gitlab-ce-7698d405506bc10dfd7fb2e6e02b419dd5925725.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Diffstat (limited to 'lib/api/helpers')
| -rw-r--r-- | lib/api/helpers/notes_helpers.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/helpers/notes_helpers.rb b/lib/api/helpers/notes_helpers.rb index b2bf6bf7417..f445834323d 100644 --- a/lib/api/helpers/notes_helpers.rb +++ b/lib/api/helpers/notes_helpers.rb @@ -12,7 +12,7 @@ module API end def update_note(noteable, note_id) - note = noteable.notes.find(params[:note_id]) + note = noteable.notes.find(note_id) authorize! :admin_note, note @@ -61,8 +61,8 @@ module API end def get_note(noteable, note_id) - note = noteable.notes.with_metadata.find(params[:note_id]) - can_read_note = !note.cross_reference_not_visible_for?(current_user) + note = noteable.notes.with_metadata.find(note_id) + can_read_note = note.visible_for?(current_user) if can_read_note present note, with: Entities::Note |