diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-02-02 17:06:10 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-02-16 12:47:23 -0600 |
| commit | 71ac339fcaee5611506ea250bf501ecb49d202b0 (patch) | |
| tree | f40cf5fe21041586c256e78e0a9d0f0a4842435a | |
| parent | a9f320b5a2acd092c7b4523ff8ab7160c337db20 (diff) | |
| download | gitlab-ce-71ac339fcaee5611506ea250bf501ecb49d202b0.tar.gz | |
migrate projects:merge_requests:edit to static bundle
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 5 | ||||
| -rw-r--r-- | app/assets/javascripts/pages/projects/merge_requests/edit/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 04c5d220df2..089ffa77677 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -49,12 +49,7 @@ var Dispatcher; case 'projects:issues:new': case 'projects:issues:edit': case 'projects:merge_requests:creations:diffs': - shortcut_handler = true; - break; case 'projects:merge_requests:edit': - import('./pages/projects/merge_requests/edit') - .then(callDefault) - .catch(fail); shortcut_handler = true; break; case 'projects:tags:new': diff --git a/app/assets/javascripts/pages/projects/merge_requests/edit/index.js b/app/assets/javascripts/pages/projects/merge_requests/edit/index.js index 734d01ae6f2..febfecebbd2 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/edit/index.js +++ b/app/assets/javascripts/pages/projects/merge_requests/edit/index.js @@ -1,3 +1,3 @@ import initMergeRequest from '~/pages/projects/merge_requests/init_merge_request'; -export default initMergeRequest; +document.addEventListener('DOMContentLoaded', initMergeRequest); |