Merge branch 'master' into development

* master:
  Bug 1984407 - Phabbugz reviewer rotation has incorrect regex for looking for project names for review rotation
  Bug 1896310 - Attached images are not displayed inline when the bug has no keywords
  Bug 1933892 - missing/misplaced horizontal scrollbar on bug lists

Author: dklawren

extensions/BugModal/web/comments.js

@@ -483,11 +483,17 @@ Bugzilla.BugModal.Comments = class Comments {
    * Prepare to show an attachment inline if possible.
    */
   prepare_inline_attachments() {
-    // Check the connectivity, API support, user setting, bug security and sensitive keywords
-    if ((navigator.connection && navigator.connection.type === 'cellular') ||
-        typeof IntersectionObserver !== 'function' || !BUGZILLA.user.settings.inline_attachments ||
-        BUGZILLA.bug_secure || !BUGZILLA.bug_keywords ||
-        BUGZILLA.bug_keywords.split(', ').find(keyword => keyword.match(/^(hang|assertion|crash)$/))) {
+    // Check the Bugzilla instance parameter, user setting, bug security, sensitive keywords, API
+    // support and connectivity. If any of these conditions are not met, skip the inline attachment
+    // rendering.
+    if (
+      !BUGZILLA.param.allow_attachment_display ||
+      !BUGZILLA.user.settings.inline_attachments ||
+      BUGZILLA.bug_secure ||
+      /\b(?:hang|assertion|crash)\b/.test(BUGZILLA.bug_keywords ?? '') ||
+      typeof IntersectionObserver !== 'function' ||
+      navigator.connection?.type === 'cellular'
+    ) {
       return;
     }
 

extensions/PhabBugz/lib/Util.pm

@@ -597,7 +597,7 @@ sub get_review_rotation_projects {
     next if !$reviewer->{is_project};
 
     # Only interested in reviewer rotation groups
-    next if $reviewer->{user}->name !~ /-reviewer?s-rotation$/;
+    next if $reviewer->{user}->name !~ /-reviewers?-rotation$/;
 
     push @review_projects, $reviewer->{user};
     $is_blocking->{$reviewer->{user}->phid} = $reviewer->{is_blocking} ? 1 : 0;

js/text-editor.js

@@ -729,7 +729,7 @@ Bugzilla.CommentEditor = class CommentEditor extends Bugzilla.TextEditor {
 window.addEventListener(
   'DOMContentLoaded',
   () => {
-    const useMarkdown = BUGZILLA.param.use_markdown === '1';
+    const useMarkdown = BUGZILLA.param.use_markdown;
 
     document
       .querySelectorAll('textarea[name="comment"]:not(.bz_default_hidden)')

skins/standard/buglist.css

@@ -213,15 +213,18 @@ td.bz_total {
   }
 
   .bz_buglist.responsive tbody td {
-    display: flex;
+    display: flow-root;
     gap: 4px;
-    padding: 2px 0 !important;
+    margin-block: 8px;
+    padding: 0 0 0 90px !important;
     width: auto;
     text-align: left;
   }
 
   .bz_buglist.responsive tbody td::before {
     display: block;
+    float: left;
+    margin-inline: -90px 10px;
     min-width: 80px;
     color: var(--secondary-label-color);
     font-size: var(--font-size-small);

skins/standard/global.css

@@ -935,19 +935,18 @@ input[type="radio"]:checked {
 #bugzilla-body {
   display: flow-root;
   position: relative;
-  overflow: auto;
   outline: none;
 }
 
 @media screen {
   :root {
     scroll-padding-top: calc(var(--global-header-height) + var(--private-bug-banner-height, 0px) + 8px);
+    scrollbar-color: var(--scrollbar-color);
   }
 
   body {
     color: var(--application-foreground-color);
     background-color: var(--application-background-color);
-    scrollbar-color: var(--scrollbar-color);
   }
 
   #wrapper {
@@ -971,6 +970,7 @@ input[type="radio"]:checked {
  */
 
 #header {
+  width: 100dvw;
   height: var(--global-header-height);
   color: var(--application-header-foreground-color);
   background-color: var(--application-header-background-color);

template/en/default/global/header.html.tmpl

@@ -123,7 +123,8 @@
                 maxattachmentsize => Param('maxattachmentsize'),
                 maxusermatches => Param('maxusermatches'),
                 splinter_base => Param('splinter_base'),
-                use_markdown => Param('use_markdown'),
+                use_markdown => Param('use_markdown') == '1',
+                allow_attachment_display => Param('allow_attachment_display') == '1',
             },
             constant => {
                 COMMENT_COLS => constants.COMMENT_COLS,