huskies: merge 988
This commit is contained in:
@@ -115,7 +115,7 @@ pub fn load_pipeline_state(ctx: &AppContext) -> Result<PipelineState, String> {
|
||||
// come from typed CRDT registers. merge_failure detail lives on the
|
||||
// MergeJob CRDT entry (same as status_tools.rs).
|
||||
let view = crate::crdt_state::read_item(sid);
|
||||
let review_hold = if item.stage.is_review_hold() {
|
||||
let review_hold = if matches!(item.stage, Stage::ReviewHold { .. }) {
|
||||
Some(true)
|
||||
} else {
|
||||
None
|
||||
@@ -137,12 +137,21 @@ pub fn load_pipeline_state(ctx: &AppContext) -> Result<PipelineState, String> {
|
||||
} else {
|
||||
None
|
||||
},
|
||||
blocked: if item.stage.is_blocked() {
|
||||
blocked: if matches!(
|
||||
item.stage,
|
||||
Stage::Blocked { .. }
|
||||
| Stage::MergeFailure { .. }
|
||||
| Stage::MergeFailureFinal { .. }
|
||||
| Stage::Archived {
|
||||
reason: crate::pipeline_state::ArchiveReason::Blocked { .. },
|
||||
..
|
||||
}
|
||||
) {
|
||||
Some(true)
|
||||
} else {
|
||||
None
|
||||
},
|
||||
frozen: if item.stage.is_frozen() {
|
||||
frozen: if matches!(item.stage, Stage::Frozen { .. }) {
|
||||
Some(true)
|
||||
} else {
|
||||
None
|
||||
@@ -262,12 +271,21 @@ pub fn load_upcoming_stories(_ctx: &AppContext) -> Result<Vec<UpcomingStory>, St
|
||||
} else {
|
||||
None
|
||||
},
|
||||
blocked: if item.stage.is_blocked() {
|
||||
blocked: if matches!(
|
||||
item.stage,
|
||||
Stage::Blocked { .. }
|
||||
| Stage::MergeFailure { .. }
|
||||
| Stage::MergeFailureFinal { .. }
|
||||
| Stage::Archived {
|
||||
reason: crate::pipeline_state::ArchiveReason::Blocked { .. },
|
||||
..
|
||||
}
|
||||
) {
|
||||
Some(true)
|
||||
} else {
|
||||
None
|
||||
},
|
||||
frozen: if item.stage.is_frozen() {
|
||||
frozen: if matches!(item.stage, Stage::Frozen { .. }) {
|
||||
Some(true)
|
||||
} else {
|
||||
None
|
||||
|
||||
Reference in New Issue
Block a user