diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-15 15:45:40 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-15 15:45:40 +0000 |
| commit | cc0c2d18445a9115e87594c22cb47fcb1e8e5c41 (patch) | |
| tree | a0e27c4337e3b6bfd3701fba0a98f40ade1e3eae /config/webpack.config.js | |
| parent | 178b6014f856dbca1653961a1f8341d7d1d38d2f (diff) | |
| parent | 4ca6a719a9f961efa8e9b2a9401319cbfc6403df (diff) | |
| download | gitlab-ce-zj-remove-deprecated-ci-service.tar.gz | |
Merge branch 'master' into 'zj-remove-deprecated-ci-service'zj-remove-deprecated-ci-service
# Conflicts:
# db/schema.rb
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 2ac779c8511..5d5e4bb570a 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -54,6 +54,7 @@ var config = { exclude: /(node_modules|vendor\/assets)/, loader: 'babel-loader', options: { + plugins: ['istanbul'], presets: [ ["es2015", {"modules": false}], 'stage-2' |