Commit 346e9904 authored by Vitaly Slobodin's avatar Vitaly Slobodin Committed by Natalia Tepluhina

Fix left margin of Merge button for rebase workflows in MrWidget

parent 0226a822
......@@ -181,17 +181,12 @@ export default {
>
{{ __('Rebase') }}
</gl-button>
<span
v-if="!rebasingError"
class="gl-font-weight-bold gl-ml-0!"
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">{{
<span v-if="!rebasingError" class="gl-font-weight-bold" 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" data-testid="rebase-message">{{
rebasingError
}}</span>
</div>
......
---
title: Fix left margin of Merge button in FF merge mode
merge_request: 53756
author:
type: fixed
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