3 files changed, 14 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_requests/components/compare_app.vue b/app/assets/javascripts/merge_requests/components/compare_app.vue
index 538aa090aa8..a753641ffd2 100644
--- a/app/assets/javascripts/merge_requests/components/compare_app.vue
+++ b/app/assets/javascripts/merge_requests/components/compare_app.vue
@@ -42,6 +42,11 @@ export default {
       required: false,
       default: () => ({}),
     },
+    disabled: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {
@@ -120,6 +125,7 @@ export default {
           :default="currentBranch"
           :toggle-class="toggleClass.branch"
           :data-qa-compare-side="compareSide"
+          :disabled="disabled"
           data-testid="compare-dropdown"
           @selected="selectBranch"
         />
diff --git a/app/assets/javascripts/merge_requests/components/compare_dropdown.vue b/app/assets/javascripts/merge_requests/components/compare_dropdown.vue
index 20989206a51..35fbf4bc4e6 100644
--- a/app/assets/javascripts/merge_requests/components/compare_dropdown.vue
+++ b/app/assets/javascripts/merge_requests/components/compare_dropdown.vue
@@ -46,6 +46,11 @@ export default {
       required: false,
       default: '',
     },
+    disabled: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {
@@ -131,6 +136,7 @@ export default {
       :toggle-text="current.text || dropdownHeader"
       :header-text="dropdownHeader"
       :searching="isLoading"
+      :disabled="disabled"
       searchable
       class="gl-w-full dropdown-target-project"
       :toggle-class="[
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 }"