diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-21 17:56:23 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-21 17:56:23 +0000 |
| commit | 89292551295418cf4b5b90ce904a6b41f19a8be3 (patch) | |
| tree | 838aba8af56513d28760ae15516479a7eaf34e15 /app/assets/javascripts | |
| parent | 0606b92c8532a0268a919bd3d0c5a083bad5ecf9 (diff) | |
| parent | 79214be727aaa0704a1be5b50aa6dd3011629bc2 (diff) | |
| download | gitlab-ce-89292551295418cf4b5b90ce904a6b41f19a8be3.tar.gz | |
Merge branch 'discussion-model' into 'master'
Add Discussion model to represent MR/diff discussion
Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/10325.
See merge request !5376
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index 0ea54faae1a..d4de712f88c 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -162,7 +162,7 @@ class @Notes @last_fetched_at = data.last_fetched_at @setPollingInterval(data.notes.length) $.each notes, (i, note) => - if note.discussion_with_diff_html? + if note.discussion_html? @renderDiscussionNote(note) else @renderNote(note) @@ -251,7 +251,7 @@ class @Notes discussionContainer = $(".notes[data-discussion-id='" + note.original_discussion_id + "']") if discussionContainer.length is 0 # insert the note and the reply button after the temp row - row.after note.discussion_html + row.after note.diff_discussion_html # remove the note (will be added again below) row.next().find(".note").remove() @@ -265,7 +265,7 @@ class @Notes # Init discussion on 'Discussion' page if it is merge request page if $('body').attr('data-page').indexOf('projects:merge_request') is 0 $('ul.main-notes-list') - .append(note.discussion_with_diff_html) + .append(note.discussion_html) .syntaxHighlight() else # append new note to all matching discussions |