Merge remote-tracking branch 'bmo/master'

13 files changed, 97 insertions, 114 deletions

diff --git a/template/en/default/admin/admin.html.tmpl b/template/en/default/admin/admin.html.tmpl
index 62a246ceb..09fe00835 100644
--- a/template/en/default/admin/admin.html.tmpl
+++ b/template/en/default/admin/admin.html.tmpl
@@ -56,7 +56,7 @@
         You can also automate this check by running <tt>sanitycheck.pl</tt> from a cron job.
         A notification will be sent per email to the specified user if errors are detected.</dd>
 
-        [% class = (user.in_group('editusers') || user.can_bless) ? "" : "forbidden" %]
+        [% class = (user.in_group('editusers') || user.in_group('disableusers') || user.can_bless) ? "" : "forbidden" %]
         <dt id="users" class="[% class %]"><a href="editusers.cgi">Users</a></dt>
         <dd class="[% class %]">Create new user accounts or edit existing ones. You can
         also add and remove users from groups (also known as "user privileges").</dd>
diff --git a/template/en/default/admin/params/advanced.html.tmpl b/template/en/default/admin/params/advanced.html.tmpl
index 92c84d703..2fe59c533 100644
--- a/template/en/default/admin/params/advanced.html.tmpl
+++ b/template/en/default/admin/params/advanced.html.tmpl
@@ -25,7 +25,7 @@
 %]
 
 [% sts_desc = BLOCK %]
-  Enables the sending of the 
+  Enables the sending of the
   <a href="https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security">Strict-Transport-Security</a>
   header along with HTTP responses on SSL connections. This adds greater
   security to your SSL connections by forcing the browser to always
@@ -67,23 +67,4 @@
 
   disable_bug_updates =>
     "When enabled, all updates to $terms.bugs will be blocked.",
-
-  sentry_uri =>
-    "When set, important errors and warnings will be sent to the"
-    _ " specified Sentry server. Enter the full API KEY URL."
-    _ " eg <kbd>https://01234567890123456780123456780123:01234567890123456780123456780123@errormill.mozilla.org/10</kbd>.",
-
-  metrics_enabled =>
-    "Collect metrics for reporting to ElasticSearch",
-  metrics_user_ids =>
-    "Comma separated list of user_id's which trigger data collection and reporting."
-    _ " eg <kbd>3881,5038,5898,13647,20209,251051,373476,409787</kbd>.",
-  metrics_elasticsearch_server =>
-    "Metrics ElasticSearch server and port. eg <kbd>127.0.0.1:9200</kbd>",
-  metrics_elasticsearch_index =>
-    "Metrics ElasticSearch index. eg <kbd>bmo-metrics</kbd>",
-  metrics_elasticsearch_type =>
-    "Metrics ElasticSearch type. eg <kbd>timings</kbd>",
-  metrics_elasticsearch_ttl =>
-    "The time to live for data in the ElasticSearch cluster, in milliseconds. eg <kbd>1210000000</kbd>",
 } %]
diff --git a/template/en/default/admin/users/edit.html.tmpl b/template/en/default/admin/users/edit.html.tmpl
index 4eb62e763..de9826800 100644
--- a/template/en/default/admin/users/edit.html.tmpl
+++ b/template/en/default/admin/users/edit.html.tmpl
@@ -68,9 +68,10 @@ $(function() {
 <form method="post" action="editusers.cgi">
 <table class="main">
   [% PROCESS admin/users/userdata.html.tmpl
-    editform  = 1
-    editusers = editusers
-    otheruser = otheruser
+    editform     = 1
+    editusers    = editusers
+    disableusers = disableusers
+    otheruser    = otheruser
   %]
   [% IF groups.size %]
     <tr>
@@ -125,43 +126,46 @@ $(function() {
     </tr>
   [% END %]
 
-  <tr>
-    <th>Product responsibilities:</th>
-    <td>
-      [% IF otheruser.product_responsibilities.size %]
-        [% PROCESS admin/users/responsibilities.html.tmpl otheruser = otheruser %]
-      [% ELSE %]
-        <em>none</em>
-      [% END %]
-    </td>
-  </tr>
-
-  [% IF otheruser.groups_owned.size %]
+  [% IF editusers %]
     <tr>
-      <th>Groups Owned:</th>
+      <th>Product responsibilities:</th>
       <td>
-        [% can_edit_groups = user.in_group('creategroups') %]
-        [% FOREACH group = otheruser.groups_owned %]
-          [% IF can_edit_groups %]
-            <a href="[% urlbase FILTER none %]editgroups.cgi?action=changeform&amp;group=[% group.id FILTER none %]">
+        [% IF otheruser.product_responsibilities.size %]
+          [% PROCESS admin/users/responsibilities.html.tmpl otheruser = otheruser %]
+        [% ELSE %]
+          <em>none</em>
+        [% END %]
+      </td>
+    </tr>
+
+    [% IF otheruser.groups_owned.size %]
+      <tr>
+        <th>Groups Owned:</th>
+        <td>
+          [% can_edit_groups = user.in_group('creategroups') %]
+          [% FOREACH group = otheruser.groups_owned %]
+            [% IF can_edit_groups %]
+              <a href="[% urlbase FILTER none %]editgroups.cgi?action=changeform&amp;group=[% group.id FILTER none %]">
+            [% END %]
+            [% group.name FILTER html %]
+            [% '</a>' IF can_edit_groups %]<br>
           [% END %]
-          [% group.name FILTER html %]
-          [% '</a>' IF can_edit_groups %]<br>
+        </td>
+      </tr>
+    [% END %]
+
+    <tr>
+      <th>Last Login:</th>
+      <td>
+        [% IF otheruser.last_seen_date %]
+          [% otheruser.last_seen_date FILTER html %]
+        [% ELSE %]
+          <em>never</em>
         [% END %]
       </td>
     </tr>
   [% END %]
 
-  <tr>
-    <th>Last Login:</th>
-    <td>
-      [% IF otheruser.last_seen_date %]
-        [% otheruser.last_seen_date FILTER html %]
-      [% ELSE %]
-        <em>never</em>
-      [% END %]
-    </td>
-  </tr>
 </table>
 
 <p>
@@ -171,11 +175,10 @@ $(function() {
   <input type="hidden" name="token" value="[% token FILTER html %]">
   [% INCLUDE listselectionhiddenfields %]
 
-  [% IF editusers %], [% ELSE %] or [% END %]
-  <a href="editusers.cgi?action=activity&amp;userid=[% otheruser.id %]"
+  [% IF editusers %]
+    , <a href="editusers.cgi?action=activity&amp;userid=[% otheruser.id %]"
      title="View Account History for '
      [%- otheruser.login FILTER html %]'">View Account History</a>
-  [% IF editusers %]
     or <a href="editusers.cgi?action=admin_activity&amp;userid=[% otheruser.id %]"
           title="View Account History for '
           [%- otheruser.login FILTER html %]'">View Admin History</a>
diff --git a/template/en/default/admin/users/list.html.tmpl b/template/en/default/admin/users/list.html.tmpl
index 3ebfc2970..db425b40d 100644
--- a/template/en/default/admin/users/list.html.tmpl
+++ b/template/en/default/admin/users/list.html.tmpl
@@ -45,23 +45,24 @@
    {name               => 'last_seen_date'
     heading            => 'Last Login'
    }
-   {heading            => 'Account History'
-    content            => 'View'
-    contentlink        => 'editusers.cgi?action=activity' _
-                                  '&amp;userid=%%userid%%' _
-                                  listselectionurlparams
-   }
   ]
 %]
 
 [% IF editusers %]
   [% columns.push({
+    heading            => 'Account History'
+    content            => 'View'
+    contentlink        => 'editusers.cgi?action=activity' _
+                                  '&amp;userid=%%userid%%' _
+                                  listselectionurlparams
+   }
+   {
      heading     => 'Admin History'
      content     => 'View'
      contentlink => 'editusers.cgi?action=admin_activity' _
                             '&amp;userid=%%userid%%' _
                             listselectionurlparams
-   })  
+   })
   %]
 [% END %]
 
diff --git a/template/en/default/admin/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl
index 449a1b143..c4ab07010 100644
--- a/template/en/default/admin/users/userdata.html.tmpl
+++ b/template/en/default/admin/users/userdata.html.tmpl
@@ -54,7 +54,7 @@
 <tr>
   <th><label for="name">Real name:</label></th>
   <td>
-    [% IF editusers %]
+    [% IF editusers || disableusers %]
       <input size="64" maxlength="255" name="name"
              autocomplete="off"
              id="name" value="[% otheruser.name FILTER html %]">
@@ -94,7 +94,9 @@
       [% END %]
     </td>
   </tr>
+[% END %]
 
+[% IF editusers || disableusers %]
   <tr>
     <th><label for="disable_mail">[% terms.Bug %]mail Disabled:</label></th>
     <td>
@@ -122,30 +124,31 @@
       explain why.)
     </td>
   </tr>
-  [% IF editform %]
-    <tr>
-      <th><label for="mfa">Two-factor Auth:</label></th>
-      <td>
-        [% IF user.in_group('bz_can_disable_mfa') %]
-          [% IF otheruser.mfa %]
-            <select name="mfa" value="mfa">
-              <option value="">Disable</option>
-              [% SWITCH otheruser.mfa %]
-                [% CASE "TOTP" %]
-                  <option value="TOTP" selected>Enabled - TOTP</option>
-                [% CASE "Duo" %]
-                  <option value="Duo" selected>Enabled - Duo Security</option>
-              [% END %]
-            </select>
-          [% ELSE %]
-            Disabled
-          [% END %]
+[% END %]
+
+[% IF editform && editusers %]
+  <tr>
+    <th><label for="mfa">Two-factor Auth:</label></th>
+    <td>
+      [% IF user.in_group('bz_can_disable_mfa') %]
+        [% IF otheruser.mfa %]
+          <select name="mfa" value="mfa">
+            <option value="">Disable</option>
+            [% SWITCH otheruser.mfa %]
+              [% CASE "TOTP" %]
+                <option value="TOTP" selected>Enabled - TOTP</option>
+              [% CASE "Duo" %]
+                <option value="Duo" selected>Enabled - Duo Security</option>
+            [% END %]
+          </select>
         [% ELSE %]
-          [% otheruser.mfa ? "Enabled - " _ otheruser.mfa : "Disabled" FILTER html %]
+          Disabled
         [% END %]
-      </td>
-    </tr>
-  [% END %]
+      [% ELSE %]
+        [% otheruser.mfa ? "Enabled - " _ otheruser.mfa : "Disabled" FILTER html %]
+      [% END %]
+    </td>
+  </tr>
 [% END %]
 
 [% Hook.process('end') %]
diff --git a/template/en/default/attachment/createformcontents.html.tmpl b/template/en/default/attachment/createformcontents.html.tmpl
index 41a02a913..efb24e3e9 100644
--- a/template/en/default/attachment/createformcontents.html.tmpl
+++ b/template/en/default/attachment/createformcontents.html.tmpl
@@ -37,7 +37,8 @@
     <em>Enter the path to the file on your computer</em> (or
     <a id="attachment_data_controller">
     paste text as attachment</a>).<br>
-    <input type="file" id="data" name="data" size="50">
+    <input type="file" id="data" name="data" size="50" aria-errormessage="data-error" aria-invalid="false">
+    <div id="data-error" class="warning" aria-live="assertive"><div>
   </td>
 </tr>
 <tr class="attachment_text_field">
@@ -69,7 +70,7 @@
     [%# Reset this whenever the page loads so that the JS state is up to date %]
     <script [% script_nonce FILTER none %]>
       $(function() {
-        $("#file").on("change", function() {
+        $("#data").on("change", function() {
           DataFieldHandler();
           // Fire event to keep take-bug in sync.
           $("#ispatch").change();
@@ -119,6 +120,7 @@
                   {type => "image/gif",  desc => "GIF image"},
                   {type => "image/jpeg", desc => "JPEG image"},
                   {type => "image/png",  desc => "PNG image"},
+                  {type => "image/svg+xml", desc => "SVG image"},
                   {type => "application/pdf", desc => "PDF document"},
                   {type => "application/octet-stream", desc => "binary file"}]
   %]
diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl
index c28d5dfd6..6a7bb4b9b 100644
--- a/template/en/default/attachment/show-multiple.html.tmpl
+++ b/template/en/default/attachment/show-multiple.html.tmpl
@@ -35,7 +35,7 @@
 %]
 [% IF hide_obsolete %]
   <div id="hidden_obsolete_message">
-    Obsolete attachments are hidden. To view all attachments (including obsolete) 
+    Obsolete attachments are hidden. To view all attachments (including obsolete)
     <a href="attachment.cgi?bugid=[% bug.id FILTER html %]&amp;action=viewall">click here</a>.
   </div>
 [% END %]
@@ -106,7 +106,7 @@
     [% END %]
   [% ELSE %]
     <p><b>
-      Attachment cannot be viewed because its MIME type is not text/*, image/*, or application/vnd.mozilla.*.
+      Attachment cannot be viewed because its MIME type is not text/*, image/*, or application/pdf.
       <a href="attachment.cgi?id=[% a.id %]">Download the attachment instead</a>.
     </b></p>
   [% END %]
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index bf1ff5ad3..b37e7ca7b 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -532,9 +532,6 @@
    admindocslinks = admindocslinks
 %]
 
-[%# return the generated error_message for sentry %]
-[% processed.error_message = error_message %]
-
 <p>
   [% terms.Bugzilla %] has suffered an internal error:
 </p>
@@ -543,13 +540,6 @@
   [% error_message FILTER none %]
 </p>
 
-[% IF maintainers_notified %]
-<p>
-  The [% terms.Bugzilla %] maintainers have been notified of this error
-  [#[% uid FILTER html %]].
-</p>
-[% END %]
-
 [% IF variables %]
   <pre>
 Variables:
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 1d304ad04..153137394 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -101,11 +101,12 @@
     [% IF Bugzilla.cgi.should_block_referrer %]
       <meta name="referrer" content="origin">
     [% ELSE %]
-      <meta name="referrer" content="origin-when-crossorigin">
+      <meta name="referrer" content="origin-when-cross-origin">
     [% END %]
 
     [%- js_BUGZILLA = {
             param => {
+                maxattachmentsize => Param('maxattachmentsize'),
                 maxusermatches => Param('maxusermatches'),
                 splinter_base => Param('splinter_base'),
             },
@@ -294,7 +295,7 @@
           <li role="presentation">
             <a href="report.cgi" role="menuitem" tabindex="-1">Reports</a>
           </li>
-          [% IF user.in_group('tweakparams') || user.in_group('editusers') || user.can_bless
+          [% IF user.in_group('tweakparams') || user.in_group('editusers') || user.can_bless || user.in_group('disableusers')
                 || (Param('useclassification') && user.in_group('editclassifications'))
                 || user.in_group('editcomponents') || user.in_group('admin') || user.in_group('creategroups')
                 || user.in_group('editkeywords') || user.in_group('bz_canusewhines')
diff --git a/template/en/default/global/site-navigation.html.tmpl b/template/en/default/global/site-navigation.html.tmpl
index 06b0eaa92..510875422 100644
--- a/template/en/default/global/site-navigation.html.tmpl
+++ b/template/en/default/global/site-navigation.html.tmpl
@@ -69,22 +69,22 @@
   [% END %]
 
   [%# *** Bugzilla Administration Tools *** %]
-  [% IF user.login %] 
-    [% '<link rel="Administration" title="Parameters"    
+  [% IF user.login %]
+    [% '<link rel="Administration" title="Parameters"
               href="editparams.cgi">' IF user.in_group('tweakparams') %]
-    [% '<link rel="Administration" title="Users"    
-              href="editusers.cgi">' IF user.in_group('editusers') %]
+    [% '<link rel="Administration" title="Users"
+              href="editusers.cgi">' IF user.in_group('editusers') || user.in_group('disableusers') %]
     [% '<link rel="Administration" title="Products" href="editproducts.cgi">'
        IF user.in_group('editcomponents') || user.get_products_by_permission("editcomponents").size %]
-    [% '<link rel="Administration" title="Flag Types"   
+    [% '<link rel="Administration" title="Flag Types"
               href="editflagtypes.cgi">' IF user.in_group('editcomponents') %]
-    [% '<link rel="Administration" title="Groups"        
+    [% '<link rel="Administration" title="Groups"
               href="editgroups.cgi">' IF user.in_group('creategroups') %]
-    [% '<link rel="Administration" title="Keywords"      
+    [% '<link rel="Administration" title="Keywords"
               href="editkeywords.cgi">' IF user.in_group('editkeywords') %]
-    [% '<link rel="Administration" title="Whining"       
+    [% '<link rel="Administration" title="Whining"
               href="editwhines.cgi">' IF user.in_group('bz_canusewhines') %]
-    [% '<link rel="Administration" title="Sanity Check"  
+    [% '<link rel="Administration" title="Sanity Check"
               href="sanitycheck.cgi">' IF user.in_group('editcomponents') %]
-  [% END %]  
+  [% END %]
 [% END %]
diff --git a/template/en/default/global/user.html.tmpl b/template/en/default/global/user.html.tmpl
index caea27c46..876d12805 100644
--- a/template/en/default/global/user.html.tmpl
+++ b/template/en/default/global/user.html.tmpl
@@ -28,7 +28,7 @@
     [% IF user.id %]
       <a class="email" href="mailto:[% who.email FILTER html %]"
          onclick="return show_usermenu([% who.id FILTER none %], '[% who.email FILTER js %]',
-                  [% user.in_group('editusers') || user.bless_groups.size > 0 ? "true" : "false" %]);"
+                  [% user.in_group('editusers') || user.in_group('disableusers') || user.bless_groups.size > 0 ? "true" : "false" %]);"
         title="[% who.identity FILTER html %]">
     [%- END -%]
     [% IF who %]
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index 177025686..2aff68615 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -30,6 +30,7 @@
    header = "Main Page" 
    style_urls = [ 'skins/standard/index.css' ]
    no_yui = 1
+   og_image = "extensions/OpenGraph/web/moz-social-bw-rgb-1200x1200.png"
 %]
 
 <div id="page-index">
diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index 5fc860519..8726a8b13 100644
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -181,6 +181,7 @@ For the "Difference Between Two Patches" feature to work, we need to know
 what directory the "diff" bin is in. (You only need to set this if you
 are using that feature of the Patch Viewer.)
 END
+    localconfig_tct_bin => 'Path to tct (tocotrienol) a gpg replacement.',
     localconfig_inbound_proxies => <<'END',
 This is a list of IP addresses that we expect proxies to come from.
 This can be '*' if only the load balancer can connect.
@@ -270,7 +271,7 @@ This is the max amount of unshared memory the apache process is allowed to use
 before Apache::SizeLimit kills it. This is only applicable when run under mod_perl.
 EOT
     localconfig_shadowdb_user => <<EOT,
-The username used to authenticate to the shadow db. 
+The username used to authenticate to the shadow db.
 EOT
     localconfig_shadowdb_pass => <<EOT,
 The password used to authenticate to the shadow db.