diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-11-04 00:38:54 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-10 21:30:38 +0300 |
| commit | fe964cc235ed22a5d013d5874284763b698aba7c (patch) | |
| tree | 5529dd7d9deb13d511d37f7a8fed33de15aa6d7c /app/assets/javascripts/merge_conflicts | |
| parent | 55f291e8ceae6d3d432039f72f6935c62fb2a872 (diff) | |
migrate all javascript asset bundles and require syntax
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 index 83520702f9b..92fad17cf00 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 +++ b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 @@ -2,14 +2,14 @@ /* global Vue */ /* global Flash */ -//= require 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 +window.Vue = require('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'); $(() => { const INTERACTIVE_RESOLVE_MODE = 'interactive'; |