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
346e9904
Commit
346e9904
authored
Feb 10, 2021
by
Vitaly Slobodin
Committed by
Natalia Tepluhina
Feb 10, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix left margin of Merge button for rebase workflows in MrWidget
parent
0226a822
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
...rge_request_widget/components/states/mr_widget_rebase.vue
+6
-11
changelogs/unreleased/vs-fix-margin-for-rebase-based-workflows.yml
...s/unreleased/vs-fix-margin-for-rebase-based-workflows.yml
+5
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
View file @
346e9904
...
@@ -181,17 +181,12 @@ export default {
...
@@ -181,17 +181,12 @@ export default {
>
>
{{
__
(
'
Rebase
'
)
}}
{{
__
(
'
Rebase
'
)
}}
</gl-button>
</gl-button>
<span
<span
v-if=
"!rebasingError"
class=
"gl-font-weight-bold"
data-testid=
"rebase-message"
>
{{
v-if=
"!rebasingError"
__
(
class=
"gl-font-weight-bold gl-ml-0!"
'
Fast-forward merge is not possible. Rebase the source branch onto the target branch.
'
,
data-testid=
"rebase-message"
)
>
{{
}}
</span>
__
(
<span
v-else
class=
"gl-font-weight-bold danger"
data-testid=
"rebase-message"
>
{{
'
Fast-forward merge is not possible. Rebase the source branch onto the target branch.
'
,
)
}}
</span
>
<span
v-else
class=
"gl-font-weight-bold danger gl-ml-0!"
data-testid=
"rebase-message"
>
{{
rebasingError
rebasingError
}}
</span>
}}
</span>
</div>
</div>
...
...
changelogs/unreleased/vs-fix-margin-for-rebase-based-workflows.yml
0 → 100644
View file @
346e9904
---
title
:
Fix left margin of Merge button in FF merge mode
merge_request
:
53756
author
:
type
:
fixed
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