diff options
author | Fatih Acet <acetfatih@gmail.com> | 2017-02-17 14:48:00 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2017-02-17 14:48:00 +0000 |
commit | de6266d650dadd2d77ebf8872ba55b97c68cd971 (patch) | |
tree | 8c8c5d4e0c3ec28a86f80b81b316d7f67fb05161 /app/assets | |
parent | 02443d1d41286017adfb47646be2bc88135f6415 (diff) | |
parent | 3c4dc4338484acc8736c347b5b64029450836c03 (diff) | |
download | gitlab-ce-de6266d650dadd2d77ebf8872ba55b97c68cd971.tar.gz |
Merge branch '27920-both-wip-messages-showing' into 'master'
Dispatch needed JS when creating a new MR in diff view
Closes #27920
See merge request !9238
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/dispatcher.js.es6 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/dispatcher.js.es6 b/app/assets/javascripts/dispatcher.js.es6 index 7eec2d39a9c..f06a8848021 100644 --- a/app/assets/javascripts/dispatcher.js.es6 +++ b/app/assets/javascripts/dispatcher.js.es6 @@ -118,6 +118,7 @@ const ShortcutsBlob = require('./shortcuts_blob'); new gl.IssuableTemplateSelectors(); break; case 'projects:merge_requests:new': + case 'projects:merge_requests:new_diffs': case 'projects:merge_requests:edit': new gl.Diff(); shortcut_handler = new ShortcutsNavigation(); |