about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-01-21 13:36:10 -0600
committerDavid Yip <yipdw@member.fsf.org>2018-01-21 13:36:10 -0600
commit1253279febc05c96e4ec875588a0c1c6d723b23c (patch)
treebd4adcddd508239656ff8d37f636af800aa0f742 /config
parent2c578a01d86ef65d1b0117f6fff32a6b57463dde (diff)
parentcfd2b06821a12f6b4aae427dbb9e6707d1cff9dc (diff)
Merge remote-tracking branch 'origin/master' into merge-upstream
 Conflicts:
	app/controllers/settings/two_factor_authentication/confirmations_controller.rb
Diffstat (limited to 'config')
-rw-r--r--config/webpack/configuration.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js
index f6b4d4c61..c58d8028e 100644
--- a/config/webpack/configuration.js
+++ b/config/webpack/configuration.js
@@ -73,7 +73,7 @@ function formatPublicPath(host = '', path = '') {
 
 const output = {
   path: resolve('public', settings.public_output_path),
-  publicPath: formatPublicPath(env.ASSET_HOST || env.LOCAL_DOMAIN, settings.public_output_path),
+  publicPath: formatPublicPath(env.ASSET_HOST || env.WEB_DOMAIN || env.LOCAL_DOMAIN, settings.public_output_path),
 };
 
 module.exports = {