diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-02-02 16:59:36 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-02-16 12:47:22 -0600 |
| commit | a9f320b5a2acd092c7b4523ff8ab7160c337db20 (patch) | |
| tree | 74cb02aa4328b19c4febeeeb119937fc17a619cc | |
| parent | dc65609e726b78098e82becdd6224fc87a37130d (diff) | |
| download | gitlab-ce-a9f320b5a2acd092c7b4523ff8ab7160c337db20.tar.gz | |
migrate projects:merge_requests:creations:diffs to static bundle
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 5 | ||||
| -rw-r--r-- | app/assets/javascripts/pages/projects/merge_requests/creations/diffs/index.js | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 2e57a2d2c22..04c5d220df2 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -48,12 +48,7 @@ var Dispatcher; case 'projects:issues:show': case 'projects:issues:new': case 'projects:issues:edit': - shortcut_handler = true; - break; case 'projects:merge_requests:creations:diffs': - import('./pages/projects/merge_requests/creations/diffs') - .then(callDefault) - .catch(fail); shortcut_handler = true; break; case 'projects:merge_requests:edit': diff --git a/app/assets/javascripts/pages/projects/merge_requests/creations/diffs/index.js b/app/assets/javascripts/pages/projects/merge_requests/creations/diffs/index.js index 734d01ae6f2..febfecebbd2 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/creations/diffs/index.js +++ b/app/assets/javascripts/pages/projects/merge_requests/creations/diffs/index.js @@ -1,3 +1,3 @@ import initMergeRequest from '~/pages/projects/merge_requests/init_merge_request'; -export default initMergeRequest; +document.addEventListener('DOMContentLoaded', initMergeRequest); |