Add latest changes from gitlab-org/gitlab@master

6 files changed, 17 insertions, 17 deletions

diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue
index 347828888dc..1724cc692bd 100644
--- a/app/assets/javascripts/environments/components/environment_item.vue
+++ b/app/assets/javascripts/environments/components/environment_item.vue
@@ -226,7 +226,7 @@ export default {
         { deep: true },
       );
       const combinedActions = (manualActions || []).concat(scheduledActions || []);
-      return combinedActions.map(action => ({
+      return combinedActions.map((action) => ({
         ...action,
         name: action.name,
       }));
diff --git a/app/assets/javascripts/environments/components/environment_rollback.vue b/app/assets/javascripts/environments/components/environment_rollback.vue
index 32528e6c6ea..48edde82ce7 100644
--- a/app/assets/javascripts/environments/components/environment_rollback.vue
+++ b/app/assets/javascripts/environments/components/environment_rollback.vue
@@ -55,7 +55,7 @@ export default {
         retryUrl: this.retryUrl,
         isLastDeployment: this.isLastDeployment,
       });
-      eventHub.$on('rollbackEnvironment', environment => {
+      eventHub.$on('rollbackEnvironment', (environment) => {
         if (environment.id === this.environment.id) {
           this.isLoading = true;
         }
diff --git a/app/assets/javascripts/environments/components/environments_app.vue b/app/assets/javascripts/environments/components/environments_app.vue
index b6a7cce36e9..13228873f44 100644
--- a/app/assets/javascripts/environments/components/environments_app.vue
+++ b/app/assets/javascripts/environments/components/environments_app.vue
@@ -116,7 +116,7 @@ export default {
 
       this.service
         .getFolderContent(folder.folder_path)
-        .then(response => this.store.setfolderContent(folder, response.data.environments))
+        .then((response) => this.store.setfolderContent(folder, response.data.environments))
         .then(() => this.store.updateEnvironmentProp(folder, 'isLoadingFolderContent', false))
         .catch(() => {
           Flash(s__('Environments|An error occurred while fetching the environments.'));
@@ -130,7 +130,7 @@ export default {
       // We need to verify if any folder is open to also update it
       const openFolders = this.store.getOpenFolders();
       if (openFolders.length) {
-        openFolders.forEach(folder => this.fetchChildEnvironments(folder));
+        openFolders.forEach((folder) => this.fetchChildEnvironments(folder));
       }
     },
   },
diff --git a/app/assets/javascripts/environments/components/environments_table.vue b/app/assets/javascripts/environments/components/environments_table.vue
index d13c7204285..1efea30a5f7 100644
--- a/app/assets/javascripts/environments/components/environments_table.vue
+++ b/app/assets/javascripts/environments/components/environments_table.vue
@@ -67,7 +67,7 @@ export default {
   },
   computed: {
     sortedEnvironments() {
-      return this.sortEnvironments(this.environments).map(env =>
+      return this.sortEnvironments(this.environments).map((env) =>
         this.shouldRenderFolderContent(env)
           ? { ...env, children: this.sortEnvironments(env.children) }
           : env,
@@ -144,11 +144,11 @@ export default {
        * 5. Put folders first.
        */
       return flow(
-        sortBy(env => (env.isFolder ? env.folderName : env.name)),
+        sortBy((env) => (env.isFolder ? env.folderName : env.name)),
         reverse,
-        sortBy(env => (env.last_deployment ? env.last_deployment.created_at : '0000')),
+        sortBy((env) => (env.last_deployment ? env.last_deployment.created_at : '0000')),
         reverse,
-        sortBy(env => (env.isFolder ? -1 : 1)),
+        sortBy((env) => (env.isFolder ? -1 : 1)),
       )(environments);
     },
     changeCanaryWeight(model, weight) {
diff --git a/app/assets/javascripts/environments/mixins/environments_mixin.js b/app/assets/javascripts/environments/mixins/environments_mixin.js
index 9b0301bba07..3d301f6094d 100644
--- a/app/assets/javascripts/environments/mixins/environments_mixin.js
+++ b/app/assets/javascripts/environments/mixins/environments_mixin.js
@@ -64,7 +64,7 @@ export default {
     },
 
     filterNilValues(obj) {
-      return omitBy(obj, value => value === undefined || value === null);
+      return omitBy(obj, (value) => value === undefined || value === null);
     },
 
     /**
@@ -80,7 +80,7 @@ export default {
       // fetch new data
       return this.service
         .fetchEnvironments(this.requestData)
-        .then(response => {
+        .then((response) => {
           this.successCallback(response);
           this.poll.enable({ data: this.requestData, response });
         })
@@ -107,7 +107,7 @@ export default {
         this.service
           .postAction(endpoint)
           .then(() => this.fetchEnvironments())
-          .catch(err => {
+          .catch((err) => {
             this.isLoading = false;
             Flash(isFunction(errorMessage) ? errorMessage(err.response.data) : errorMessage);
           });
@@ -219,7 +219,7 @@ export default {
         data: this.requestData,
         successCallback: this.successCallback,
         errorCallback: this.errorCallback,
-        notificationCallback: isMakingRequest => {
+        notificationCallback: (isMakingRequest) => {
           this.isMakingRequest = isMakingRequest;
         },
       });
diff --git a/app/assets/javascripts/environments/stores/environments_store.js b/app/assets/javascripts/environments/stores/environments_store.js
index 1992e753255..6ef8b9f643f 100644
--- a/app/assets/javascripts/environments/stores/environments_store.js
+++ b/app/assets/javascripts/environments/stores/environments_store.js
@@ -46,9 +46,9 @@ export default class EnvironmentsStore {
    * @returns {Array}
    */
   storeEnvironments(environments = []) {
-    const filteredEnvironments = environments.map(env => {
+    const filteredEnvironments = environments.map((env) => {
       const oldEnvironmentState =
-        this.state.environments.find(element => {
+        this.state.environments.find((element) => {
           if (env.latest) {
             return element.id === env.latest.id;
           }
@@ -163,7 +163,7 @@ export default class EnvironmentsStore {
    * @return {Object}
    */
   setfolderContent(folder, environments) {
-    const updatedEnvironments = environments.map(env => {
+    const updatedEnvironments = environments.map((env) => {
       let updated = env;
 
       if (env.latest) {
@@ -192,7 +192,7 @@ export default class EnvironmentsStore {
   updateEnvironmentProp(environment, prop, newValue) {
     const { environments } = this.state;
 
-    const updatedEnvironments = environments.map(env => {
+    const updatedEnvironments = environments.map((env) => {
       const updateEnv = { ...env };
       if (env.id === environment.id) {
         updateEnv[prop] = newValue;
@@ -207,6 +207,6 @@ export default class EnvironmentsStore {
   getOpenFolders() {
     const { environments } = this.state;
 
-    return environments.filter(env => env.isFolder && env.isOpen);
+    return environments.filter((env) => env.isFolder && env.isOpen);
   }
 }