diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-21 14:49:07 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-21 14:49:07 +0000 |
| commit | f562e69eab0d7bac8ea20d29c3df981289dd8cdb (patch) | |
| tree | 9a4a9849c0e9e6bc833cf4e2d6ca801adf7c2887 /lib | |
| parent | 9024875e1f81a3aab3c0879d33a4cea912ce833d (diff) | |
| parent | c900c21eef9235306d7d0da42b07aa2de346e263 (diff) | |
| download | gitlab-ce-f562e69eab0d7bac8ea20d29c3df981289dd8cdb.tar.gz | |
Merge branch '39461-notes-api-for-issues-no-longer-returns-label-additions-removals' into 'master'
Resolve "Notes API for issues no longer returns label additions/removals"
Closes #39461
See merge request gitlab-org/gitlab-ce!15080
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/notes.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/notes.rb b/lib/api/notes.rb index 0b9ab4eeb05..ceaaeca4046 100644 --- a/lib/api/notes.rb +++ b/lib/api/notes.rb @@ -33,7 +33,7 @@ module API # paginate() only works with a relation. This could lead to a # mismatch between the pagination headers info and the actual notes # array returned, but this is really a edge-case. - paginate(noteable.notes) + paginate(noteable.notes.with_metadata) .reject { |n| n.cross_reference_not_visible_for?(current_user) } present notes, with: Entities::Note else @@ -50,7 +50,7 @@ module API end get ":id/#{noteables_str}/:noteable_id/notes/:note_id" do noteable = find_project_noteable(noteables_str, params[:noteable_id]) - note = noteable.notes.find(params[:note_id]) + note = noteable.notes.with_metadata.find(params[:note_id]) can_read_note = can?(current_user, noteable_read_ability_name(noteable), noteable) && !note.cross_reference_not_visible_for?(current_user) if can_read_note |