mirror of
https://seed.radicle.dev/rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git
synced 2026-11-21 14:20:42 +08:00
Use the new Merge scheme for Patch
`merges` field has moved one level up, from `revisions` to `patch` itself Signed-off-by: xphoniex <dj.2dixx@gmail.com>
This commit is contained in:
@@ -158,11 +158,13 @@
|
||||
type: "review",
|
||||
inner: [rev.id, review.author.id, review],
|
||||
})),
|
||||
...rev.merges.map<TimelineMerge>(inner => ({
|
||||
timestamp: inner.timestamp,
|
||||
type: "merge",
|
||||
inner,
|
||||
})),
|
||||
...patch.merges
|
||||
.filter(merge => merge.revision === rev.id)
|
||||
.map<TimelineMerge>(inner => ({
|
||||
timestamp: inner.timestamp,
|
||||
type: "merge",
|
||||
inner,
|
||||
})),
|
||||
...rev.discussions
|
||||
.filter(comment => !comment.replyTo)
|
||||
.map<TimelineThread>(thread => ({
|
||||
|
||||
Reference in New Issue
Block a user