diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-02-27 16:53:49 -0600 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-02-27 16:53:49 -0600 |
commit | c62fe6a293f62d37d9290074b917cc67a78b6cfd (patch) | |
tree | ec37025b39f33528a957a5868ee102147c8b2c95 /app/assets/javascripts/merge_conflicts | |
parent | 94d5dd3b7bf5fb922458cec7659754164e8182c6 (diff) | |
download | gitlab-ce-c62fe6a293f62d37d9290074b917cc67a78b6cfd.tar.gz |
refactor merge conflicts bundle to reduce side effects
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
-rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js index b4b3c15108d..66b258839ae 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js +++ b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js @@ -12,7 +12,7 @@ import './components/inline_conflict_lines'; import './components/parallel_conflict_lines'; import syntaxHighlight from '../syntax_highlight'; -$(() => { +export default function initMergeConflicts() { const INTERACTIVE_RESOLVE_MODE = 'interactive'; const conflictsEl = document.querySelector('#conflicts'); const mergeConflictsStore = gl.mergeConflicts.mergeConflictsStore; @@ -91,4 +91,4 @@ $(() => { } } }); -}); +} |