diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-05-07 19:31:29 +0000 |
|---|---|---|
| committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-05-07 19:31:29 +0000 |
| commit | ec970e8a3f060986d4e2c0da724c15f6b34587d7 (patch) | |
| tree | 04f5d3a453e8e14ed3dd571223d838e0642c7395 | |
| parent | 5d95fa66cd9ea1cc8cf1f0cc388598f8762f30f3 (diff) | |
| parent | a8e448f5836370411e26a3e2db52361e4ea99229 (diff) | |
| download | gitlab-ce-ec970e8a3f060986d4e2c0da724c15f6b34587d7.tar.gz | |
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
| -rw-r--r-- | app/assets/javascripts/shortcuts.js | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-shortcut-close-screen-with-key.yml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/shortcuts.js b/app/assets/javascripts/shortcuts.js index e31e067033f..99c71d6524a 100644 --- 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, { diff --git a/changelogs/unreleased/fix-shortcut-close-screen-with-key.yml b/changelogs/unreleased/fix-shortcut-close-screen-with-key.yml new file mode 100644 index 00000000000..9cbc856a075 --- /dev/null +++ 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 |