Add latest changes from gitlab-org/gitlab@master

1 files changed, 18 insertions, 3 deletions

diff --git a/app/assets/javascripts/vue_shared/components/code_block.vue b/app/assets/javascripts/vue_shared/components/code_block.vue
index 3cca7a86bef..1928bf6dac5 100644
--- a/app/assets/javascripts/vue_shared/components/code_block.vue
+++ b/app/assets/javascripts/vue_shared/components/code_block.vue
@@ -6,11 +6,26 @@ export default {
       type: String,
       required: true,
     },
+    maxHeight: {
+      type: String,
+      required: false,
+      default: 'initial',
+    },
+  },
+  computed: {
+    styleObject() {
+      const { maxHeight } = this;
+      const isScrollable = maxHeight !== 'initial';
+      const scrollableStyles = {
+        maxHeight,
+        overflowY: 'auto',
+      };
+
+      return isScrollable ? scrollableStyles : null;
+    },
   },
 };
 </script>
 <template>
-  <pre class="code-block rounded">
-    <code class="d-block">{{ code }}</code>
-  </pre>
+  <pre class="code-block rounded" :style="styleObject"><code class="d-block">{{ code }}</code></pre>
 </template>