Merge branch 'align-mr-conflict-center' into 'master'

Align merge conflict warning text to center in MR widget

See merge request gitlab-org/gitlab!54145

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

@@ -162,7 +162,7 @@ export default {
         <rect x="250" y="7" width="84" height="16" rx="4" />
       </gl-skeleton-loader>
     </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">
         {{
           s__(`mrWidget|Fast-forward merge is not possible.

changelogs/unreleased/align-mr-conflict-center.yml

+---
+title: Align merge conflict warning text to center
+merge_request: 54145
+author: Yogi (@yo)
+type: changed