diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-11-22 20:11:25 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-11-23 04:57:37 +0300 |
| commit | b5343c3065da52550ee4893cc82c00c4af85dda1 (patch) | |
| tree | b9bd702780463616baed710555b3fd84044f28e5 /app | |
| parent | c6f5f8f678b9b2e6ba802dbdc1fea635e22bae8d (diff) | |
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
(cherry picked from commit 5083e0cf70b4c6cd0131b22bc670cac04626c161)
59502122 Fix reply quote keyboard shortcut on MRs
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 44606989395..721db847d3f 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -317,7 +317,6 @@ import Diff from './diff'; break; case 'projects:merge_requests:show': new Diff(); - shortcut_handler = new ShortcutsIssuable(true); new ZenMode(); initIssuableSidebar(); @@ -327,6 +326,8 @@ import Diff from './diff'; window.mergeRequest = new MergeRequest({ action: mrShowNode.dataset.mrAction, }); + + shortcut_handler = new ShortcutsIssuable(true); break; case 'dashboard:activity': new gl.Activities(); |