summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-02-15 17:57:51 -0600
committerEric Eastwood <contact@ericeastwood.com>2017-02-15 18:04:58 -0600
commit21dd33be46f02635ba8be711721056e3762db870 (patch)
treed199362d9a59019f7f5d03e43afb78e108738736 /config
parent1452729304393978ec93b712130dff6687db01b9 (diff)
downloadgitlab-ce-21dd33be46f02635ba8be711721056e3762db870.tar.gz
Pick up option from gdk to disable webpack dev server livereload28204-option-to-disable-webpack-dev-server-livereload
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/28204
Diffstat (limited to 'config')
-rw-r--r--config/webpack.config.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 5d5e4bb570a..be9bdb14a82 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -10,6 +10,7 @@ var ROOT_PATH = path.resolve(__dirname, '..');
var IS_PRODUCTION = process.env.NODE_ENV === 'production';
var IS_DEV_SERVER = process.argv[1].indexOf('webpack-dev-server') !== -1;
var DEV_SERVER_PORT = parseInt(process.env.DEV_SERVER_PORT, 10) || 3808;
+var DEV_SERVER_LIVERELOAD = process.env.DEV_SERVER_LIVERELOAD !== 'false';
var config = {
context: path.join(ROOT_PATH, 'app/assets/javascripts'),
@@ -120,6 +121,7 @@ if (IS_DEV_SERVER) {
port: DEV_SERVER_PORT,
headers: { 'Access-Control-Allow-Origin': '*' },
stats: 'errors-only',
+ inline: DEV_SERVER_LIVERELOAD
};
config.output.publicPath = '//localhost:' + DEV_SERVER_PORT + config.output.publicPath;
}