From 81c009232689bb7c8cb64b135c7b15b94720a970 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Tue, 3 Oct 2017 10:52:28 +0800
Subject: [PATCH] Revert "FIX: not serving non brotli cdns from cdn_url"
This reverts commit eaa896d8eeedbdd28637824cdb26ebf7ef983bc5.
---
app/helpers/application_helper.rb | 2 --
1 file changed, 2 deletions(-)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7aa875341c3..e7d1e7864ec 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -60,8 +60,6 @@ module ApplicationHelper
ENV["COMPRESS_BROTLI"] == "1" &&
request.env["HTTP_ACCEPT_ENCODING"] =~ /br/
path.gsub!("#{GlobalSetting.cdn_url}/assets/", "#{GlobalSetting.cdn_url}/brotli_asset/")
- elsif GlobalSetting.cdn_url
- path.gsub!("#{GlobalSetting.cdn_url}/assets/", "#{GlobalSetting.cdn_url}/cdn_asset/")
end
"<link rel='preload' href='#{path}' as='script'/>
<script src='#{path}'></script>".html_safe