huskies: merge 1018

2026-05-14 09:33:50 +00:00
parent 8b2ba1c810
commit 309542cf2c
12 changed files with 360 additions and 7 deletions
@@ -75,7 +75,7 @@ pub fn apply_transition(
        super::Stage::Superseded { superseded_by, .. } => {
            crate::crdt_state::set_resume_to_raw(story_id, &superseded_by.0);
        }
-        super::Stage::Rejected { reason, .. } => {
+        super::Stage::Rejected { reason, .. } | super::Stage::Blocked { reason } => {
            crate::crdt_state::set_resume_to_raw(story_id, reason);
        }
        _ => {}