summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/pages/projects/merge_requests/show
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2018-02-27 18:38:47 +0000
committerJacob Schatz <jschatz@gitlab.com>2018-02-27 18:38:47 +0000
commitd4867c518f2d72125c619c191fa9577dabb1ae9a (patch)
tree855fece1b8779fee6ae0780557ae15410f7855d9 /app/assets/javascripts/pages/projects/merge_requests/show
parent810986433eab68e98db56fb63902a8c0547752cb (diff)
parenta9530519514f04fa6857efce743475ae8c68c047 (diff)
downloadgitlab-ce-d4867c518f2d72125c619c191fa9577dabb1ae9a.tar.gz
Merge branch 'remove-sidebar-bundle' into 'master'
Remove sidebar bundle webpack entry point See merge request gitlab-org/gitlab-ce!17343
Diffstat (limited to 'app/assets/javascripts/pages/projects/merge_requests/show')
-rw-r--r--app/assets/javascripts/pages/projects/merge_requests/show/index.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/pages/projects/merge_requests/show/index.js b/app/assets/javascripts/pages/projects/merge_requests/show/index.js
index 16522d06eb2..b7b6b0b5364 100644
--- a/app/assets/javascripts/pages/projects/merge_requests/show/index.js
+++ b/app/assets/javascripts/pages/projects/merge_requests/show/index.js
@@ -3,6 +3,7 @@ import ZenMode from '~/zen_mode';
import initNotes from '~/init_notes';
import initIssuableSidebar from '~/init_issuable_sidebar';
import initDiffNotes from '~/diff_notes/diff_notes_bundle';
+import initSidebarBundle from '~/sidebar/sidebar_bundle';
import ShortcutsIssuable from '~/shortcuts_issuable';
import Diff from '~/diff';
import { handleLocationHash } from '~/lib/utils/common_utils';
@@ -15,6 +16,7 @@ document.addEventListener('DOMContentLoaded', () => {
new ZenMode(); // eslint-disable-line no-new
initIssuableSidebar();
+ initSidebarBundle();
initNotes();
initDiffNotes();
initPipelines();