Merge branch 'mr-improve-comments' into 'master'

Improve merge request comments

Fixes #1338

app/assets/javascripts/notes.js.coffee

@@ -142,6 +142,13 @@ class Notes
       # remove the note (will be added again below)
       row.next().find(".note").remove()
 
+      # Add note to 'Changes' page discussions
+      $(".notes[rel='" + note.discussion_id + "']").append note.html
+
+      # Init discussion on 'Discussion' page
+      $('ul.main-notes-list').append(note.discussion_with_diff_html)
+
+    else
       # append new note to all matching discussions
       $(".notes[rel='" + note.discussion_id + "']").append note.html
 

app/controllers/projects/notes_controller.rb

@@ -85,12 +85,22 @@ class Projects::NotesController < Projects::ApplicationController
     )
   end
 
+  def note_to_discussion_with_diff_html(note)
+    render_to_string(
+      "projects/notes/_discussion",
+      layout: false,
+      formats: [:html],
+      locals: { discussion_notes: [note] }
+    )
+  end
+
   def render_note_json(note)
     render json: {
       id: note.id,
       discussion_id: note.discussion_id,
       html: note_to_html(note),
-      discussion_html: note_to_discussion_html(note)
+      discussion_html: note_to_discussion_html(note),
+      discussion_with_diff_html: note_to_discussion_with_diff_html(note)
     }
   end