diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-10-03 20:38:43 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-10-03 20:38:43 +0000 |
| commit | 5ed4716a14b9a3abd184c8503e6a1e492806d8de (patch) | |
| tree | af3f45bbffd3b51e3ba185c3e516b53820bb0c19 /config | |
| parent | 8a8ae2f57fe0db9b33f100e9a68c9eac4fd71c4d (diff) | |
| parent | 5d8967f3af3acdc69dc0681d98450c92c78f0f6b (diff) | |
| download | gitlab-ce-5ed4716a14b9a3abd184c8503e6a1e492806d8de.tar.gz | |
Merge branch '43511-upgrade-to-babel-7' into 'master'
Upgrade to Babel 7
Closes #43511
See merge request gitlab-org/gitlab-ce!22059
Diffstat (limited to 'config')
| -rw-r--r-- | config/dependency_decisions.yml | 14 | ||||
| -rw-r--r-- | config/karma.config.js | 9 |
2 files changed, 22 insertions, 1 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index 664035831a5..62760ffee3a 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -585,3 +585,17 @@ and are therefore exempt. :versions: [] :when: 2018-08-30 12:06:35.668181000 Z +- - :approve + - caniuse-lite + - :who: Mike Greiling + :why: CC-BY-4.0 license. Tool only used during build process, code is not present + in compiled/distributed product so attribution not needed. + :versions: [] + :when: 2018-10-02 19:23:11.221660000 Z +- - :approve + - node-releases + - :who: Mike Greiling + :why: CC-BY-4.0 license. Tool only used during build process, code is not present + in compiled/distributed product so attribution not needed. + :versions: [] + :when: 2018-10-02 19:23:54.840151000 Z diff --git a/config/karma.config.js b/config/karma.config.js index 74dc5c13c70..e1d7c30b1c2 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -22,6 +22,13 @@ webpackConfig.optimization.splitChunks = false; // use quicker sourcemap option webpackConfig.devtool = 'cheap-inline-source-map'; +// set BABEL_ENV to indicate when we're running code coverage +webpackConfig.plugins.push( + new webpack.DefinePlugin({ + 'process.env.BABEL_ENV': JSON.stringify(process.env.BABEL_ENV || process.env.NODE_ENV || null), + }) +); + const specFilters = argumentsParser .option( '-f, --filter-spec [filter]', @@ -84,7 +91,7 @@ module.exports = function(config) { basePath: ROOT_PATH, browsers: ['ChromeHeadlessCustom'], client: { - color: !process.env.CI + color: !process.env.CI, }, customLaunchers: { ChromeHeadlessCustom: { |