Fix close keyboard shortcuts dialog using the keyboard shortcut

2018-05-07 19:31:29 +00:00 · 2018-05-07 19:31:29 +00:00 · a8e448f583
parent 5d95fa66cd
commit a8e448f583
2 changed files with 6 additions and 0 deletions
--- 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
@ -0,0 +1,5 @@
+---
+title: Fix close keyboard shortcuts dialog using the keyboard shortcut
+merge_request: 18783
+author: Lars Greiss
+type: fixed