diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-06-02 13:53:33 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-06-02 13:53:33 +0000 |
commit | 7fea09bfaf425dab038636c0058b0c89c9f6da3e (patch) | |
tree | 12c753df0d7cddb362754361b1ae3725eb57dd86 | |
parent | 6e82de218aa63da6721a0340092dfaff6600b919 (diff) | |
parent | d571690b94bf8f8afc2a30415d3df80602187303 (diff) | |
download | gitlab-ce-7fea09bfaf425dab038636c0058b0c89c9f6da3e.tar.gz |
Merge branch 'winh-karma-sourcemaps' into 'master'
Use inline source maps for karma
Closes #30996
See merge request !11815
-rw-r--r-- | config/karma.config.js | 2 | ||||
-rw-r--r-- | config/webpack.config.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/karma.config.js b/config/karma.config.js index eb082dd28bf..40c58e7771d 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -13,6 +13,8 @@ if (webpackConfig.plugins) { }); } +webpackConfig.devtool = 'cheap-inline-source-map'; + // Karma configuration module.exports = function(config) { var progressReporter = process.env.CI ? 'mocha' : 'progress'; diff --git a/config/webpack.config.js b/config/webpack.config.js index c77b1d6334c..89ef30a972e 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -74,8 +74,6 @@ var config = { chunkFilename: IS_PRODUCTION ? '[name].[chunkhash].chunk.js' : '[name].chunk.js', }, - devtool: 'cheap-module-source-map', - module: { rules: [ { |