diff options
author | Mike Greiling <mike@pixelcog.com> | 2017-05-16 15:52:40 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-05-16 15:52:40 -0500 |
commit | 5bd549187aa68604d320e3d0c1a51ee4ed34c0e3 (patch) | |
tree | 4f121959a46a895d67963919f549507947a305a5 /app/assets/javascripts/merge_conflicts | |
parent | f5ad1dcbf88dc69254fe86be2fd6b20fead308c0 (diff) | |
download | gitlab-ce-5bd549187aa68604d320e3d0c1a51ee4ed34c0e3.tar.gz |
update remaining uses of CJS syntax to ES module syntax
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
-rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js index 15992460146..17030c3e4d3 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js +++ b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js @@ -2,14 +2,13 @@ /* global Flash */ import Vue from 'vue'; - -require('./merge_conflict_store'); -require('./merge_conflict_service'); -require('./mixins/line_conflict_utils'); -require('./mixins/line_conflict_actions'); -require('./components/diff_file_editor'); -require('./components/inline_conflict_lines'); -require('./components/parallel_conflict_lines'); +import './merge_conflict_store'; +import './merge_conflict_service'; +import './mixins/line_conflict_utils'; +import './mixins/line_conflict_actions'; +import './components/diff_file_editor'; +import './components/inline_conflict_lines'; +import './components/parallel_conflict_lines'; $(() => { const INTERACTIVE_RESOLVE_MODE = 'interactive'; |