From b6cc6199f320fa0c7ba1706c39f6276f67f58a39 Mon Sep 17 00:00:00 2001
From: Bisaloo <Bisaloo@users.noreply.github.com>
Date: Mon, 4 Sep 2017 07:45:32 +0000
Subject: [PATCH 1/3] [Numergy.com] Simplify and reactivate ruleset

---
 src/chrome/content/rules/Numergy.xml | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/src/chrome/content/rules/Numergy.xml b/src/chrome/content/rules/Numergy.xml
index ff79735eb6c4..b157c3cc5d1f 100644
--- a/src/chrome/content/rules/Numergy.xml
+++ b/src/chrome/content/rules/Numergy.xml
@@ -1,31 +1,14 @@
+<ruleset name="Numergy.com">
 
-<!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://login.numergy.com/ => https://login.numergy.com/: (28, 'Operation timed out after 0 milliseconds with 0 out of 0 bytes received')
-
--->
-<ruleset name="Numergy.com" default_off='failed ruleset test'>
-
-	<!--	Direct rewrites:
-				-->
 	<target host="numergy.com" />
 	<target host="www.numergy.com" />
-
-	<!--	Complications:
-				-->
-	<target host="login.numergy.com" />
-
+	<target host="api.numergy.com" />
+	<target host="cloud.numergy.com" />
+	<target host="login.numergy.com" /><!-- Time out over port 80 -->
+	<target host="support.numergy.com" />
 
 	<securecookie host=".+" name=".+" />
 
-
-	<!--	s://login.../$ redirects to:
-						-->
-	<rule from="^https://login\.numergy\.com:80/"
-		to="https://login.numergy.com/" />
-
-		<test url="https://login.numergy.com:80/login" />
-
 	<rule from="^http:"
 		to="https:" />
 

From 403f412a7cfba2b9e049e629f5fc1cb0a1a4ba0b Mon Sep 17 00:00:00 2001
From: Hugo Gruson <hugo.gruson@openmailbox.org>
Date: Thu, 21 Sep 2017 16:22:06 +0200
Subject: [PATCH 2/3] Rename Numergy.xml to Numergy.com.xml

---
 src/chrome/content/rules/{Numergy.xml => Numergy.com.xml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/chrome/content/rules/{Numergy.xml => Numergy.com.xml} (100%)

diff --git a/src/chrome/content/rules/Numergy.xml b/src/chrome/content/rules/Numergy.com.xml
similarity index 100%
rename from src/chrome/content/rules/Numergy.xml
rename to src/chrome/content/rules/Numergy.com.xml

From c4b5b89e77123088033c49f346d261374ee193a7 Mon Sep 17 00:00:00 2001
From: Hugo Gruson <hugo.gruson@openmailbox.org>
Date: Sun, 12 Nov 2017 16:22:16 +0100
Subject: [PATCH 3/3] Add Numergy.com.xml to ruleset-whitelist.csv

---
 utils/ruleset-whitelist.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv
index f433fd291fef..642910a2685b 100644
--- a/utils/ruleset-whitelist.csv
+++ b/utils/ruleset-whitelist.csv
@@ -3898,3 +3898,4 @@ f76e810891c9301354123b801ace36ba307fff5ae323fb9bb608d8c2757efb36,1,0,Zissousecur
 0a43f73ea001dcef9e970232e3d8d3123f0a4eb163e1d69b23498bff60a735c9,1,1,Zopim.xml
 6750e29d302751af08e3cbe82647eb8a652fba4be1efbed4bb63473ec6ed40c2,1,1,Zorpia.xml
 54f30ba3843ce2be5355b1259c28f6ffe7b3c9feddcbe0de95025bc506e913cf,1,0,Zulius.com.xml
+cc50a9830d7a6ff8d19a2bb287d16061d1c06460547e7751ce3e44db8e3ca24a,0,1,Numergy.com.xml