Merge remote-tracking branch 'origin/master' into merge-upstream

Conflicts: app/javascript/styles/mastodon/components.scss
2018-01-20 10:45:43 -06:00
parent 2ca965c704 0b7a0d15c7
commit 071c2c9c85
122 changed files with 819 additions and 694 deletions
--- 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, settings.public_output_path),
+  publicPath: formatPublicPath(env.ASSET_HOST || env.LOCAL_DOMAIN, settings.public_output_path),
 };

 module.exports = {