diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-07-09 08:39:32 +0000 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-07-09 14:22:16 +0200 |
| commit | aad7eeb5e37ab2a3fb894b9f5cc325929e1ad023 (patch) | |
| tree | 7bf4fdcc1574e420ded2a57bdb0aece1c1f94274 /app/assets/javascripts/diffs/components | |
| parent | 1a61ec2049c86c278e54872f8fe70edc4fd8b34d (diff) | |
| download | gitlab-ce-aad7eeb5e37ab2a3fb894b9f5cc325929e1ad023.tar.gz | |
Merge branch '48906-adding-a-diff-line-note-freezes-the-browser' into 'master'
Resolve "Adding a diff line note freezes the browser"
Closes #48906
See merge request gitlab-org/gitlab-ce!20476
Diffstat (limited to 'app/assets/javascripts/diffs/components')
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_line_note_form.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_line_note_form.vue b/app/assets/javascripts/diffs/components/diff_line_note_form.vue index 6943b462e86..f48cf80153f 100644 --- a/app/assets/javascripts/diffs/components/diff_line_note_form.vue +++ b/app/assets/javascripts/diffs/components/diff_line_note_form.vue @@ -59,7 +59,7 @@ export default { } }, methods: { - ...mapActions(['cancelCommentForm', 'saveNote', 'fetchDiscussions']), + ...mapActions(['cancelCommentForm', 'saveNote', 'refetchDiscussionById']), handleCancelCommentForm() { this.autosave.reset(); this.cancelCommentForm({ @@ -78,10 +78,10 @@ export default { }); this.saveNote(postData) - .then(() => { + .then(result => { const endpoint = this.getNotesDataByProp('discussionsPath'); - this.fetchDiscussions(endpoint) + this.refetchDiscussionById({ path: endpoint, discussionId: result.discussion_id }) .then(() => { this.handleCancelCommentForm(); }) |