Add latest changes from gitlab-org/gitlab@master

5 files changed, 6 insertions, 37 deletions

diff --git a/app/assets/javascripts/design_management/components/design_destroyer.vue b/app/assets/javascripts/design_management/components/design_destroyer.vue
index 5d32bfd4a73..a231f6c5e3b 100644
--- a/app/assets/javascripts/design_management/components/design_destroyer.vue
+++ b/app/assets/javascripts/design_management/components/design_destroyer.vue
@@ -32,12 +32,7 @@ export default {
     },
   },
   methods: {
-    updateStoreAfterDelete(
-      store,
-      {
-        data: { designManagementDelete },
-      },
-    ) {
+    updateStoreAfterDelete(store, { data: { designManagementDelete } }) {
       updateStoreAfterDesignsDelete(
         store,
         designManagementDelete,
diff --git a/app/assets/javascripts/design_management/components/design_todo_button.vue b/app/assets/javascripts/design_management/components/design_todo_button.vue
index aff4f348d15..96c417561ac 100644
--- a/app/assets/javascripts/design_management/components/design_todo_button.vue
+++ b/app/assets/javascripts/design_management/components/design_todo_button.vue
@@ -116,12 +116,7 @@ export default {
           variables: {
             id,
           },
-          update(
-            store,
-            {
-              data: { todoMarkDone },
-            },
-          ) {
+          update(store, { data: { todoMarkDone } }) {
             const todoMarkDoneFirstError = (todoMarkDone.errors || [])[0];
             if (todoMarkDoneFirstError) {
               this.$emit('error', Error(todoMarkDoneFirstError));
diff --git a/app/assets/javascripts/design_management/pages/design/index.vue b/app/assets/javascripts/design_management/pages/design/index.vue
index fb86568c304..fd1dca914ed 100644
--- a/app/assets/javascripts/design_management/pages/design/index.vue
+++ b/app/assets/javascripts/design_management/pages/design/index.vue
@@ -167,12 +167,7 @@ export default {
     next();
   },
   methods: {
-    addImageDiffNoteToStore(
-      store,
-      {
-        data: { createImageDiffNote },
-      },
-    ) {
+    addImageDiffNoteToStore(store, { data: { createImageDiffNote } }) {
       updateStoreAfterAddImageDiffNote(
         store,
         createImageDiffNote,
@@ -180,12 +175,7 @@ export default {
         this.designVariables,
       );
     },
-    updateImageDiffNoteInStore(
-      store,
-      {
-        data: { repositionImageDiffNote },
-      },
-    ) {
+    updateImageDiffNoteInStore(store, { data: { repositionImageDiffNote } }) {
       return updateStoreAfterRepositionImageDiffNote(
         store,
         repositionImageDiffNote,
diff --git a/app/assets/javascripts/design_management/pages/index.vue b/app/assets/javascripts/design_management/pages/index.vue
index ea404692840..b151dbf8a96 100644
--- a/app/assets/javascripts/design_management/pages/index.vue
+++ b/app/assets/javascripts/design_management/pages/index.vue
@@ -187,12 +187,7 @@ export default {
         .then(res => this.onUploadDesignDone(res))
         .catch(() => this.onUploadDesignError());
     },
-    afterUploadDesign(
-      store,
-      {
-        data: { designManagementUpload },
-      },
-    ) {
+    afterUploadDesign(store, { data: { designManagementUpload } }) {
       updateStoreAfterUploadDesign(store, designManagementUpload, this.projectQueryBody);
     },
     onUploadDesignDone(res) {
diff --git a/app/assets/javascripts/design_management/router/routes.js b/app/assets/javascripts/design_management/router/routes.js
index d888b856611..1b07d8aeb76 100644
--- a/app/assets/javascripts/design_management/router/routes.js
+++ b/app/assets/javascripts/design_management/router/routes.js
@@ -13,13 +13,7 @@ export default [
     name: DESIGN_ROUTE_NAME,
     path: '/designs/:id',
     component: DesignDetail,
-    beforeEnter(
-      {
-        params: { id },
-      },
-      _,
-      next,
-    ) {
+    beforeEnter({ params: { id } }, _, next) {
       if (typeof id === 'string') {
         next();
       }