summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-05-24 14:18:59 +0000
committerMike Greiling <mike@pixelcog.com>2018-05-24 14:18:59 +0000
commit76b2c31ddbd79edd206e321e11344bdd731f5b66 (patch)
treea536d5b07565a0bf60feb6d280bcdbeba2c71a33 /config
parent05170e0d4731da2bd1920c91f1e9c9cbed3c4f17 (diff)
parente78b2190f82e75aae763492fdf86a3df31719ae4 (diff)
downloadgitlab-ce-76b2c31ddbd79edd206e321e11344bdd731f5b66.tar.gz
Merge branch '46741-add-access-control-allow-headers-wds' into 'master'
Add `Access-Control-Allow-Headers` to Webpack Dev Server config Closes #46741 See merge request gitlab-org/gitlab-ce!19131
Diffstat (limited to 'config')
-rw-r--r--config/webpack.config.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 27050e7069d..d6ab32972fb 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -306,7 +306,10 @@ module.exports = {
host: DEV_SERVER_HOST,
port: DEV_SERVER_PORT,
disableHostCheck: true,
- headers: { 'Access-Control-Allow-Origin': '*' },
+ headers: {
+ 'Access-Control-Allow-Origin': '*',
+ 'Access-Control-Allow-Headers': '*',
+ },
stats: 'errors-only',
hot: DEV_SERVER_LIVERELOAD,
inline: DEV_SERVER_LIVERELOAD,