Commit ec970e8a authored by Annabel Gray's avatar Annabel Gray

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
parents 5d95fa66 a8e448f5
...@@ -85,6 +85,7 @@ export default class Shortcuts { ...@@ -85,6 +85,7 @@ export default class Shortcuts {
if ($modal.length) { if ($modal.length) {
$modal.modal('toggle'); $modal.modal('toggle');
return null;
} }
return axios.get(gon.shortcuts_path, { return axios.get(gon.shortcuts_path, {
......
---
title: Fix close keyboard shortcuts dialog using the keyboard shortcut
merge_request: 18783
author: Lars Greiss
type: fixed
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment