diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-08-23 05:38:16 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-08-23 05:38:16 +0000 |
| commit | 0f74ba967296cfb2e2ae65328f93170f453ab687 (patch) | |
| tree | 072b6c16f39560ed08e9b1b723938aca5b6e75b4 | |
| parent | b7cfeeba6a6095ba72b4685f92d1e34c010a8412 (diff) | |
| parent | e9bd73e1e9634b044f0856632dd2697d954b09ce (diff) | |
| download | gitlab-ce-0f74ba967296cfb2e2ae65328f93170f453ab687.tar.gz | |
Merge branch 'disable-webpack-optimization' into 'master'
Disable webpack.optimize because it's breaking karma in EE
See merge request !13720
| -rw-r--r-- | config/karma.config.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/karma.config.js b/config/karma.config.js index 2f571978e08..e459f5cdac3 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -8,6 +8,7 @@ if (webpackConfig.plugins) { webpackConfig.plugins = webpackConfig.plugins.filter(function (plugin) { return !( plugin instanceof webpack.optimize.CommonsChunkPlugin || + plugin instanceof webpack.optimize.ModuleConcatenationPlugin || plugin instanceof webpack.DefinePlugin ); }); |