This reverts commit 9551b628d0 (i.e. this is a rollfoward for https://cl.tvl.fyi/c/depot/+/2817)
Change-Id: Iaffcf1cdbe119d26ecb09cc88f9a56436b374c08
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2870
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI
		
	
			
		
			
				
	
	
		
			28 lines
		
	
	
	
		
			1.1 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			28 lines
		
	
	
	
		
			1.1 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From e5c8621646bbde242453a1ac6b0b82f6279789e0 Mon Sep 17 00:00:00 2001
 | 
						|
From: Luke Granger-Brown <git@lukegb.com>
 | 
						|
Date: Sat, 11 Jul 2020 00:46:13 +0000
 | 
						|
Subject: [PATCH 6/7] Always use Google Fonts.
 | 
						|
 | 
						|
We're not a corporate, and we're not behind the GFW. Always use Google Fonts,
 | 
						|
because even though we no longer get the caching benefits (boo, browsers),
 | 
						|
it is still a better geographically-distributed CDN.
 | 
						|
---
 | 
						|
 java/com/google/gerrit/httpd/raw/IndexHtmlUtil.java | 2 +-
 | 
						|
 1 file changed, 1 insertion(+), 1 deletion(-)
 | 
						|
 | 
						|
diff --git a/java/com/google/gerrit/httpd/raw/IndexHtmlUtil.java b/java/com/google/gerrit/httpd/raw/IndexHtmlUtil.java
 | 
						|
index a9cfceb3b6..9c287c6e45 100644
 | 
						|
--- a/java/com/google/gerrit/httpd/raw/IndexHtmlUtil.java
 | 
						|
+++ b/java/com/google/gerrit/httpd/raw/IndexHtmlUtil.java
 | 
						|
@@ -184,7 +184,7 @@ public class IndexHtmlUtil {
 | 
						|
     if (urlParameterMap.containsKey("ce")) {
 | 
						|
       data.put("polyfillCE", "true");
 | 
						|
     }
 | 
						|
-    if (urlParameterMap.containsKey("gf")) {
 | 
						|
+    if (/* urlParameterMap.containsKey("gf") || */ true) {
 | 
						|
       data.put("useGoogleFonts", "true");
 | 
						|
     }
 | 
						|
 
 | 
						|
-- 
 | 
						|
2.29.2
 | 
						|
 |