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 { ...@@ -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>
......
---
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