diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-10-30 12:26:36 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-10-30 12:26:36 +0000 |
| commit | 5c6f55bae6221095657c2cf0cf6f028cdee412ac (patch) | |
| tree | 2add0fe11ea218d63ec3912ae61b0add138027bf | |
| parent | b7e318f9178ad00e412c8c0c11c7ec2d1235a8fa (diff) | |
| parent | 605e7fddc8f399e6d4cc8ceecb60d9c818b25a7f (diff) | |
| download | gitlab-ce-5c6f55bae6221095657c2cf0cf6f028cdee412ac.tar.gz | |
Merge branch 'mr-diff-discussion-deletion' into 'master'
Fixes diff discussions not being fully removed
Closes #53317
See merge request gitlab-org/gitlab-ce!22680
| -rw-r--r-- | app/assets/javascripts/diffs/components/app.vue | 10 | ||||
| -rw-r--r-- | app/assets/javascripts/diffs/store/mutations.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/diffs/store/mutations_spec.js | 1 |
3 files changed, 5 insertions, 8 deletions
diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue index a8d615dd8f0..59680959bb1 100644 --- a/app/assets/javascripts/diffs/components/app.vue +++ b/app/assets/javascripts/diffs/components/app.vue @@ -153,13 +153,9 @@ export default { }, setDiscussions() { if (this.isNotesFetched && !this.assignedDiscussions && !this.isLoading) { - requestIdleCallback( - () => - this.assignDiscussionsToDiff().then(() => { - this.assignedDiscussions = true; - }), - { timeout: 1000 }, - ); + this.assignedDiscussions = true; + + requestIdleCallback(() => this.assignDiscussionsToDiff(), { timeout: 1000 }); } }, adjustView() { diff --git a/app/assets/javascripts/diffs/store/mutations.js b/app/assets/javascripts/diffs/store/mutations.js index 5a8aebd2086..38a65f111a2 100644 --- a/app/assets/javascripts/diffs/store/mutations.js +++ b/app/assets/javascripts/diffs/store/mutations.js @@ -133,7 +133,7 @@ export default { }, right: { ...line.right, - discussions: right ? line.right.discussions.concat(discussion) : [], + discussions: right && !left ? line.right.discussions.concat(discussion) : [], }, }; } diff --git a/spec/javascripts/diffs/store/mutations_spec.js b/spec/javascripts/diffs/store/mutations_spec.js index 4b6d3d5bcba..fed04cbaed8 100644 --- a/spec/javascripts/diffs/store/mutations_spec.js +++ b/spec/javascripts/diffs/store/mutations_spec.js @@ -221,6 +221,7 @@ describe('DiffsStoreMutations', () => { expect(state.diffFiles[0].parallelDiffLines[0].left.discussions.length).toEqual(1); expect(state.diffFiles[0].parallelDiffLines[0].left.discussions[0].id).toEqual(1); + expect(state.diffFiles[0].parallelDiffLines[0].right.discussions).toEqual([]); expect(state.diffFiles[0].highlightedDiffLines[0].discussions.length).toEqual(1); expect(state.diffFiles[0].highlightedDiffLines[0].discussions[0].id).toEqual(1); |