Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 6 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 bc1f15be6a5..5c390c675fa 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
@@ -45,6 +45,9 @@ export default {
       if (this.status === 'closed') return 'gl-bg-red-50';
       return null;
     },
+    hasActionsSlot() {
+      return this.$scopedSlots.actions?.()?.length;
+    },
   },
 };
 </script>
@@ -72,15 +75,18 @@ export default {
       <div class="gl-display-flex gl-w-full">
         <div
           :class="{
-            'gl-display-flex': actions.length,
+            'gl-display-flex gl-align-items-center': actions.length,
             'gl-md-display-flex gl-align-items-center': !actions.length,
           }"
           class="media-body"
         >
           <slot></slot>
           <div
-            :class="{ 'gl-flex-direction-column-reverse': !actions.length }"
-            class="gl-display-flex gl-md-display-block gl-font-size-0 gl-ml-auto"
+            :class="{
+              'gl-flex-direction-column-reverse gl-md-flex-direction-row gl-flex-wrap gl-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"
           >
             <slot name="actions">
               <actions v-if="actions.length" :tertiary-buttons="actions" />
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
index 8f2e4eb2131..5bc5dd886ff 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
@@ -26,7 +26,7 @@ export default {
 <template>
   <state-container :mr="mr" status="failed">
     <span
-      class="gl-ml-3 gl-font-weight-bold gl-w-100 gl-flex-grow-1 gl-md-mr-3 gl-ml-0! gl-text-body!"
+      class="gl-ml-3 gl-font-weight-bold gl-w-100 gl-flex-grow-1 gl-md-mr-3 gl-ml-0! gl-text-body! gl-align-self-start"
     >
       {{ s__('mrWidget|Merge blocked: all threads must be resolved.') }}
     </span>
@@ -34,7 +34,7 @@ export default {
       <gl-button
         v-if="mr.createIssueToResolveDiscussionsPath"
         :href="mr.createIssueToResolveDiscussionsPath"
-        class="js-create-issue gl-align-self-start gl-vertical-align-top gl-mr-2"
+        class="js-create-issue gl-align-self-start gl-vertical-align-top"
         size="small"
         variant="confirm"
         category="secondary"
@@ -43,7 +43,7 @@ export default {
       </gl-button>
       <gl-button
         data-testid="jump-to-first"
-        class="gl-mb-2 gl-md-mb-0 gl-align-self-start gl-vertical-align-top"
+        class="gl-align-self-start gl-vertical-align-top"
         size="small"
         variant="confirm"
         category="primary"