summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/notes/components/noteable_discussion.vue
diff options
context:
space:
mode:
authorHeinrich Lee Yu <heinrich@gitlab.com>2019-02-14 10:07:13 +0000
committerPhil Hughes <me@iamphill.com>2019-02-14 10:07:13 +0000
commitf60734d3cb15492310820e6571c69e2f68939d16 (patch)
treec80ee2ec4e90979d40fa17c4faaf8fd106eb7d0d /app/assets/javascripts/notes/components/noteable_discussion.vue
parent4b2ba1a70e72d3e53a696d7c8c0ca0cedf0f95a7 (diff)
downloadgitlab-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/noteable_discussion.vue')
-rw-r--r--app/assets/javascripts/notes/components/noteable_discussion.vue5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue
index b7e9f7c2028..ded084e9b10 100644
--- a/app/assets/javascripts/notes/components/noteable_discussion.vue
+++ b/app/assets/javascripts/notes/components/noteable_discussion.vue
@@ -93,6 +93,7 @@ export default {
},
computed: {
...mapGetters([
+ 'convertedDisscussionIds',
'getNoteableData',
'nextUnresolvedDiscussionId',
'unresolvedDiscussionsCount',
@@ -301,6 +302,10 @@ export default {
note: { note: noteText },
};
+ if (this.convertedDisscussionIds.includes(this.discussion.id)) {
+ postData.return_discussion = true;
+ }
+
if (this.discussion.for_commit) {
postData.note_project_id = this.discussion.project_id;
}