huskies: merge 873

This commit is contained in:
dave
2026-04-29 16:05:54 +00:00
parent cf35027b5a
commit 8a7e1aa036
6 changed files with 104 additions and 1 deletions
+6
View File
@@ -320,6 +320,11 @@ pub(super) fn extract_item_view(item: &PipelineItemCrdt) -> Option<PipelineItemV
_ => None,
};
let mergemaster_attempted = match item.mergemaster_attempted.view() {
JsonValue::Bool(b) => Some(b),
_ => None,
};
Some(PipelineItemView {
story_id,
stage,
@@ -332,6 +337,7 @@ pub(super) fn extract_item_view(item: &PipelineItemCrdt) -> Option<PipelineItemV
claimed_at,
merged_at,
qa_mode,
mergemaster_attempted,
})
}