Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 7 insertions, 1 deletions

diff --git a/app/assets/javascripts/mr_notes/index.js b/app/assets/javascripts/mr_notes/index.js
index a1377415efe..7424c011052 100644
--- a/app/assets/javascripts/mr_notes/index.js
+++ b/app/assets/javascripts/mr_notes/index.js
@@ -31,6 +31,8 @@ export default function initMrNotes() {
     const el = document.getElementById('js-vue-discussion-counter');
 
     if (el) {
+      const { blocksMerge } = el.dataset;
+
       // eslint-disable-next-line no-new
       new Vue({
         el,
@@ -40,7 +42,11 @@ export default function initMrNotes() {
         },
         store,
         render(createElement) {
-          return createElement('discussion-counter');
+          return createElement('discussion-counter', {
+            props: {
+              blocksMerge: blocksMerge === 'true',
+            },
+          });
         },
       });
     }