diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 11:17:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 11:17:02 +0300 |
| commit | b39512ed755239198a9c294b6a45e65c05900235 (patch) | |
| tree | d234a3efade1de67c46b9e5a38ce813627726aa7 /app/assets/javascripts/mr_notes | |
| parent | d31474cf3b17ece37939d20082b07f6657cc79a9 (diff) | |
Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42
Diffstat (limited to 'app/assets/javascripts/mr_notes')
| -rw-r--r-- | app/assets/javascripts/mr_notes/init_notes.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/mr_notes/init_notes.js b/app/assets/javascripts/mr_notes/init_notes.js index d85fd10be45..cf24d18c7b6 100644 --- a/app/assets/javascripts/mr_notes/init_notes.js +++ b/app/assets/javascripts/mr_notes/init_notes.js @@ -44,7 +44,13 @@ export default () => { }, watch: { discussionTabCounter() { - this.updateDiscussionTabCounter(); + if (window.gon?.features?.paginatedMrDiscussions) { + if (this.$store.state.notes.doneFetchingBatchDiscussions) { + this.updateDiscussionTabCounter(); + } + } else { + this.updateDiscussionTabCounter(); + } }, isShowTabActive: { handler(newVal) { |