diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2018-02-28 02:42:42 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2018-02-28 02:42:42 +0000 |
| commit | 4371f845649deaf6bf31f0a675b33f1d58f64de4 (patch) | |
| tree | 618c2380d57d662826e185997d4663f29ca2c0bf /app/assets/javascripts/pages/projects/merge_requests | |
| parent | 1f233e3394db1beae885959c34377aa848f46e42 (diff) | |
| parent | 7ec5d320f33d46d47a28c3ec7d755a6d42bbd08b (diff) | |
| download | gitlab-ce-4371f845649deaf6bf31f0a675b33f1d58f64de4.tar.gz | |
Merge branch 'remove-merge-conflicts-bundle' into 'master'
Remove merge_conflicts bundle
See merge request gitlab-org/gitlab-ce!17408
Diffstat (limited to 'app/assets/javascripts/pages/projects/merge_requests')
| -rw-r--r-- | app/assets/javascripts/pages/projects/merge_requests/conflicts/index.js | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/pages/projects/merge_requests/conflicts/show/index.js | 3 |
2 files changed, 5 insertions, 4 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 b92aef53510..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,3 +1,7 @@ import initSidebarBundle from '~/sidebar/sidebar_bundle'; +import initMergeConflicts from '~/merge_conflicts/merge_conflicts_bundle'; -document.addEventListener('DOMContentLoaded', initSidebarBundle); +document.addEventListener('DOMContentLoaded', () => { + initSidebarBundle(); + initMergeConflicts(); +}); diff --git a/app/assets/javascripts/pages/projects/merge_requests/conflicts/show/index.js b/app/assets/javascripts/pages/projects/merge_requests/conflicts/show/index.js deleted file mode 100644 index b92aef53510..00000000000 --- a/app/assets/javascripts/pages/projects/merge_requests/conflicts/show/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import initSidebarBundle from '~/sidebar/sidebar_bundle'; - -document.addEventListener('DOMContentLoaded', initSidebarBundle); |