diff options
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/merge_requests/components/sticky_header.vue | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/pages/projects/merge_requests/page.js | 11 |
2 files changed, 12 insertions, 2 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 }" diff --git a/app/assets/javascripts/pages/projects/merge_requests/page.js b/app/assets/javascripts/pages/projects/merge_requests/page.js index a9d281fc899..69032455fe3 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/page.js +++ b/app/assets/javascripts/pages/projects/merge_requests/page.js @@ -28,7 +28,15 @@ requestIdleCallback(() => { if (el) { const { data } = el.dataset; - const { iid, projectPath, title, tabs, isFluidLayout, sourceProjectPath } = JSON.parse(data); + const { + iid, + projectPath, + title, + tabs, + isFluidLayout, + sourceProjectPath, + blocksMerge, + } = JSON.parse(data); // eslint-disable-next-line no-new new Vue({ @@ -42,6 +50,7 @@ requestIdleCallback(() => { title, tabs, isFluidLayout: parseBoolean(isFluidLayout), + blocksMerge: parseBoolean(blocksMerge), sourceProjectPath, }, render(h) { |