summaryrefslogtreecommitdiff
path: root/config/webpack.config.js
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-02-23 17:37:26 -0600
committerClement Ho <ClemMakesApps@gmail.com>2018-02-23 17:37:26 -0600
commita9530519514f04fa6857efce743475ae8c68c047 (patch)
treed5829cfa91b705a1acadb46cb5e70db18ff85a00 /config/webpack.config.js
parent873595337ec9f9c25dd455ebcbd0bd4876bc062e (diff)
parent6047a99ecc6815fa37cfa33aeba1d0dce8f6c6e1 (diff)
downloadgitlab-ce-a9530519514f04fa6857efce743475ae8c68c047.tar.gz
Merge branch 'master' into remove-sidebar-bundleremove-sidebar-bundle
Diffstat (limited to 'config/webpack.config.js')
-rw-r--r--config/webpack.config.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 75ae657852b..ef63ab548d2 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -52,7 +52,8 @@ var config = {
entry: {
balsamiq_viewer: './blob/balsamiq_viewer.js',
blob: './blob_edit/blob_bundle.js',
- boards: './boards/boards_bundle.js',
+ common: './commons/index.js',
+ common_vue: './vue_shared/vue_resource_interceptor.js',
cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js',
commit_pipelines: './commit/pipelines/pipelines_bundle.js',
diff_notes: './diff_notes/diff_notes_bundle.js',