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
63e76cde
Commit
63e76cde
authored
Feb 19, 2021
by
Yogi
Committed by
Enrique Alcántara
Feb 19, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Align merge conflict warning text to center in MR widget
parent
bcf29d30
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
..._request_widget/components/states/mr_widget_conflicts.vue
+1
-1
changelogs/unreleased/align-mr-conflict-center.yml
changelogs/unreleased/align-mr-conflict-center.yml
+5
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
View file @
63e76cde
...
@@ -162,7 +162,7 @@ export default {
...
@@ -162,7 +162,7 @@ export default {
<rect
x=
"250"
y=
"7"
width=
"84"
height=
"16"
rx=
"4"
/>
<rect
x=
"250"
y=
"7"
width=
"84"
height=
"16"
rx=
"4"
/>
</gl-skeleton-loader>
</gl-skeleton-loader>
</div>
</div>
<div
v-else
class=
"media-body space-children"
>
<div
v-else
class=
"media-body space-children
gl-display-flex gl-align-items-center
"
>
<span
v-if=
"shouldBeRebased"
class=
"bold"
>
<span
v-if=
"shouldBeRebased"
class=
"bold"
>
{{
{{
s__
(
`mrWidget|Fast-forward merge is not possible.
s__
(
`mrWidget|Fast-forward merge is not possible.
...
...
changelogs/unreleased/align-mr-conflict-center.yml
0 → 100644
View file @
63e76cde
---
title
:
Align merge conflict warning text to center
merge_request
:
54145
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