huskies: merge 1018
This commit is contained in:
@@ -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);
|
||||
}
|
||||
_ => {}
|
||||
|
||||
@@ -203,7 +203,9 @@ pub fn transition(state: Stage, event: PipelineEvent) -> Result<Stage, Transitio
|
||||
(Backlog, Block { reason })
|
||||
| (Coding { .. }, Block { reason })
|
||||
| (Qa, Block { reason })
|
||||
| (Merge { .. }, Block { reason }) => Ok(Blocked { reason }),
|
||||
| (Merge { .. }, Block { reason })
|
||||
| (MergeFailure { .. }, Block { reason })
|
||||
| (MergeFailureFinal { .. }, Block { reason }) => Ok(Blocked { reason }),
|
||||
|
||||
// Story 945: ReviewHold no longer auto-archives. It transitions the
|
||||
// story to `Stage::ReviewHold { resume_to, reason }`, preserving the
|
||||
|
||||
Reference in New Issue
Block a user