diff options
| author | Phil Hughes <me@iamphill.com> | 2019-03-07 08:39:26 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-03-07 08:39:26 +0000 |
| commit | 08622a6e95bacb72e734a4ccce51eed7626ca9f3 (patch) | |
| tree | 6148d1858edfeea6df6724aaa9045b74efcb787e /app/assets | |
| parent | 1557289ce3e7e6d3fec6055333587d268974f913 (diff) | |
| parent | d72a61b41d1aaf6b0ed9041b32fa411e8907d4f8 (diff) | |
| download | gitlab-ce-08622a6e95bacb72e734a4ccce51eed7626ca9f3.tar.gz | |
Merge branch '30299-transform-notes-from-polling-response' into 'master'
Handle transformed notes from polling response
See merge request gitlab-org/gitlab-ce!25792
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/notes/stores/mutations.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes/stores/mutations.js b/app/assets/javascripts/notes/stores/mutations.js index ae6f8b7790a..fa44ef2d057 100644 --- a/app/assets/javascripts/notes/stores/mutations.js +++ b/app/assets/javascripts/notes/stores/mutations.js @@ -193,6 +193,10 @@ export default { const noteObj = utils.findNoteObjectById(state.discussions, note.discussion_id); if (noteObj.individual_note) { + if (note.type === constants.DISCUSSION_NOTE) { + noteObj.individual_note = false; + } + noteObj.notes.splice(0, 1, note); } else { const comment = utils.findNoteObjectById(noteObj.notes, note.id); |