From fd850e00db835d2b84c59014c3b1021fea2294fc Mon Sep 17 00:00:00 2001
From: Israel Madueme <purelogiq@gmail.com>
Date: Fri, 10 Aug 2018 08:57:01 -0400
Subject: Bug 1456878 - Support markdown comments

---
 extensions/BMO/template/en/default/email/bugmail.html.tmpl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'extensions/BMO/template/en')

diff --git a/extensions/BMO/template/en/default/email/bugmail.html.tmpl b/extensions/BMO/template/en/default/email/bugmail.html.tmpl
index 0b08e4a86..5ca2c2a1b 100644
--- a/extensions/BMO/template/en/default/email/bugmail.html.tmpl
+++ b/extensions/BMO/template/en/default/email/bugmail.html.tmpl
@@ -50,7 +50,12 @@
               at [% comment.creation_ts FILTER time(undef, to_user.timezone) %]
             </b>
           [% END %]
-          <pre class="comment" style="font-size: initial">[% comment.body_full({ wrap => 1 }) FILTER quoteUrls(bug, comment) %]</pre>
+          [% IF comment.is_markdown %]
+            [% comment_tag = 'div' %]
+          [% ELSE %]
+            [% comment_tag = 'pre' %]
+          [% END %]
+          <[% comment_tag FILTER none %] class="comment" style="font-size: initial">[% comment.body_full({ wrap => 1 }) FILTER renderComment(bug, comment) %]</[% comment_tag FILTER none %]>
         </div>
       [% END %]
     </div>
-- 
cgit v1.2.3-24-g4f1b


From ec87e5310ad038abe4b2b329897638d866bf549a Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Tue, 14 Aug 2018 08:28:31 -0400
Subject: Revert "Bug 1456878 - Support markdown comments"

This reverts commit fd850e00db835d2b84c59014c3b1021fea2294fc.
---
 extensions/BMO/template/en/default/email/bugmail.html.tmpl | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'extensions/BMO/template/en')

diff --git a/extensions/BMO/template/en/default/email/bugmail.html.tmpl b/extensions/BMO/template/en/default/email/bugmail.html.tmpl
index 5ca2c2a1b..0b08e4a86 100644
--- a/extensions/BMO/template/en/default/email/bugmail.html.tmpl
+++ b/extensions/BMO/template/en/default/email/bugmail.html.tmpl
@@ -50,12 +50,7 @@
               at [% comment.creation_ts FILTER time(undef, to_user.timezone) %]
             </b>
           [% END %]
-          [% IF comment.is_markdown %]
-            [% comment_tag = 'div' %]
-          [% ELSE %]
-            [% comment_tag = 'pre' %]
-          [% END %]
-          <[% comment_tag FILTER none %] class="comment" style="font-size: initial">[% comment.body_full({ wrap => 1 }) FILTER renderComment(bug, comment) %]</[% comment_tag FILTER none %]>
+          <pre class="comment" style="font-size: initial">[% comment.body_full({ wrap => 1 }) FILTER quoteUrls(bug, comment) %]</pre>
         </div>
       [% END %]
     </div>
-- 
cgit v1.2.3-24-g4f1b


From 7b9e755f32d620dbde04533ec92e8a6e6bde622a Mon Sep 17 00:00:00 2001
From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Mon, 20 Aug 2018 12:23:13 -0400
Subject: Bug 1473958 - Update Thunderbird logo, replace Data Platform and
 Tools icon on easy product selector

---
 extensions/BMO/template/en/default/global/choose-product.html.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'extensions/BMO/template/en')

diff --git a/extensions/BMO/template/en/default/global/choose-product.html.tmpl b/extensions/BMO/template/en/default/global/choose-product.html.tmpl
index 679d812e1..dfa9b5af4 100644
--- a/extensions/BMO/template/en/default/global/choose-product.html.tmpl
+++ b/extensions/BMO/template/en/default/global/choose-product.html.tmpl
@@ -116,7 +116,7 @@
     %]
     [% INCLUDE easyproduct
       name="Data Platform and Tools"
-      icon="sync.png"
+      icon="telemetry.png"
     %]
     <section class="product other">
       <h3>
-- 
cgit v1.2.3-24-g4f1b