huskies: merge 984

server/src/service/notifications/format.rs

@@ -22,6 +22,9 @@ pub fn stage_display_name(stage: &Stage) -> &'static str {
         Stage::MergeFailureFinal { .. } => "MergeFailureFinal",
         Stage::Frozen { .. } => "Frozen",
         Stage::ReviewHold { .. } => "ReviewHold",
+        Stage::Abandoned { .. } => "Abandoned",
+        Stage::Superseded { .. } => "Superseded",
+        Stage::Rejected { .. } => "Rejected",
     }
 }
 

server/src/service/timer/io.rs

@@ -242,7 +242,13 @@ pub async fn tick_once(
         if let Ok(Some(item)) = crate::pipeline_state::read_typed(&entry.story_id) {
             use crate::pipeline_state::Stage;
             match &item.stage {
-                Stage::Qa | Stage::Merge { .. } | Stage::Done { .. } | Stage::Archived { .. } => {
+                Stage::Qa
+                | Stage::Merge { .. }
+                | Stage::Done { .. }
+                | Stage::Archived { .. }
+                | Stage::Abandoned { .. }
+                | Stage::Superseded { .. }
+                | Stage::Rejected { .. } => {
                     crate::slog!(
                         "[timer] Skipping timer for story {} — currently in '{}', \
                          not in backlog/current; timer is stale",

server/src/service/ws/message/convert.rs

@@ -248,6 +248,7 @@ mod tests {
                 depends_on: None,
                 epic_id: None,
             }],
+            closed: vec![],
             deterministic_merges_in_flight: vec![],
         };
         let resp = pipeline_state_to_response(state);
@@ -271,6 +272,7 @@ mod tests {
             qa: vec![],
             merge: vec![],
             done: vec![],
+            closed: vec![],
             deterministic_merges_in_flight: vec![],
         };
         let resp = pipeline_state_to_response(state);
@@ -308,6 +310,7 @@ mod tests {
             qa: vec![],
             merge: vec![],
             done: vec![],
+            closed: vec![],
             deterministic_merges_in_flight: vec![],
         };
         let resp: WsResponse = state.into();