diff options
Diffstat (limited to 'app/serializers/note_entity.rb')
| -rw-r--r-- | app/serializers/note_entity.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/serializers/note_entity.rb b/app/serializers/note_entity.rb index 26dc748ad51..a50d893d244 100644 --- a/app/serializers/note_entity.rb +++ b/app/serializers/note_entity.rb @@ -48,6 +48,7 @@ class NoteEntity < API::Entities::Note expose :resolvable?, as: :resolvable expose :resolved_by, using: NoteUserEntity + expose :resolved_by_push?, as: :resolved_by_push expose :system_note_icon_name, if: -> (note, _) { note.system? } do |note| SystemNoteHelper.system_note_icon_name(note) @@ -77,10 +78,10 @@ class NoteEntity < API::Entities::Note end expose :resolve_path, if: -> (note, _) { note.part_of_discussion? && note.resolvable? } do |note| - resolve_project_merge_request_discussion_path(note.project, note.noteable, note.discussion_id) + resolve_project_discussion_path(discussion.project, discussion.noteable_collection_name, discussion.noteable, discussion.id) end - expose :resolve_with_issue_path, if: -> (note, _) { note.part_of_discussion? && note.resolvable? } do |note| + expose :resolve_with_issue_path, if: -> (note, _) { note.part_of_discussion? && note.resolvable? && note.noteable.is_a?(MergeRequest) } do |note| new_project_issue_path(note.project, merge_request_to_resolve_discussions_of: note.noteable.iid, discussion_to_resolve: note.discussion_id) end |