Add latest changes from gitlab-org/gitlab@master

4 files changed, 29 insertions, 34 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/extensions/container.js b/app/assets/javascripts/vue_merge_request_widget/components/extensions/container.js
index 5fbad124acb..cc7b9d0ea72 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/extensions/container.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/extensions/container.js
@@ -20,26 +20,28 @@ export default {
         },
       },
       [
-        h(
-          'ul',
-          {
-            class: 'gl-p-0 gl-m-0 gl-list-style-none',
-          },
-          [
-            ...extensions.map((extension, index) =>
-              h('li', { attrs: { class: index > 0 && 'mr-widget-border-top' } }, [
-                h(
-                  { ...extension },
-                  {
-                    props: {
-                      mr: this.mr,
+        h('div', { attrs: { class: 'mr-widget-section' } }, [
+          h(
+            'ul',
+            {
+              class: 'gl-p-0 gl-m-0 gl-list-style-none',
+            },
+            [
+              ...extensions.map((extension, index) =>
+                h('li', { attrs: { class: index > 0 && 'mr-widget-border-top' } }, [
+                  h(
+                    { ...extension },
+                    {
+                      props: {
+                        mr: this.mr,
+                      },
                     },
-                  },
-                ),
-              ]),
-            ),
-          ],
-        ),
+                  ),
+                ]),
+              ),
+            ],
+          ),
+        ]),
       ],
     );
   },
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_container.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_container.vue
index 5967ca026e5..4445448fcd7 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_container.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_container.vue
@@ -1,6 +1,8 @@
 <template>
-  <div class="mr-widget-heading">
-    <div class="mr-widget-content"><slot name="default"></slot></div>
-    <slot name="footer"></slot>
+  <div class="mr-section-container mr-widget-workflow">
+    <div class="mr-widget-section">
+      <div class="mr-widget-content"><slot name="default"></slot></div>
+      <slot name="footer"></slot>
+    </div>
   </div>
 </template>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
index dd52dc1ca55..f7b8f0e2c1c 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
@@ -521,7 +521,7 @@ export default {
 <template>
   <div
     data-testid="ready_to_merge_state"
-    class="gl-border-t-1 gl-border-t-solid gl-border-gray-100 gl-bg-gray-10 gl-pl-7 gl-rounded-bottom-left-base gl-rounded-bottom-right-base"
+    class="gl-border-t-1 gl-border-t-solid gl-border-gray-100 gl-bg-gray-10 gl-pl-7"
   >
     <div v-if="loading" class="mr-widget-body">
       <div class="gl-w-full mr-ready-to-merge-loader">
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
index 9b64ba3f191..5ce2b8dbbe9 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
@@ -550,17 +550,8 @@ export default {
       :user-callout-feature-id="mr.suggestPipelineFeatureId"
       @dismiss="dismissSuggestPipelines"
     />
-    <mr-widget-pipeline-container
-      v-if="shouldRenderPipelines"
-      class="mr-widget-workflow"
-      :mr="mr"
-    />
-    <mr-widget-approvals
-      v-if="shouldRenderApprovals"
-      class="mr-widget-workflow"
-      :mr="mr"
-      :service="service"
-    />
+    <mr-widget-pipeline-container v-if="shouldRenderPipelines" :mr="mr" />
+    <mr-widget-approvals v-if="shouldRenderApprovals" :mr="mr" :service="service" />
     <report-widget-container>
       <extensions-container v-if="hasExtensions" :mr="mr" />
       <security-reports-app