diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-12-21 18:27:56 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-12-21 18:27:56 +0000 |
| commit | baa6438b966a3f96041c8069a81836a7cd1e9a65 (patch) | |
| tree | ebf8d408db26350068e5967884cfd5454dd75e70 /config | |
| parent | f13b9bbb97871164430ee74df8fe5643a5a94fe6 (diff) | |
| parent | a69e7affbca9bbfe8fb9a51ab1646f81d8ade339 (diff) | |
| download | gitlab-ce-baa6438b966a3f96041c8069a81836a7cd1e9a65.tar.gz | |
Merge branch 'diff-worker-js-fix' into 'master'
Fixed diff_worker not compiling correctly
Closes #41182
See merge request gitlab-org/gitlab-ce!15966
Diffstat (limited to 'config')
| -rw-r--r-- | config/webpack.config.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index f7063442618..1218b0ef208 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -118,7 +118,10 @@ var config = { }, { test: /\_worker\.js$/, - loader: 'worker-loader', + use: [ + { loader: 'worker-loader' }, + { loader: 'babel-loader' }, + ], }, { test: /\.(worker(\.min)?\.js|pdf|bmpr)$/, |