Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

2 files changed, 23 insertions, 2 deletions

diff --git a/spec/frontend/design_management/mock_data/apollo_mock.js b/spec/frontend/design_management/mock_data/apollo_mock.js
index 5e41210221b..e53ad2e6afe 100644
--- a/spec/frontend/design_management/mock_data/apollo_mock.js
+++ b/spec/frontend/design_management/mock_data/apollo_mock.js
@@ -1,13 +1,18 @@
 export const designListQueryResponse = {
   data: {
     project: {
+      __typename: 'Project',
       id: '1',
       issue: {
+        __typename: 'Issue',
         designCollection: {
+          __typename: 'DesignCollection',
           copyState: 'READY',
           designs: {
+            __typename: 'DesignConnection',
             nodes: [
               {
+                __typename: 'Design',
                 id: '1',
                 event: 'NONE',
                 filename: 'fox_1.jpg',
@@ -15,10 +20,12 @@ export const designListQueryResponse = {
                 image: 'image-1',
                 imageV432x230: 'image-1',
                 currentUserTodos: {
+                  __typename: 'ToDo',
                   nodes: [],
                 },
               },
               {
+                __typename: 'Design',
                 id: '2',
                 event: 'NONE',
                 filename: 'fox_2.jpg',
@@ -26,10 +33,12 @@ export const designListQueryResponse = {
                 image: 'image-2',
                 imageV432x230: 'image-2',
                 currentUserTodos: {
+                  __typename: 'ToDo',
                   nodes: [],
                 },
               },
               {
+                __typename: 'Design',
                 id: '3',
                 event: 'NONE',
                 filename: 'fox_3.jpg',
@@ -37,12 +46,14 @@ export const designListQueryResponse = {
                 image: 'image-3',
                 imageV432x230: 'image-3',
                 currentUserTodos: {
+                  __typename: 'ToDo',
                   nodes: [],
                 },
               },
             ],
           },
           versions: {
+            __typename: 'DesignVersion',
             nodes: [],
           },
         },
@@ -82,9 +93,11 @@ export const designUploadMutationUpdatedResponse = {
 export const permissionsQueryResponse = {
   data: {
     project: {
+      __typename: 'Project',
       id: '1',
       issue: {
-        userPermissions: { createDesign: true },
+        __typename: 'Issue',
+        userPermissions: { __typename: 'UserPermissions', createDesign: true },
       },
     },
   },
@@ -92,6 +105,7 @@ export const permissionsQueryResponse = {
 
 export const reorderedDesigns = [
   {
+    __typename: 'Design',
     id: '2',
     event: 'NONE',
     filename: 'fox_2.jpg',
@@ -99,10 +113,12 @@ export const reorderedDesigns = [
     image: 'image-2',
     imageV432x230: 'image-2',
     currentUserTodos: {
+      __typename: 'ToDo',
       nodes: [],
     },
   },
   {
+    __typename: 'Design',
     id: '1',
     event: 'NONE',
     filename: 'fox_1.jpg',
@@ -110,10 +126,12 @@ export const reorderedDesigns = [
     image: 'image-1',
     imageV432x230: 'image-1',
     currentUserTodos: {
+      __typename: 'ToDo',
       nodes: [],
     },
   },
   {
+    __typename: 'Design',
     id: '3',
     event: 'NONE',
     filename: 'fox_3.jpg',
@@ -121,6 +139,7 @@ export const reorderedDesigns = [
     image: 'image-3',
     imageV432x230: 'image-3',
     currentUserTodos: {
+      __typename: 'ToDo',
       nodes: [],
     },
   },
@@ -130,7 +149,9 @@ export const moveDesignMutationResponse = {
   data: {
     designManagementMove: {
       designCollection: {
+        __typename: 'DesignCollection',
         designs: {
+          __typename: 'DesignConnection',
           nodes: [...reorderedDesigns],
         },
       },
diff --git a/spec/frontend/design_management/mock_data/discussion.js b/spec/frontend/design_management/mock_data/discussion.js
index fbf9a2fdcc1..0e59ef29f8f 100644
--- a/spec/frontend/design_management/mock_data/discussion.js
+++ b/spec/frontend/design_management/mock_data/discussion.js
@@ -18,7 +18,7 @@ export default {
       },
       createdAt: '2020-05-08T07:10:45Z',
       userPermissions: {
-        adminNote: true,
+        repositionNote: true,
       },
       resolved: false,
     },