Merge branch 'fix-shortcut-close-screen-with-key' into 'master'

Fix close keyboard shortcuts dialog using the keyboard shortcut See merge request gitlab-org/gitlab-ce!18783

Merge branch 'fix-shortcut-close-screen-with-key' into 'master'
ec970e8a · Annabel Gray · 5d95fa66 · a8e448f5 · ec970e8a · ec970e8a
Commit ec970e8a authored May 07, 2018 by Annabel Gray
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

shortcuts.js app/assets/javascripts/shortcuts.js +1 -0

fix-shortcut-close-screen-with-key.yml changelogs/unreleased/fix-shortcut-close-screen-with-key.yml +5 -0

No files found.
--- a/app/assets/javascripts/shortcuts.js
+++ b/app/assets/javascripts/shortcuts.js
@@ -85,6 +85,7 @@ export default class Shortcuts {

    if ($modal.length) {
      $modal.modal('toggle');
+      return null;
    }

    return axios.get(gon.shortcuts_path, {

--- a/changelogs/unreleased/fix-shortcut-close-screen-with-key.yml
+++ b/changelogs/unreleased/fix-shortcut-close-screen-with-key.yml
+---
+title: Fix close keyboard shortcuts dialog using the keyboard shortcut
+merge_request: 18783
+author: Lars Greiss
+type: fixed