Add latest changes from gitlab-org/gitlab@master

20 files changed, 54 insertions, 54 deletions

diff --git a/app/assets/javascripts/blob/3d_viewer/index.js b/app/assets/javascripts/blob/3d_viewer/index.js
index 2d4f45cc365..94397d70384 100644
--- a/app/assets/javascripts/blob/3d_viewer/index.js
+++ b/app/assets/javascripts/blob/3d_viewer/index.js
@@ -68,7 +68,7 @@ export default class Renderer {
   }
 
   loadFile() {
-    this.loader.load(this.container.dataset.endpoint, geo => {
+    this.loader.load(this.container.dataset.endpoint, (geo) => {
       const obj = new MeshObject(geo);
 
       this.objects.push(obj);
@@ -99,7 +99,7 @@ export default class Renderer {
   }
 
   changeObjectMaterials(type) {
-    this.objects.forEach(obj => {
+    this.objects.forEach((obj) => {
       obj.changeMaterial(type);
     });
   }
diff --git a/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js b/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js
index 5b781947d55..ebe2c2b3bb8 100644
--- a/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js
+++ b/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js
@@ -28,7 +28,7 @@ class BalsamiqViewer {
       .then(({ data }) => {
         this.renderFile(data);
       })
-      .catch(e => {
+      .catch((e) => {
         throw new Error(e);
       });
   }
@@ -39,7 +39,7 @@ class BalsamiqViewer {
     this.initDatabase(fileBuffer);
 
     const previews = this.getPreviews();
-    previews.forEach(preview => {
+    previews.forEach((preview) => {
       const renderedPreview = this.renderPreview(preview);
 
       container.appendChild(renderedPreview);
diff --git a/app/assets/javascripts/blob/blob_file_dropzone.js b/app/assets/javascripts/blob/blob_file_dropzone.js
index 77565902ea3..19bad64155d 100644
--- a/app/assets/javascripts/blob/blob_file_dropzone.js
+++ b/app/assets/javascripts/blob/blob_file_dropzone.js
@@ -80,7 +80,7 @@ export default class BlobFileDropzone {
       },
     });
 
-    submitButton.on('click', e => {
+    submitButton.on('click', (e) => {
       e.preventDefault();
       e.stopPropagation();
       if (dropzone[0].dropzone.getQueuedFiles().length === 0) {
diff --git a/app/assets/javascripts/blob/blob_line_permalink_updater.js b/app/assets/javascripts/blob/blob_line_permalink_updater.js
index 62f0a56ed75..11089b299c5 100644
--- a/app/assets/javascripts/blob/blob_line_permalink_updater.js
+++ b/app/assets/javascripts/blob/blob_line_permalink_updater.js
@@ -2,12 +2,12 @@ import { getLocationHash } from '../lib/utils/url_utility';
 
 const lineNumberRe = /^L[0-9]+/;
 
-const updateLineNumbersOnBlobPermalinks = linksToUpdate => {
+const updateLineNumbersOnBlobPermalinks = (linksToUpdate) => {
   const hash = getLocationHash();
   if (hash && lineNumberRe.test(hash)) {
     const hashUrlString = `#${hash}`;
 
-    [].concat(Array.prototype.slice.call(linksToUpdate)).forEach(permalinkButton => {
+    [].concat(Array.prototype.slice.call(linksToUpdate)).forEach((permalinkButton) => {
       const baseHref =
         permalinkButton.getAttribute('data-original-href') ||
         (() => {
@@ -28,7 +28,7 @@ function BlobLinePermalinkUpdater(blobContentHolder, lineNumberSelector, element
     }, 0);
   };
 
-  blobContentHolder.addEventListener('click', e => {
+  blobContentHolder.addEventListener('click', (e) => {
     if (e.target.matches(lineNumberSelector)) {
       updateBlameAndBlobPermalinkCb();
     }
diff --git a/app/assets/javascripts/blob/components/blob_content_error.vue b/app/assets/javascripts/blob/components/blob_content_error.vue
index 7344b9cdff5..4c5d9831237 100644
--- a/app/assets/javascripts/blob/components/blob_content_error.vue
+++ b/app/assets/javascripts/blob/components/blob_content_error.vue
@@ -25,7 +25,7 @@ export default {
     },
     renderErrorReason() {
       const defaultReasonPath = Object.keys(BLOB_RENDER_ERRORS.REASONS).find(
-        reason => BLOB_RENDER_ERRORS.REASONS[reason].id === this.viewerError,
+        (reason) => BLOB_RENDER_ERRORS.REASONS[reason].id === this.viewerError,
       );
       const defaultReason = BLOB_RENDER_ERRORS.REASONS[defaultReasonPath].text;
       return this.notStoredExternally
diff --git a/app/assets/javascripts/blob/file_template_mediator.js b/app/assets/javascripts/blob/file_template_mediator.js
index 10e508484aa..c35f9934004 100644
--- a/app/assets/javascripts/blob/file_template_mediator.js
+++ b/app/assets/javascripts/blob/file_template_mediator.js
@@ -38,14 +38,14 @@ export default class FileTemplateMediator {
       MetricsDashboardSelector,
       DockerfileSelector,
       LicenseSelector,
-    ].map(TemplateSelectorClass => new TemplateSelectorClass({ mediator: this }));
+    ].map((TemplateSelectorClass) => new TemplateSelectorClass({ mediator: this }));
   }
 
   initTemplateTypeSelector() {
     this.typeSelector = new FileTemplateTypeSelector({
       mediator: this,
       dropdownData: this.templateSelectors
-        .map(templateSelector => {
+        .map((templateSelector) => {
           const cfg = templateSelector.config;
 
           return {
@@ -55,7 +55,7 @@ export default class FileTemplateMediator {
           };
         })
         .reduce(
-          (acc, current) => (acc.find(item => item.id === current.id) ? acc : [...acc, current]),
+          (acc, current) => (acc.find((item) => item.id === current.id) ? acc : [...acc, current]),
           [],
         ),
     });
@@ -99,7 +99,7 @@ export default class FileTemplateMediator {
   }
 
   listenForPreviewMode() {
-    this.$navLinks.on('click', 'a', e => {
+    this.$navLinks.on('click', 'a', (e) => {
       const urlPieces = e.target.href.split('#');
       const hash = urlPieces[1];
       if (hash === 'preview') {
@@ -115,7 +115,7 @@ export default class FileTemplateMediator {
       e.preventDefault();
     }
 
-    this.templateSelectors.forEach(selector => {
+    this.templateSelectors.forEach((selector) => {
       if (selector.config.key === item.key) {
         selector.show();
       } else {
@@ -138,7 +138,7 @@ export default class FileTemplateMediator {
     selector.renderLoading();
 
     this.fetchFileTemplate(selector.config.type, query, data)
-      .then(file => {
+      .then((file) => {
         this.setEditorContent(file);
         this.setFilename(name);
         selector.renderLoaded();
@@ -157,12 +157,12 @@ export default class FileTemplateMediator {
           initPopover(suggestCommitChanges);
         }
       })
-      .catch(err => new Flash(`An error occurred while fetching the template: ${err}`));
+      .catch((err) => new Flash(`An error occurred while fetching the template: ${err}`));
   }
 
   displayMatchedTemplateSelector() {
     const currentInput = this.getFilename();
-    this.templateSelectors.forEach(selector => {
+    this.templateSelectors.forEach((selector) => {
       const match = selector.config.pattern.test(currentInput);
 
       if (match) {
@@ -174,8 +174,8 @@ export default class FileTemplateMediator {
   }
 
   fetchFileTemplate(type, query, data = {}) {
-    return new Promise(resolve => {
-      const resolveFile = file => resolve(file);
+    return new Promise((resolve) => {
+      const resolveFile = (file) => resolve(file);
 
       Api.projectTemplate(this.projectId, type, query, data, resolveFile);
     });
@@ -194,7 +194,7 @@ export default class FileTemplateMediator {
   }
 
   findTemplateSelectorByKey(key) {
-    return this.templateSelectors.find(selector => selector.config.key === key);
+    return this.templateSelectors.find((selector) => selector.config.key === key);
   }
 
   hideTemplateSelectorMenu() {
@@ -250,6 +250,6 @@ export default class FileTemplateMediator {
   }
 
   getSelected() {
-    return this.templateSelectors.find(selector => selector.selected);
+    return this.templateSelectors.find((selector) => selector.selected);
   }
 }
diff --git a/app/assets/javascripts/blob/notebook/notebook_viewer.vue b/app/assets/javascripts/blob/notebook/notebook_viewer.vue
index ea33d621d47..02f93e14219 100644
--- a/app/assets/javascripts/blob/notebook/notebook_viewer.vue
+++ b/app/assets/javascripts/blob/notebook/notebook_viewer.vue
@@ -45,12 +45,12 @@ export default {
     loadFile() {
       axios
         .get(this.endpoint)
-        .then(res => res.data)
-        .then(data => {
+        .then((res) => res.data)
+        .then((data) => {
           this.json = data;
           this.loading = false;
         })
-        .catch(e => {
+        .catch((e) => {
           if (e.status !== 200) {
             this.loadError = true;
           }
diff --git a/app/assets/javascripts/blob/openapi/index.js b/app/assets/javascripts/blob/openapi/index.js
index 12cc2be8246..e6dc463f764 100644
--- a/app/assets/javascripts/blob/openapi/index.js
+++ b/app/assets/javascripts/blob/openapi/index.js
@@ -12,7 +12,7 @@ export default () => {
         dom_id: '#js-openapi-viewer',
       });
     })
-    .catch(error => {
+    .catch((error) => {
       flash(__('Something went wrong while initializing the OpenAPI viewer'));
       throw error;
     });
diff --git a/app/assets/javascripts/blob/sketch/index.js b/app/assets/javascripts/blob/sketch/index.js
index 767e205fcaa..d257810da65 100644
--- a/app/assets/javascripts/blob/sketch/index.js
+++ b/app/assets/javascripts/blob/sketch/index.js
@@ -12,9 +12,9 @@ export default class SketchLoader {
 
   load() {
     return this.getZipFile()
-      .then(data => JSZip.loadAsync(data))
-      .then(asyncResult => asyncResult.files['previews/preview.png'].async('uint8array'))
-      .then(content => {
+      .then((data) => JSZip.loadAsync(data))
+      .then((asyncResult) => asyncResult.files['previews/preview.png'].async('uint8array'))
+      .then((content) => {
         const url = window.URL || window.webkitURL;
         const blob = new Blob([new Uint8Array(content)], {
           type: 'image/png',
diff --git a/app/assets/javascripts/blob/stl_viewer.js b/app/assets/javascripts/blob/stl_viewer.js
index f129b6e631e..339906adc34 100644
--- a/app/assets/javascripts/blob/stl_viewer.js
+++ b/app/assets/javascripts/blob/stl_viewer.js
@@ -3,8 +3,8 @@ import Renderer from './3d_viewer';
 export default () => {
   const viewer = new Renderer(document.getElementById('js-stl-viewer'));
 
-  [].slice.call(document.querySelectorAll('.js-material-changer')).forEach(el => {
-    el.addEventListener('click', e => {
+  [].slice.call(document.querySelectorAll('.js-material-changer')).forEach((el) => {
+    el.addEventListener('click', (e) => {
       const { target } = e;
 
       e.preventDefault();
diff --git a/app/assets/javascripts/blob/suggest_gitlab_ci_yml/index.js b/app/assets/javascripts/blob/suggest_gitlab_ci_yml/index.js
index 55edb852ee6..d0dd80932cc 100644
--- a/app/assets/javascripts/blob/suggest_gitlab_ci_yml/index.js
+++ b/app/assets/javascripts/blob/suggest_gitlab_ci_yml/index.js
@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import Popover from './components/popover.vue';
 
-export default el =>
+export default (el) =>
   new Vue({
     el,
     render(createElement) {
diff --git a/app/assets/javascripts/blob/template_selector.js b/app/assets/javascripts/blob/template_selector.js
index ae9bb3455f0..9fa70ce3c62 100644
--- a/app/assets/javascripts/blob/template_selector.js
+++ b/app/assets/javascripts/blob/template_selector.js
@@ -26,12 +26,12 @@ export default class TemplateSelector {
       data,
       filterable: true,
       selectable: true,
-      toggleLabel: item => item.name,
+      toggleLabel: (item) => item.name,
       search: {
         fields: ['name'],
       },
-      clicked: options => this.onDropdownClicked(options),
-      text: item => item.name,
+      clicked: (options) => this.onDropdownClicked(options),
+      text: (item) => item.name,
     });
   }
 
@@ -46,7 +46,7 @@ export default class TemplateSelector {
   }
 
   listenForFilenameInput() {
-    return this.$filenameInput.on('keyup blur', e => this.renderMatchedDropdown(e));
+    return this.$filenameInput.on('keyup blur', (e) => this.renderMatchedDropdown(e));
   }
 
   renderMatchedDropdown() {
diff --git a/app/assets/javascripts/blob/template_selectors/ci_syntax_yaml_selector.js b/app/assets/javascripts/blob/template_selectors/ci_syntax_yaml_selector.js
index cb0e1a2d9fc..9370e170571 100644
--- a/app/assets/javascripts/blob/template_selectors/ci_syntax_yaml_selector.js
+++ b/app/assets/javascripts/blob/template_selectors/ci_syntax_yaml_selector.js
@@ -22,8 +22,8 @@ export default class BlobCiSyntaxYamlSelector extends FileTemplateSelector {
       search: {
         fields: ['name'],
       },
-      clicked: options => this.reportSelectionName(options),
-      text: item => item.name,
+      clicked: (options) => this.reportSelectionName(options),
+      text: (item) => item.name,
     });
   }
 }
diff --git a/app/assets/javascripts/blob/template_selectors/ci_yaml_selector.js b/app/assets/javascripts/blob/template_selectors/ci_yaml_selector.js
index 3a4e86fe572..3879a6c5742 100644
--- a/app/assets/javascripts/blob/template_selectors/ci_yaml_selector.js
+++ b/app/assets/javascripts/blob/template_selectors/ci_yaml_selector.js
@@ -23,8 +23,8 @@ export default class BlobCiYamlSelector extends FileTemplateSelector {
       search: {
         fields: ['name'],
       },
-      clicked: options => this.reportSelectionName(options),
-      text: item => item.name,
+      clicked: (options) => this.reportSelectionName(options),
+      text: (item) => item.name,
     });
   }
 }
diff --git a/app/assets/javascripts/blob/template_selectors/dockerfile_selector.js b/app/assets/javascripts/blob/template_selectors/dockerfile_selector.js
index 3cb4bb83930..5d976c5acdb 100644
--- a/app/assets/javascripts/blob/template_selectors/dockerfile_selector.js
+++ b/app/assets/javascripts/blob/template_selectors/dockerfile_selector.js
@@ -24,8 +24,8 @@ export default class DockerfileSelector extends FileTemplateSelector {
       search: {
         fields: ['name'],
       },
-      clicked: options => this.reportSelectionName(options),
-      text: item => item.name,
+      clicked: (options) => this.reportSelectionName(options),
+      text: (item) => item.name,
     });
   }
 }
diff --git a/app/assets/javascripts/blob/template_selectors/gitignore_selector.js b/app/assets/javascripts/blob/template_selectors/gitignore_selector.js
index 1721230dcb7..1bb1cbb74de 100644
--- a/app/assets/javascripts/blob/template_selectors/gitignore_selector.js
+++ b/app/assets/javascripts/blob/template_selectors/gitignore_selector.js
@@ -22,8 +22,8 @@ export default class BlobGitignoreSelector extends FileTemplateSelector {
       search: {
         fields: ['name'],
       },
-      clicked: options => this.reportSelectionName(options),
-      text: item => item.name,
+      clicked: (options) => this.reportSelectionName(options),
+      text: (item) => item.name,
     });
   }
 }
diff --git a/app/assets/javascripts/blob/template_selectors/license_selector.js b/app/assets/javascripts/blob/template_selectors/license_selector.js
index dafde82b1e0..affa20997e9 100644
--- a/app/assets/javascripts/blob/template_selectors/license_selector.js
+++ b/app/assets/javascripts/blob/template_selectors/license_selector.js
@@ -22,7 +22,7 @@ export default class BlobLicenseSelector extends FileTemplateSelector {
       search: {
         fields: ['name'],
       },
-      clicked: options => {
+      clicked: (options) => {
         const { e } = options;
         const el = options.$el;
         const query = options.selectedObj;
@@ -39,7 +39,7 @@ export default class BlobLicenseSelector extends FileTemplateSelector {
           data,
         });
       },
-      text: item => item.name,
+      text: (item) => item.name,
     });
   }
 }
diff --git a/app/assets/javascripts/blob/template_selectors/metrics_dashboard_selector.js b/app/assets/javascripts/blob/template_selectors/metrics_dashboard_selector.js
index 9e698bfea5d..42adab05ce3 100644
--- a/app/assets/javascripts/blob/template_selectors/metrics_dashboard_selector.js
+++ b/app/assets/javascripts/blob/template_selectors/metrics_dashboard_selector.js
@@ -22,8 +22,8 @@ export default class MetricsDashboardSelector extends FileTemplateSelector {
       search: {
         fields: ['name'],
       },
-      clicked: options => this.reportSelectionName(options),
-      text: item => item.name,
+      clicked: (options) => this.reportSelectionName(options),
+      text: (item) => item.name,
     });
   }
 }
diff --git a/app/assets/javascripts/blob/template_selectors/type_selector.js b/app/assets/javascripts/blob/template_selectors/type_selector.js
index 01625911815..f74f7535d99 100644
--- a/app/assets/javascripts/blob/template_selectors/type_selector.js
+++ b/app/assets/javascripts/blob/template_selectors/type_selector.js
@@ -17,8 +17,8 @@ export default class FileTemplateTypeSelector extends FileTemplateSelector {
       data: this.config.dropdownData,
       filterable: false,
       selectable: true,
-      clicked: options => this.mediator.selectTemplateTypeOptions(options),
-      text: item => item.name,
+      clicked: (options) => this.mediator.selectTemplateTypeOptions(options),
+      text: (item) => item.name,
     });
   }
 }
diff --git a/app/assets/javascripts/blob/viewer/index.js b/app/assets/javascripts/blob/viewer/index.js
index 01350acad0c..4e6ec20ec64 100644
--- a/app/assets/javascripts/blob/viewer/index.js
+++ b/app/assets/javascripts/blob/viewer/index.js
@@ -7,7 +7,7 @@ import eventHub from '../../notes/event_hub';
 import { __ } from '~/locale';
 import { fixTitle } from '~/tooltips';
 
-const loadRichBlobViewer = type => {
+const loadRichBlobViewer = (type) => {
   switch (type) {
     case 'balsamiq':
       return import(/* webpackChunkName: 'balsamiq_viewer' */ '../balsamiq_viewer');
@@ -30,8 +30,8 @@ export const handleBlobRichViewer = (viewer, type) => {
   if (!viewer || !type) return;
 
   loadRichBlobViewer(type)
-    .then(module => module?.default(viewer))
-    .catch(error => {
+    .then((module) => module?.default(viewer))
+    .catch((error) => {
       Flash(__('Error loading file viewer.'));
       throw error;
     });
@@ -84,7 +84,7 @@ export default class BlobViewer {
 
   initBindings() {
     if (this.switcherBtns.length) {
-      Array.from(this.switcherBtns).forEach(el => {
+      Array.from(this.switcherBtns).forEach((el) => {
         el.addEventListener('click', this.switchViewHandler.bind(this));
       });
     }
@@ -155,7 +155,7 @@ export default class BlobViewer {
 
     this.toggleCopyButtonState();
     BlobViewer.loadViewer(newViewer)
-      .then(viewer => {
+      .then((viewer) => {
         $(viewer).renderGFM();
 
         this.$fileHolder.trigger('highlight:line');