Merge branch 'master' into development

* master:
  Bumped version to 20251022.2
  Bug 1995787 - Add Cache-Control: no-store or Cache-Control: private to all attachments to prevent CDN from caching private attachments that are mistaken as static assets
  Bumped version to 20251022.1
  Bug 1995616 - Bugzilla home page needs to top align messages and other warnings
  Bug 1981211 - when uploading patches that have .toml file changes and the reviewer is #intermittent-reviewers, do not add group reviewers as blocking

Author: dklawren

Bugzilla.pm

@@ -13,7 +13,7 @@ use warnings;
 
 use Bugzilla::Logging;
 
-our $VERSION = '20251021.1';
+our $VERSION = '20251022.2';
 
 use Bugzilla::Auth;
 use Bugzilla::Auth::Persist::Cookie;

attachment.cgi

@@ -423,7 +423,8 @@ sub view {
   print $cgi->header(
     -type                => $contenttype,
     -content_disposition => "$disposition; filename*=$filename_star",
-    -content_length      => $attachment->datasize
+    -content_length      => $attachment->datasize,
+    -Cache_Control       => 'no-store, private'
   );
   disable_utf8();
   print $attachment->data;

extensions/PhabBugz/lib/Util.pm

@@ -26,7 +26,7 @@ use Try::Tiny;
 use Type::Params qw( compile );
 use Type::Utils;
 use Types::Standard qw( :types );
-use Mojo::JSON qw(encode_json);
+use Mojo::JSON      qw(encode_json);
 
 use base qw(Exporter);
 
@@ -658,8 +658,8 @@ sub set_intermittent_reviewers {
     return;
   }
 
-  # Now we need to remove the intermittent-reviewers project and the taskgraph-reviewers project,
-  # and move any remaining to the subscribers list
+  # Now we need to remove any blocking project that is not intermittent-reviewers and
+  # taskgraph-reviewers project and move them to the subscribers list
   foreach my $project (@blocking_projects) {
     next if $project->name eq 'intermittent-reviewers' || $project->name eq 'taskgraph-reviewers';
 

skins/standard/global.css

@@ -1551,17 +1551,23 @@ input[type="radio"]:checked {
 }
 
 #message-container .warning {
-  color: var(--error-message-foreground-color);
+  color: var(--neutral-banner-foreground-color);
   background-color: var(--error-message-background-color);
 }
 
+#message-container .warning a {
+  color: inherit;
+  text-decoration: underline;
+  font-weight: 500;
+}
+
 #message-container .new_announcement {
-  color: var(--primary-label-color);
+  color: var(--neutral-banner-foreground-color);
   background-color: var(--informative-message-background-color);
 }
 
 #message-container .new_announcement p.warning {
-  color: var(--error-message-foreground-color);
+  color: var(--neutral-banner-foreground-color);
 }
 
 /* Reset legacy style */

skins/standard/index.css

@@ -7,11 +7,21 @@
  */
 
 #bugzilla-body:has(#home) {
+  display: flex;
+  flex-direction: column;
+  min-height: calc(100dvh - var(--global-header-height));
+}
+
+#bugzilla-body:has(#home) #message-container {
+  flex: none;
+}
+
+#main-inner:has(#home) {
+  flex: auto;
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  min-height: calc(100dvh - var(--global-header-height));
 }
 
 #home {

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

@@ -462,6 +462,16 @@
       </div>
     </div>
   [% END %]
+  [%# Show banner for users who have email disabled due to bounces %]
+  [% IF user.bounce_count AND user.email_disabled %]
+    <div id="message">
+      Change notification emails have been disabled for your account due to issues delivering to your address.
+      <a href="/bounced_emails/[% user.id FILTER uri %]" id="bounced_emails_link">View recent errors and reactivate email</a>.
+    </div>
+  [% END %]
+  [% IF message %]
+    <div id="message">[% message %]</div>
+  [% END %]
 </aside>
 
 <div id="main-inner">
@@ -473,18 +483,6 @@
   <h2>[% header FILTER none %]</h2>
 [% END %]
 
-[%# Show banner for users who have email disabled due to bounces %]
-[% IF user.bounce_count AND user.email_disabled %]
-  <div id="message">
-    Change notification emails have been disabled for your account due to issues delivering to your address.
-    <a href="/bounced_emails/[% user.id FILTER uri %]" id="bounced_emails_link">View recent errors and reactivate email</a>.
-  </div>
-[% END %]
-
-[% IF message %]
-  <div id="message">[% message %]</div>
-[% END %]
-
 [% BLOCK primary_links %]
   <li role="none">
     <a class="header-button" href="[% basepath FILTER none %]describecomponents.cgi"