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/pages/projects/merge_requests | |
| parent | 94d5dd3b7bf5fb922458cec7659754164e8182c6 (diff) | |
| download | gitlab-ce-c62fe6a293f62d37d9290074b917cc67a78b6cfd.tar.gz | |
refactor merge conflicts bundle to reduce side effects
Diffstat (limited to 'app/assets/javascripts/pages/projects/merge_requests')
| -rw-r--r-- | app/assets/javascripts/pages/projects/merge_requests/conflicts/index.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/pages/projects/merge_requests/conflicts/index.js b/app/assets/javascripts/pages/projects/merge_requests/conflicts/index.js index 233457ec61b..28641104c58 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/conflicts/index.js +++ b/app/assets/javascripts/pages/projects/merge_requests/conflicts/index.js @@ -1,4 +1,7 @@ import initSidebarBundle from '~/sidebar/sidebar_bundle'; -import '~/merge_conflicts/merge_conflicts_bundle'; +import initMergeConflicts from '~/merge_conflicts/merge_conflicts_bundle'; -document.addEventListener('DOMContentLoaded', initSidebarBundle); +document.addEventListener('DOMContentLoaded', () => { + initSidebarBundle(); + initMergeConflicts(); +}); |