Merge branch 'vs-fix-margin-for-rebase-based-workflows' into 'master'

Fix left margin of Merge button for rebase workflows in MrWidget

See merge request gitlab-org/gitlab!53756

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue

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

changelogs/unreleased/vs-fix-margin-for-rebase-based-workflows.yml

+---
+title: Fix left margin of Merge button in FF merge mode
+merge_request: 53756
+author:
+type: fixed