summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-08-21 07:19:28 +0000
committerTim Zallmann <tzallmann@gitlab.com>2017-08-21 07:19:28 +0000
commit76499825d61423de9c3960918804fc49f3cc77c2 (patch)
tree17ee0d137eb44ea02d349d4fad824dedda733f30 /config
parent955d684cde2a2d2f382f7977f812686ec7c5a8e5 (diff)
parentc448d18c09c6ac0ec384f3fdf1a42533de1b740d (diff)
downloadgitlab-ce-76499825d61423de9c3960918804fc49f3cc77c2.tar.gz
Merge branch 'fix-broken-yarn-deps' into 'master'
Fix broken Yarn dependencies Closes #33886 and #34944 See merge request !13614
Diffstat (limited to 'config')
-rw-r--r--config/webpack.config.js9
1 files changed, 2 insertions, 7 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index b336320f43e..8aa938d538e 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -276,14 +276,9 @@ if (IS_PRODUCTION) {
})
);
- // zopfli requires a lot of compute time and is disabled in CI
+ // compression can require a lot of compute time and is disabled in CI
if (!NO_COMPRESSION) {
- // gracefully fall back to gzip if `node-zopfli` is unavailable (e.g. in CentOS 6)
- try {
- config.plugins.push(new CompressionPlugin({ algorithm: 'zopfli' }));
- } catch(err) {
- config.plugins.push(new CompressionPlugin({ algorithm: 'gzip' }));
- }
+ config.plugins.push(new CompressionPlugin());
}
}