Add latest changes from gitlab-org/gitlab@master

3 files changed, 25 insertions, 26 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/state_container.vue b/app/assets/javascripts/vue_merge_request_widget/components/state_container.vue
index 9a3555d3e11..f7d6f7b4345 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/state_container.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/state_container.vue
@@ -76,17 +76,17 @@ export default {
         <div
           :class="{
             'gl-display-flex gl-align-items-center': actions.length,
-            'gl-md-display-flex gl-align-items-center': !actions.length,
+            'gl-md-display-flex gl-align-items-center gl-flex-wrap gl-gap-3': !actions.length,
           }"
-          class="media-body"
+          class="media-body gl-line-height-24"
         >
           <slot></slot>
           <div
             :class="{
-              'state-container-action-buttons gl-flex-direction-column gl-flex-wrap gl-justify-content-end': !actions.length,
+              'state-container-action-buttons gl-flex-wrap gl-lg-justify-content-end': !actions.length,
               'gl-md-pt-0 gl-pt-3': hasActionsSlot,
             }"
-            class="gl-display-flex gl-font-size-0 gl-ml-auto gl-gap-3"
+            class="gl-display-flex gl-font-size-0 gl-gap-3"
           >
             <slot name="actions">
               <actions v-if="actions.length" :tertiary-buttons="actions" />
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
index 8e1b18c63a4..a5d982fe221 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
@@ -88,25 +88,24 @@ export default {
     </template>
     <template v-if="!isLoading && !state.shouldBeRebased" #actions>
       <gl-button
-        v-if="userPermissions.canMerge"
+        v-if="showResolveButton"
+        :href="mr.conflictResolutionPath"
         size="small"
         variant="confirm"
-        category="secondary"
-        data-testid="merge-locally-button"
-        class="js-check-out-modal-trigger gl-align-self-start"
-        :class="{ 'gl-mr-2': showResolveButton }"
+        class="gl-align-self-start"
+        data-testid="resolve-conflicts-button"
       >
-        {{ s__('mrWidget|Resolve locally') }}
+        {{ s__('mrWidget|Resolve conflicts') }}
       </gl-button>
       <gl-button
-        v-if="showResolveButton"
-        :href="mr.conflictResolutionPath"
+        v-if="userPermissions.canMerge"
         size="small"
         variant="confirm"
-        class="gl-mb-2 gl-md-mb-0 gl-align-self-start"
-        data-testid="resolve-conflicts-button"
+        category="secondary"
+        data-testid="merge-locally-button"
+        class="js-check-out-modal-trigger gl-align-self-start"
       >
-        {{ s__('mrWidget|Resolve conflicts') }}
+        {{ s__('mrWidget|Resolve locally') }}
       </gl-button>
     </template>
   </state-container>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
index 4ae4edf02c3..d687f0346c7 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
@@ -179,27 +179,27 @@ export default {
     </template>
     <template v-if="!isLoading" #actions>
       <gl-button
-        v-if="showRebaseWithoutPipeline"
         :loading="isMakingRequest"
         variant="confirm"
         size="small"
-        category="secondary"
-        data-testid="rebase-without-ci-button"
-        class="gl-align-self-start gl-mr-2"
-        @click="rebaseWithoutCi"
+        data-qa-selector="mr_rebase_button"
+        data-testid="standard-rebase-button"
+        class="gl-align-self-start"
+        @click="rebase"
       >
-        {{ __('Rebase without pipeline') }}
+        {{ __('Rebase') }}
       </gl-button>
       <gl-button
+        v-if="showRebaseWithoutPipeline"
         :loading="isMakingRequest"
         variant="confirm"
         size="small"
-        data-qa-selector="mr_rebase_button"
-        data-testid="standard-rebase-button"
-        class="gl-mb-2 gl-md-mb-0 gl-align-self-start"
-        @click="rebase"
+        category="secondary"
+        data-testid="rebase-without-ci-button"
+        class="gl-align-self-start gl-mr-2"
+        @click="rebaseWithoutCi"
       >
-        {{ __('Rebase') }}
+        {{ __('Rebase without pipeline') }}
       </gl-button>
     </template>
   </state-container>