From b1daa71da5f9579fb064be444e73337162926c26 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 24 Jan 2018 02:57:14 +0100 Subject: Fix #6311: Replace relative URLs in CSS only for Premailer (#6335) --- lib/mastodon/premailer_webpack_strategy.rb | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/mastodon/premailer_webpack_strategy.rb b/lib/mastodon/premailer_webpack_strategy.rb index 84d83cc66..3382ef3b4 100644 --- a/lib/mastodon/premailer_webpack_strategy.rb +++ b/lib/mastodon/premailer_webpack_strategy.rb @@ -2,16 +2,21 @@ module PremailerWebpackStrategy def load(url) - public_path_host = ENV['ASSET_HOST'] || ENV['LOCAL_DOMAIN'] - url = url.gsub(/\A\/\/#{public_path_host}/, '') + asset_host = ENV['ASSET_HOST'] || ENV['WEB_DOMAIN'] || ENV['LOCAL_DOMAIN'] if Webpacker.dev_server.running? - url = File.join("#{Webpacker.dev_server.protocol}://#{Webpacker.dev_server.host_with_port}", url) - HTTP.get(url).to_s - else - url = url[1..-1] if url.start_with?('/') - File.read(Rails.root.join('public', url)) + asset_host = "#{Webpacker.dev_server.protocol}://#{Webpacker.dev_server.host_with_port}" + url = File.join(asset_host, url) end + + css = if url.start_with?('http') + HTTP.get(url).to_s + else + url = url[1..-1] if url.start_with?('/') + File.read(Rails.root.join('public', url)) + end + + css.gsub(/url\(\//, "url(#{asset_host}/") end module_function :load -- cgit From e6db3427b7dcbcdfdc5d8d01a9ad426ee6151f4b Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 24 Jan 2018 04:16:30 +0100 Subject: Bump to 2.2.0rc2 --- lib/mastodon/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 098ab46ac..dba09a070 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -21,7 +21,7 @@ module Mastodon end def flags - 'rc1' + 'rc2' end def to_a -- cgit