diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-05 18:08:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-05 18:08:39 +0300 |
| commit | 5db6a7a014eb5cac640767687819c2784b24187a (patch) | |
| tree | 437b944acf93e1fc293ced48ea9f59e9515db075 /app/assets/javascripts/merge_requests | |
| parent | b90cf01a88df981f452a7f6b6d74e8fd0ccbf90b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/merge_requests')
| -rw-r--r-- | app/assets/javascripts/merge_requests/components/sticky_header.vue | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/assets/javascripts/merge_requests/components/sticky_header.vue b/app/assets/javascripts/merge_requests/components/sticky_header.vue index 4a675cf7563..30deb11b0b6 100644 --- a/app/assets/javascripts/merge_requests/components/sticky_header.vue +++ b/app/assets/javascripts/merge_requests/components/sticky_header.vue @@ -56,11 +56,7 @@ export default { }, watch: { discussionTabCounter(val) { - if (this.glFeatures.paginatedMrDiscussions) { - if (this.doneFetchingBatchDiscussions) { - this.discussionCounter = val; - } - } else { + if (this.doneFetchingBatchDiscussions) { this.discussionCounter = val; } }, |