diff options
Diffstat (limited to 'app/assets/javascripts/diffs/components/app.vue')
-rw-r--r-- | app/assets/javascripts/diffs/components/app.vue | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue index c3436159cea..530f3a3a7f7 100644 --- a/app/assets/javascripts/diffs/components/app.vue +++ b/app/assets/javascripts/diffs/components/app.vue @@ -384,14 +384,26 @@ export default { this.unwatchDiscussions = this.$watch( () => `${this.diffFiles.length}:${this.$store.state.notes.discussions.length}`, - () => this.setDiscussions(), + () => { + this.setDiscussions(); + + if ( + this.$store.state.notes.doneFetchingBatchDiscussions && + window.gon?.features?.paginatedMrDiscussions + ) { + this.unwatchDiscussions(); + } + }, ); this.unwatchRetrievingBatches = this.$watch( () => `${this.retrievingBatches}:${this.$store.state.notes.discussions.length}`, () => { if (!this.retrievingBatches && this.$store.state.notes.discussions.length) { - this.unwatchDiscussions(); + if (!window.gon?.features?.paginatedMrDiscussions) { + this.unwatchDiscussions(); + } + this.unwatchRetrievingBatches(); } }, |