Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 7 deletions

diff --git a/spec/frontend/design_management/components/list/__snapshots__/item_spec.js.snap b/spec/frontend/design_management/components/list/__snapshots__/item_spec.js.snap
index 9451f35ac5b..0bbb44bb517 100644
--- a/spec/frontend/design_management/components/list/__snapshots__/item_spec.js.snap
+++ b/spec/frontend/design_management/components/list/__snapshots__/item_spec.js.snap
@@ -11,13 +11,13 @@ exports[`Design management list item component when item appears in view after i
 exports[`Design management list item component with notes renders item with multiple comments 1`] = `
 <router-link-stub
   ariacurrentvalue="page"
-  class="card gl-cursor-pointer text-plain js-design-list-item design-list-item design-list-item-new gl-mb-0"
+  class="card gl-cursor-pointer text-plain js-design-list-item design-list-item gl-mb-0"
   event="click"
   tag="a"
   to="[object Object]"
 >
   <div
-    class="card-body gl-p-0 gl-display-flex gl-align-items-center gl-justify-content-center gl-overflow-hidden gl-relative"
+    class="card-body gl-p-0 gl-display-flex gl-align-items-center gl-justify-content-center gl-overflow-hidden gl-relative gl-rounded-top-base"
   >
     <!---->
      
@@ -91,13 +91,13 @@ exports[`Design management list item component with notes renders item with mult
 exports[`Design management list item component with notes renders item with single comment 1`] = `
 <router-link-stub
   ariacurrentvalue="page"
-  class="card gl-cursor-pointer text-plain js-design-list-item design-list-item design-list-item-new gl-mb-0"
+  class="card gl-cursor-pointer text-plain js-design-list-item design-list-item gl-mb-0"
   event="click"
   tag="a"
   to="[object Object]"
 >
   <div
-    class="card-body gl-p-0 gl-display-flex gl-align-items-center gl-justify-content-center gl-overflow-hidden gl-relative"
+    class="card-body gl-p-0 gl-display-flex gl-align-items-center gl-justify-content-center gl-overflow-hidden gl-relative gl-rounded-top-base"
   >
     <!---->
      
diff --git a/spec/frontend/design_management/pages/index_spec.js b/spec/frontend/design_management/pages/index_spec.js
index 90caf956126..961ea27f0f4 100644
--- a/spec/frontend/design_management/pages/index_spec.js
+++ b/spec/frontend/design_management/pages/index_spec.js
@@ -227,7 +227,6 @@ describe('Design management index page', () => {
     it('has correct classes applied to design dropzone', () => {
       createComponent({ designs: mockDesigns, allVersions: [mockVersion] });
       expect(dropzoneClasses()).toContain('design-list-item');
-      expect(dropzoneClasses()).toContain('design-list-item-new');
     });
 
     it('has correct classes applied to dropzone wrapper', () => {
@@ -253,7 +252,6 @@ describe('Design management index page', () => {
 
     it('has correct classes applied to design dropzone', () => {
       expect(dropzoneClasses()).not.toContain('design-list-item');
-      expect(dropzoneClasses()).not.toContain('design-list-item-new');
     });
 
     it('has correct classes applied to dropzone wrapper', () => {
@@ -355,7 +353,6 @@ describe('Design management index page', () => {
       expect(wrapper.vm.filesToBeSaved).toEqual([{ name: 'test' }]);
       expect(wrapper.vm.isSaving).toBe(true);
       expect(dropzoneClasses()).toContain('design-list-item');
-      expect(dropzoneClasses()).toContain('design-list-item-new');
     });
 
     it('sets isSaving', async () => {