Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

4 files changed, 10 insertions, 12 deletions

diff --git a/app/assets/javascripts/behaviors/shortcuts/keybindings.js b/app/assets/javascripts/behaviors/shortcuts/keybindings.js
index bbcc40ab9fe..10832583783 100644
--- a/app/assets/javascripts/behaviors/shortcuts/keybindings.js
+++ b/app/assets/javascripts/behaviors/shortcuts/keybindings.js
@@ -49,10 +49,10 @@ export const keybindingGroups = [
   // For each keybinding object, add a `customKeys` property populated with the
   // user's custom keybindings (if the command has been customized).
   // `customKeys` will be `undefined` if the command hasn't been customized.
-  .map(group => {
+  .map((group) => {
     return {
       ...group,
-      keybindings: group.keybindings.map(binding => ({
+      keybindings: group.keybindings.map((binding) => ({
         ...binding,
         customKeys: customizations[binding.command],
       })),
@@ -66,7 +66,7 @@ export const keybindingGroups = [
  * @example
  * { "globalShortcuts.togglePerformanceBar": ["p e r f"] }
  */
-const commandToKeys = flatten(keybindingGroups.map(group => group.keybindings)).reduce(
+const commandToKeys = flatten(keybindingGroups.map((group) => group.keybindings)).reduce(
   (acc, binding) => {
     acc[binding.command] = binding.customKeys || binding.defaultKeys;
     return acc;
@@ -87,7 +87,7 @@ const commandToKeys = flatten(keybindingGroups.map(group => group.keybindings)).
  *
  * Mousetrap.bind(keysFor(TOGGLE_PERFORMANCE_BAR), handler);
  */
-export const keysFor = command => {
+export const keysFor = (command) => {
   if (shouldDisableShortcuts()) {
     return [];
   }
diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js
index c0f67923191..50d2399b312 100644
--- a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js
+++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js
@@ -98,9 +98,7 @@ export default class Shortcuts {
     });
 
     // eslint-disable-next-line @gitlab/no-global-event-off
-    $('.js-shortcuts-modal-trigger')
-      .off('click')
-      .on('click', this.onToggleHelp);
+    $('.js-shortcuts-modal-trigger').off('click').on('click', this.onToggleHelp);
 
     if (shouldDisableShortcuts()) {
       disableShortcuts();
@@ -199,7 +197,7 @@ export default class Shortcuts {
     $textarea.data(LOCAL_MOUSETRAP_DATA_KEY, localMousetrap);
 
     toolbarBtnToShortcutsMap.forEach((keyboardShortcuts, $toolbarBtn) => {
-      localMousetrap.bind(keyboardShortcuts, e => {
+      localMousetrap.bind(keyboardShortcuts, (e) => {
         e.preventDefault();
 
         handler($toolbarBtn);
@@ -233,7 +231,7 @@ export default class Shortcuts {
     const localMousetrap = $textarea.data(LOCAL_MOUSETRAP_DATA_KEY);
 
     if (localMousetrap) {
-      getToolbarBtnToShortcutsMap($textarea).forEach(keyboardShortcuts => {
+      getToolbarBtnToShortcutsMap($textarea).forEach((keyboardShortcuts) => {
         localMousetrap.unbind(keyboardShortcuts);
       });
     }
diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js
index c35a073b291..11b4fcd4e1c 100644
--- a/app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js
+++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js
@@ -53,7 +53,7 @@ export default class ShortcutsBlob extends Shortcuts {
 
   shortcircuitPermalinkButton() {
     const button = this.options.fileBlobPermalinkUrlElement;
-    const handleButton = e => {
+    const handleButton = (e) => {
       if (!eventHasModifierKeys(e)) {
         e.preventDefault();
         this.moveToFilePermalink();
diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js
index 5a5a67334d3..5e8ddeb6af7 100644
--- a/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js
+++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js
@@ -39,7 +39,7 @@ export default class ShortcutsIssuable extends Shortcuts {
     // ... Or come from a message
     if (!foundMessage) {
       if (documentFragment.originalNodes) {
-        documentFragment.originalNodes.forEach(e => {
+        documentFragment.originalNodes.forEach((e) => {
           let node = e;
           do {
             // Text nodes don't define the `matches` method
@@ -62,7 +62,7 @@ export default class ShortcutsIssuable extends Shortcuts {
     const blockquoteEl = document.createElement('blockquote');
     blockquoteEl.appendChild(el);
     CopyAsGFM.nodeToGFM(blockquoteEl)
-      .then(text => {
+      .then((text) => {
         if (text.trim() === '') {
           return false;
         }