Add latest changes from gitlab-org/gitlab@master

4 files changed, 19 insertions, 19 deletions

diff --git a/app/assets/javascripts/badges/components/badge_form.vue b/app/assets/javascripts/badges/components/badge_form.vue
index e2d9b325815..9e09f527a39 100644
--- a/app/assets/javascripts/badges/components/badge_form.vue
+++ b/app/assets/javascripts/badges/components/badge_form.vue
@@ -48,7 +48,7 @@ export default {
     },
     helpText() {
       const placeholders = ['project_path', 'project_id', 'default_branch', 'commit_sha']
-        .map(placeholder => `<code>%{${placeholder}}</code>`)
+        .map((placeholder) => `<code>%{${placeholder}}</code>`)
         .join(', ');
       return sprintf(
         s__('Badges|Supported %{docsLinkStart}variables%{docsLinkEnd}: %{placeholders}'),
@@ -137,7 +137,7 @@ export default {
             createFlash(s__('Badges|Badge saved.'), 'notice');
             this.wasValidated = false;
           })
-          .catch(error => {
+          .catch((error) => {
             createFlash(
               s__('Badges|Saving the badge failed, please check the entered URLs and try again.'),
             );
@@ -150,7 +150,7 @@ export default {
           createFlash(s__('Badges|New badge added.'), 'notice');
           this.wasValidated = false;
         })
-        .catch(error => {
+        .catch((error) => {
           createFlash(
             s__('Badges|Adding the badge failed, please check the entered URLs and try again.'),
           );
diff --git a/app/assets/javascripts/badges/components/badge_settings.vue b/app/assets/javascripts/badges/components/badge_settings.vue
index 19781783100..73c63a72b1c 100644
--- a/app/assets/javascripts/badges/components/badge_settings.vue
+++ b/app/assets/javascripts/badges/components/badge_settings.vue
@@ -42,7 +42,7 @@ export default {
         .then(() => {
           createFlash(s__('Badges|The badge was deleted.'), 'notice');
         })
-        .catch(error => {
+        .catch((error) => {
           createFlash(s__('Badges|Deleting the badge failed, please try again.'));
           throw error;
         });
diff --git a/app/assets/javascripts/badges/store/actions.js b/app/assets/javascripts/badges/store/actions.js
index 806c2423e7e..3377f6c0996 100644
--- a/app/assets/javascripts/badges/store/actions.js
+++ b/app/assets/javascripts/badges/store/actions.js
@@ -2,7 +2,7 @@ import axios from '~/lib/utils/axios_utils';
 import types from './mutation_types';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 
-export const transformBackendBadge = badge => ({
+export const transformBackendBadge = (badge) => ({
   ...convertObjectPropsToCamelCase(badge, true),
   isDeleting: false,
 });
@@ -27,11 +27,11 @@ export default {
         image_url: newBadge.imageUrl,
         link_url: newBadge.linkUrl,
       })
-      .catch(error => {
+      .catch((error) => {
         dispatch('receiveNewBadgeError');
         throw error;
       })
-      .then(res => {
+      .then((res) => {
         dispatch('receiveNewBadge', transformBackendBadge(res.data));
       });
   },
@@ -50,7 +50,7 @@ export default {
     const endpoint = `${state.apiEndpointUrl}/${badgeId}`;
     return axios
       .delete(endpoint)
-      .catch(error => {
+      .catch((error) => {
         dispatch('receiveDeleteBadgeError', badgeId);
         throw error;
       })
@@ -78,11 +78,11 @@ export default {
     const endpoint = state.apiEndpointUrl;
     return axios
       .get(endpoint)
-      .catch(error => {
+      .catch((error) => {
         dispatch('receiveLoadBadgesError');
         throw error;
       })
-      .then(res => {
+      .then((res) => {
         dispatch('receiveLoadBadges', res.data.map(transformBackendBadge));
       });
   },
@@ -113,11 +113,11 @@ export default {
     const renderEndpoint = `${state.apiEndpointUrl}/render?${parameters}`;
     return axios
       .get(renderEndpoint)
-      .catch(error => {
+      .catch((error) => {
         dispatch('receiveRenderedBadgeError');
         throw error;
       })
-      .then(res => {
+      .then((res) => {
         dispatch('receiveRenderedBadge', transformBackendBadge(res.data));
       });
   },
@@ -142,11 +142,11 @@ export default {
         image_url: badge.imageUrl,
         link_url: badge.linkUrl,
       })
-      .catch(error => {
+      .catch((error) => {
         dispatch('receiveUpdatedBadgeError');
         throw error;
       })
-      .then(res => {
+      .then((res) => {
         dispatch('receiveUpdatedBadge', transformBackendBadge(res.data));
       });
   },
diff --git a/app/assets/javascripts/badges/store/mutations.js b/app/assets/javascripts/badges/store/mutations.js
index bd84e68c00f..3f4689aeb17 100644
--- a/app/assets/javascripts/badges/store/mutations.js
+++ b/app/assets/javascripts/badges/store/mutations.js
@@ -1,7 +1,7 @@
 import types from './mutation_types';
 import { PROJECT_BADGE } from '../constants';
 
-const reorderBadges = badges =>
+const reorderBadges = (badges) =>
   badges.sort((a, b) => {
     if (a.kind !== b.kind) {
       return a.kind === PROJECT_BADGE ? 1 : -1;
@@ -31,7 +31,7 @@ export default {
   },
 
   [types.RECEIVE_UPDATED_BADGE](state, updatedBadge) {
-    const badges = state.badges.map(badge => {
+    const badges = state.badges.map((badge) => {
       if (badge.id === updatedBadge.id) {
         return updatedBadge;
       }
@@ -77,13 +77,13 @@ export default {
   },
 
   [types.RECEIVE_DELETE_BADGE](state, badgeId) {
-    const badges = state.badges.filter(badge => badge.id !== badgeId);
+    const badges = state.badges.filter((badge) => badge.id !== badgeId);
     Object.assign(state, {
       badges,
     });
   },
   [types.RECEIVE_DELETE_BADGE_ERROR](state, badgeId) {
-    const badges = state.badges.map(badge => {
+    const badges = state.badges.map((badge) => {
       if (badge.id === badgeId) {
         return {
           ...badge,
@@ -98,7 +98,7 @@ export default {
     });
   },
   [types.REQUEST_DELETE_BADGE](state, badgeId) {
-    const badges = state.badges.map(badge => {
+    const badges = state.badges.map((badge) => {
       if (badge.id === badgeId) {
         return {
           ...badge,