From 4d65370797d87d90741f2f3774b7c6dccdb6a7ae Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 11 Jul 2016 10:28:31 -0400
Subject: [PATCH] FIX: `<strike>` was no longer whitelisted

---
 app/assets/javascripts/pretty-text/white-lister.js.es6 | 3 ++-
 test/javascripts/lib/sanitizer-test.js.es6             | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/pretty-text/white-lister.js.es6 b/app/assets/javascripts/pretty-text/white-lister.js.es6
index 090e0dea252..fc6376c3a32 100644
--- a/app/assets/javascripts/pretty-text/white-lister.js.es6
+++ b/app/assets/javascripts/pretty-text/white-lister.js.es6
@@ -149,5 +149,6 @@ whiteListFeature('default', [
   'iframe[frameborder]',
   'iframe[marginheight]',
   'iframe[marginwidth]',
-  'kbd'
+  'kbd',
+  'strike'
 ]);
diff --git a/test/javascripts/lib/sanitizer-test.js.es6 b/test/javascripts/lib/sanitizer-test.js.es6
index 99e9977df09..7da137725a4 100644
--- a/test/javascripts/lib/sanitizer-test.js.es6
+++ b/test/javascripts/lib/sanitizer-test.js.es6
@@ -47,6 +47,7 @@ test("sanitize", function() {
   cooked("<span class=\"bbcode-s\">a</span>", "<p><span class=\"bbcode-s\">a</span></p>", "it sanitizes spans");
 
   cooked("<kbd>Ctrl</kbd>+<kbd>C</kbd>", "<p><kbd>Ctrl</kbd>+<kbd>C</kbd></p>");
+  cooked("it has been <strike>1 day</strike> 0 days since our last test failure", "<p>it has been <strike>1 day</strike> 0 days since our last test failure</p>");
 });
 
 test("urlAllowed", function() {