huskies: merge 864

server/src/pipeline_state/tests.rs

@@ -618,7 +618,12 @@ fn regression_freeze_unfreeze_restores_crdt_stage() {
 
     let story_id = "9950_story_freeze_regression";
     let content = "---\nname: Freeze Regression\n---\n# Story\n";
-    crate::db::write_item_with_content(story_id, "2_current", content);
+    crate::db::write_item_with_content(
+        story_id,
+        "2_current",
+        content,
+        crate::db::ItemMeta::from_yaml(content),
+    );
 
     // Confirm starting stage.
     let item = read_typed(story_id).unwrap().unwrap();
@@ -670,6 +675,7 @@ fn merge_failure_transition_emits_event_with_full_reason() {
         story_id,
         "4_merge",
         "---\nname: Merge Failure Event Test\n---\n# Story\n",
+        crate::db::ItemMeta::from_yaml("---\nname: Merge Failure Event Test\n---\n# Story\n"),
     );
 
     let reason = "Conflict in server/src/main.rs: both modified";