Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/merge_requests/components/sticky_header.vue')
-rw-r--r--app/assets/javascripts/merge_requests/components/sticky_header.vue3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_requests/components/sticky_header.vue b/app/assets/javascripts/merge_requests/components/sticky_header.vue
index 877e6142bae..e405a534cdc 100644
--- a/app/assets/javascripts/merge_requests/components/sticky_header.vue
+++ b/app/assets/javascripts/merge_requests/components/sticky_header.vue
@@ -70,6 +70,7 @@ export default {
title: { default: '' },
tabs: { default: () => [] },
isFluidLayout: { default: false },
+ blocksMerge: { default: false },
},
data() {
return {
@@ -226,7 +227,7 @@ export default {
</li>
</ul>
<div class="gl-display-none gl-lg-display-flex gl-align-items-center gl-ml-auto">
- <discussion-counter blocks-merge hide-options />
+ <discussion-counter :blocks-merge="blocksMerge" hide-options />
<div
v-if="isSignedIn"
:class="{ 'gl-display-flex gl-gap-3': isNotificationsTodosButtons }"