diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2017-11-22 17:11:25 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2017-11-22 17:11:25 +0000 |
commit | 5083e0cf70b4c6cd0131b22bc670cac04626c161 (patch) | |
tree | 48b5c6e63359ca136a56e8756f2b43b68a3ee7a3 /app | |
parent | 743fd67f73875dac071287ef8bb91a2392359ba3 (diff) | |
parent | 59502122bdf928e58a0592da0610f2a94bb5eeb4 (diff) | |
download | gitlab-ce-5083e0cf70b4c6cd0131b22bc670cac04626c161.tar.gz |
Merge branch '40295-fix-reply-quote-shortcut-on-mr' into 'master'
Fix reply quote keyboard shortcut on MRs
Closes #40295
See merge request gitlab-org/gitlab-ce!15523
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/dispatcher.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index b4307761c6b..34708977d20 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -317,7 +317,6 @@ import ProjectVariables from './project_variables'; break; case 'projects:merge_requests:show': new Diff(); - shortcut_handler = new ShortcutsIssuable(true); new ZenMode(); initIssuableSidebar(); @@ -327,6 +326,8 @@ import ProjectVariables from './project_variables'; window.mergeRequest = new MergeRequest({ action: mrShowNode.dataset.mrAction, }); + + shortcut_handler = new ShortcutsIssuable(true); break; case 'dashboard:activity': new gl.Activities(); |