Commit 717304f1 authored by Simon Knox's avatar Simon Knox

Merge branch 'remove-scroll-merge-instruction' into 'master'

Remove gl-overflow-scroll in merge instructions modal

See merge request gitlab-org/gitlab!54144
parents cf5890e0 4b84df30
...@@ -108,9 +108,7 @@ export default { ...@@ -108,9 +108,7 @@ export default {
{{ $options.i18n.steps.step1.help }} {{ $options.i18n.steps.step1.help }}
</p> </p>
<div class="gl-display-flex"> <div class="gl-display-flex">
<pre class="gl-overflow-scroll gl-w-full" data-testid="how-to-merge-instructions">{{ <pre class="gl-w-full" data-testid="how-to-merge-instructions">{{ mergeInfo1 }}</pre>
mergeInfo1
}}</pre>
<clipboard-button <clipboard-button
:text="mergeInfo1" :text="mergeInfo1"
:title="$options.i18n.copyCommands" :title="$options.i18n.copyCommands"
...@@ -131,9 +129,7 @@ export default { ...@@ -131,9 +129,7 @@ export default {
{{ $options.i18n.steps.step3.help }} {{ $options.i18n.steps.step3.help }}
</p> </p>
<div class="gl-display-flex"> <div class="gl-display-flex">
<pre class="gl-overflow-scroll gl-w-full" data-testid="how-to-merge-instructions">{{ <pre class="gl-w-full" data-testid="how-to-merge-instructions">{{ mergeInfo2 }}</pre>
mergeInfo2
}}</pre>
<clipboard-button <clipboard-button
:text="mergeInfo2" :text="mergeInfo2"
:title="$options.i18n.copyCommands" :title="$options.i18n.copyCommands"
...@@ -147,9 +143,7 @@ export default { ...@@ -147,9 +143,7 @@ export default {
{{ $options.i18n.steps.step4.help }} {{ $options.i18n.steps.step4.help }}
</p> </p>
<div class="gl-display-flex"> <div class="gl-display-flex">
<pre class="gl-overflow-scroll gl-w-full" data-testid="how-to-merge-instructions">{{ <pre class="gl-w-full" data-testid="how-to-merge-instructions">{{ mergeInfo3 }}</pre>
mergeInfo3
}}</pre>
<clipboard-button <clipboard-button
:text="mergeInfo3" :text="mergeInfo3"
:title="$options.i18n.copyCommands" :title="$options.i18n.copyCommands"
......
---
title: Remove gl-overflow-scroll in merge instructions modal
merge_request: 54144
author: Yogi (@yo)
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment