diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-02-02 16:57:10 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-02-16 12:47:22 -0600 |
| commit | dc65609e726b78098e82becdd6224fc87a37130d (patch) | |
| tree | 3692c4bfd9b67ac030d907e4644580f296861ac5 | |
| parent | a6af8e8e643a2779f54c0a07b1d79d86221aacdc (diff) | |
| download | gitlab-ce-dc65609e726b78098e82becdd6224fc87a37130d.tar.gz | |
migrate projects:merge_requests:creations:new to static bundle
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 4c79c3c4948..2e57a2d2c22 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -50,10 +50,6 @@ var Dispatcher; case 'projects:issues:edit': shortcut_handler = true; break; - case 'projects:merge_requests:creations:new': - import('./pages/projects/merge_requests/creations/new') - .then(callDefault) - .catch(fail); case 'projects:merge_requests:creations:diffs': import('./pages/projects/merge_requests/creations/diffs') .then(callDefault) diff --git a/app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js b/app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js index ccd0b54c5ed..1d5aec4001d 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js +++ b/app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js @@ -1,7 +1,7 @@ import Compare from '~/compare'; import MergeRequest from '~/merge_request'; -export default () => { +document.addEventListener('DOMContentLoaded', () => { const mrNewCompareNode = document.querySelector('.js-merge-request-new-compare'); if (mrNewCompareNode) { new Compare({ // eslint-disable-line no-new @@ -15,4 +15,4 @@ export default () => { action: mrNewSubmitNode.dataset.mrSubmitAction, }); } -}; +}); |