summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-27 17:58:51 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-27 17:58:51 +0100
commitf74d0ba195079260d3b3217cd72b2fd9b0483c00 (patch)
treef1f726bd088fcd3938cf4107b9c29e756c155292
parent18455d7446da9fea0cb1e9464c586b60c7d6e310 (diff)
downloadgitlab-ce-f74d0ba195079260d3b3217cd72b2fd9b0483c00.tar.gz
Fix webpack config conflicts bad resolution
-rw-r--r--config/webpack.config.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index f61e65c0e5b..8b5354809e7 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -46,6 +46,7 @@ var config = {
network: './network/network_bundle.js',
notebook_viewer: './blob/notebook_viewer.js',
pdf_viewer: './blob/pdf_viewer.js',
+ pipelines: './pipelines/index.js',
balsamiq_viewer: './blob/balsamiq_viewer.js',
profile: './profile/profile_bundle.js',
protected_branches: './protected_branches/protected_branches_bundle.js',
@@ -129,6 +130,7 @@ var config = {
'merge_conflicts',
'notebook_viewer',
'pdf_viewer',
+ 'pipelines',
'balsamiq_viewer',
],
minChunks: function(module, count) {