diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-03-17 13:25:52 -0600 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 17:44:14 +0100 |
commit | 79889a6aa3dc878d196d0f2f445ab6b10ef10c74 (patch) | |
tree | 25367a69b4a529335e106d0d65c2d9a38e97f092 /app/controllers | |
parent | 80b2e18fb62b8da7410f90b3e5340b9e63e765a3 (diff) | |
download | gitlab-ce-79889a6aa3dc878d196d0f2f445ab6b10ef10c74.tar.gz |
Add specs
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/notes_controller.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 186098c67b7..8f82021a464 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -1,4 +1,5 @@ class Projects::NotesController < Projects::ApplicationController + include NotesHelper include ToggleAwardEmoji # Authorize @@ -12,7 +13,8 @@ class Projects::NotesController < Projects::ApplicationController notes_json = { notes: [], last_fetched_at: current_fetched_at } - @notes = notes_finder.execute.inc_author + @notes = notes_finder.execute.inc_relations_for_view + @notes = prepare_notes_for_rendering(@notes) @notes.each do |note| next if note.cross_reference_not_visible_for?(current_user) @@ -117,7 +119,7 @@ class Projects::NotesController < Projects::ApplicationController end def discussion_html(discussion) - return if discussion.render_as_individual_notes? + return if discussion.individual_note? render_to_string( "discussions/_discussion", @@ -153,21 +155,20 @@ class Projects::NotesController < Projects::ApplicationController def note_json(note) attrs = { - id: note.id + commands_changes: note.commands_changes } if note.persisted? - Banzai::NoteRenderer.render([note], @project, current_user) - attrs.merge!( valid: true, + id: note.id, discussion_id: note.discussion_id(noteable), html: note_html(note), note: note.note ) discussion = note.to_discussion(noteable) - unless discussion.render_as_individual_notes? + unless discussion.individual_note? attrs.merge!( discussion_resolvable: discussion.resolvable?, @@ -187,7 +188,6 @@ class Projects::NotesController < Projects::ApplicationController ) end - attrs[:commands_changes] = note.commands_changes attrs end |