diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-13 09:26:44 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-12-13 09:26:44 +0000 |
| commit | aa90e8ea5b025dc5de5887b2694e25745bf97e48 (patch) | |
| tree | 9700aa80f7be849a0cab14e3313a35b0db41f2a4 /app/assets/javascripts/merge_conflicts | |
| parent | bcb14a0dbb729ab88ef5eb93ad7a4694ed8cac9d (diff) | |
| download | gitlab-ce-aa90e8ea5b025dc5de5887b2694e25745bf97e48.tar.gz | |
Export old code into es6 modules
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js index 17591829b76..94561d6b7c3 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js +++ b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js @@ -10,6 +10,7 @@ import './mixins/line_conflict_actions'; import './components/diff_file_editor'; import './components/inline_conflict_lines'; import './components/parallel_conflict_lines'; +import syntaxHighlight from '../syntax_highlight'; $(() => { const INTERACTIVE_RESOLVE_MODE = 'interactive'; @@ -53,7 +54,7 @@ $(() => { mergeConflictsStore.setLoadingState(false); this.$nextTick(() => { - $('.js-syntax-highlight').syntaxHighlight(); + syntaxHighlight($('.js-syntax-highlight')); }); }); }, |