Bug 1286448 - Remove Splinter Review for GitHub PRs

diff --git a/extensions/Splinter/template/en/default/hook/attachment/edit-action.html.tmpl b/extensions/Splinter/template/en/default/hook/attachment/edit-action.html.tmpl
index 6100deeb7d442a3e504510c55fd489ac7acc6b26..7648e1d7629061c30281dfbc4d0fafed95071f1d 100644 (file)
--- a/extensions/Splinter/template/en/default/hook/attachment/edit-action.html.tmpl
+++ b/extensions/Splinter/template/en/default/hook/attachment/edit-action.html.tmpl
@@ -19,8 +19,7 @@
   #                 David Lawrence <dkl@mozilla.com>
   #%]
 
-[% IF attachment.ispatch
-   || (attachment.mimetype == "text/x-github-pull-request" && attachment.external_redirect) %]
+[% IF attachment.ispatch %]
   &#x0020; |
   <a href="[% Bugzilla.splinter_review_url(attachment.bug_id, attachment.id) FILTER none %]">Review</a>
 [% END %]

diff --git a/extensions/Splinter/template/en/default/hook/attachment/list-action.html.tmpl b/extensions/Splinter/template/en/default/hook/attachment/list-action.html.tmpl
index e22151b508440f09c3cfbdceda856a633229c189..9f196ed8aafe0e91f76908614184456b100e1e2a 100644 (file)
--- a/extensions/Splinter/template/en/default/hook/attachment/list-action.html.tmpl
+++ b/extensions/Splinter/template/en/default/hook/attachment/list-action.html.tmpl
@@ -19,8 +19,7 @@
   #                 David Lawrence <dkl@mozilla.com>
   #%]
 
-[% IF attachment.ispatch
-   || (attachment.mimetype == "text/x-github-pull-request" && attachment.can_review) %]
+[% IF attachment.ispatch %]
   &#x0020; |
   <a href="[% Bugzilla.splinter_review_url(bugid, attachment.id) FILTER none %]">Splinter Review</a>
 [% END %]

diff --git a/extensions/Splinter/template/en/default/pages/splinter.html.tmpl b/extensions/Splinter/template/en/default/pages/splinter.html.tmpl
index 61c81dfa87c1601177a35289fbd2a97f01537b04..76fe3bd79b98e3559dbaa4653f61a0afee85d11a 100644 (file)
--- a/extensions/Splinter/template/en/default/pages/splinter.html.tmpl
+++ b/extensions/Splinter/template/en/default/pages/splinter.html.tmpl
@@ -79,7 +79,7 @@
 
     [% FOREACH attachment = bug.attachments %]
       [% NEXT IF attachment.isprivate && !user.is_insider && attachment.attacher.id != user.id %]
-      [% NEXT IF !attachment.ispatch && !(attachment.mimetype == "text/x-github-pull-request" && attachment.external_redirect) %]
+      [% NEXT UNLESS attachment.ispatch %]
       var attachid = parseInt('[% attachment.id FILTER js %]');
       var attachment = new Splinter.Bug.Attachment('', attachid);
       [% IF attachment.id == attach_id %]
@@ -94,7 +94,7 @@
       attachment.date = Splinter.Bug.parseDate('[% attachment.attached FILTER time("%Y-%m-%d %T %z") FILTER js %]');
       attachment.whoName = Splinter.Utils.strip('[% attachment.attacher.name FILTER js %]');
       attachment.whoEmail = Splinter.Utils.strip('[% attachment.attacher.email FILTER js %]');
-      attachment.isPatch = [% attachment.ispatch || (attachment.mimetype == "text/x-github-pull-request" && attachment.external_redirect) ? 1 : 0 %];
+      attachment.isPatch = [% attachment.ispatch ? 1 : 0 %];
       attachment.isObsolete = [% attachment.isobsolete ? 1 : 0 %];
       attachment.isPrivate = [% attachment.isprivate ? 1 : 0 %];
       attachment.isCRLF = [% attach_is_crlf ? 1 : 0 %];