summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Mountney <dj@gitlab.com>2017-03-01 08:16:55 +0000
committerDJ Mountney <dj@gitlab.com>2017-03-01 08:16:55 +0000
commit512bf6483192a4dac25f7bc335fa6d8b654486db (patch)
treee547b4cf15a64c66c2addbf81407d210ccf752f6
parent8943e22cc4362b7f3fab65151ca20e84c5741c6c (diff)
parentfd994f5771905f4bc8b5a3ee7adcabf2a8c5a9a5 (diff)
downloadgitlab-ce-512bf6483192a4dac25f7bc335fa6d8b654486db.tar.gz
Merge branch '8-17-stable-force-expire-cache' into '8-17-stable'
Expire all webpack assets by altering filename postfix See merge request !9602
-rw-r--r--changelogs/unreleased/8-17-stable-force-expire-cache.yml4
-rw-r--r--config/webpack.config.js2
2 files changed, 5 insertions, 1 deletions
diff --git a/changelogs/unreleased/8-17-stable-force-expire-cache.yml b/changelogs/unreleased/8-17-stable-force-expire-cache.yml
new file mode 100644
index 00000000000..67e447799e1
--- /dev/null
+++ b/changelogs/unreleased/8-17-stable-force-expire-cache.yml
@@ -0,0 +1,4 @@
+---
+title: Expire all webpack assets after 8.17.1 included a badly compiled asset
+merge_request: 9602
+author:
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 912c993cd70..aeb5bfc2dd7 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -42,7 +42,7 @@ var config = {
output: {
path: path.join(ROOT_PATH, 'public/assets/webpack'),
publicPath: '/assets/webpack/',
- filename: IS_PRODUCTION ? '[name]-[chunkhash].js' : '[name].js'
+ filename: IS_PRODUCTION ? '[name]-[chunkhash]-v2.js' : '[name].js'
},
devtool: 'inline-source-map',