kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Annabel Gray 2018-05-07 19:31:29 +00:00
parent 5d95fa66cd a8e448f583
commit ec970e8a3f
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/shortcuts.js
View File

@ -85,6 +85,7 @@ export default class Shortcuts {
if ($modal.length) {
$modal.modal('toggle');
return null;
}
return axios.get(gon.shortcuts_path, {

5
changelogs/unreleased/fix-shortcut-close-screen-with-key.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix close keyboard shortcuts dialog using the keyboard shortcut
merge_request: 18783
author: Lars Greiss
type: fixed