diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/assets/javascripts/merge_requests/components | |
parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/assets/javascripts/merge_requests/components')
-rw-r--r-- | app/assets/javascripts/merge_requests/components/sticky_header.vue | 8 |
1 files changed, 2 insertions, 6 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..6af1baaa37e 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; } }, @@ -86,8 +82,8 @@ export default { @disappear="setStickyHeaderVisible(true)" > <div - v-if="isStickyHeaderVisible" class="issue-sticky-header merge-request-sticky-header gl-fixed gl-bg-white gl-border-1 gl-border-b-solid gl-border-b-gray-100 gl-pt-3 gl-display-none gl-md-display-block" + :class="{ 'gl-visibility-hidden': !isStickyHeaderVisible }" > <div class="issue-sticky-header-text gl-display-flex gl-flex-direction-column gl-align-items-center gl-mx-auto gl-px-5" |