diff options
| author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-02-14 10:07:13 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-02-14 10:07:13 +0000 |
| commit | f60734d3cb15492310820e6571c69e2f68939d16 (patch) | |
| tree | c80ee2ec4e90979d40fa17c4faaf8fd106eb7d0d /app/assets/javascripts/notes/components/notes_app.vue | |
| parent | 4b2ba1a70e72d3e53a696d7c8c0ca0cedf0f95a7 (diff) | |
| download | gitlab-ce-f60734d3cb15492310820e6571c69e2f68939d16.tar.gz | |
Fix polling for replies to individual notes
Sets `updated_at` so that the transformed note is returned together with
the new reply
Diffstat (limited to 'app/assets/javascripts/notes/components/notes_app.vue')
| -rw-r--r-- | app/assets/javascripts/notes/components/notes_app.vue | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/notes_app.vue b/app/assets/javascripts/notes/components/notes_app.vue index 6d72b72e628..9eb69dd91ae 100644 --- a/app/assets/javascripts/notes/components/notes_app.vue +++ b/app/assets/javascripts/notes/components/notes_app.vue @@ -60,6 +60,7 @@ export default { ...mapGetters([ 'isNotesFetched', 'discussions', + 'convertedDisscussionIds', 'getNotesDataByProp', 'isLoading', 'commentsDisabled', @@ -193,7 +194,9 @@ export default { /> <placeholder-note v-else :key="discussion.id" :note="discussion.notes[0]" /> </template> - <template v-else-if="discussion.individual_note"> + <template + v-else-if="discussion.individual_note && !convertedDisscussionIds.includes(discussion.id)" + > <system-note v-if="discussion.notes[0].system" :key="discussion.id" |