Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4b84df30
Commit
4b84df30
authored
Feb 23, 2021
by
Yogi
Committed by
Simon Knox
Feb 23, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove gl-overflow-scroll in merge instructions modal
parent
bcf29d30
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
9 deletions
+8
-9
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue
...equest_widget/components/mr_widget_how_to_merge_modal.vue
+3
-9
changelogs/unreleased/remove-scroll-merge-instruction.yml
changelogs/unreleased/remove-scroll-merge-instruction.yml
+5
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue
View file @
4b84df30
...
...
@@ -108,9 +108,7 @@ export default {
{{
$options
.
i18n
.
steps
.
step1
.
help
}}
</p>
<div
class=
"gl-display-flex"
>
<pre
class=
"gl-overflow-scroll gl-w-full"
data-testid=
"how-to-merge-instructions"
>
{{
mergeInfo1
}}
</pre>
<pre
class=
"gl-w-full"
data-testid=
"how-to-merge-instructions"
>
{{
mergeInfo1
}}
</pre>
<clipboard-button
:text=
"mergeInfo1"
:title=
"$options.i18n.copyCommands"
...
...
@@ -131,9 +129,7 @@ export default {
{{
$options
.
i18n
.
steps
.
step3
.
help
}}
</p>
<div
class=
"gl-display-flex"
>
<pre
class=
"gl-overflow-scroll gl-w-full"
data-testid=
"how-to-merge-instructions"
>
{{
mergeInfo2
}}
</pre>
<pre
class=
"gl-w-full"
data-testid=
"how-to-merge-instructions"
>
{{
mergeInfo2
}}
</pre>
<clipboard-button
:text=
"mergeInfo2"
:title=
"$options.i18n.copyCommands"
...
...
@@ -147,9 +143,7 @@ export default {
{{
$options
.
i18n
.
steps
.
step4
.
help
}}
</p>
<div
class=
"gl-display-flex"
>
<pre
class=
"gl-overflow-scroll gl-w-full"
data-testid=
"how-to-merge-instructions"
>
{{
mergeInfo3
}}
</pre>
<pre
class=
"gl-w-full"
data-testid=
"how-to-merge-instructions"
>
{{
mergeInfo3
}}
</pre>
<clipboard-button
:text=
"mergeInfo3"
:title=
"$options.i18n.copyCommands"
...
...
changelogs/unreleased/remove-scroll-merge-instruction.yml
0 → 100644
View file @
4b84df30
---
title
:
Remove gl-overflow-scroll in merge instructions modal
merge_request
:
54144
author
:
Yogi (@yo)
type
:
changed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment