tjh.dev / test
forked from tangled.org/core
Mirror of @tangled.org/core. Running on a Raspberry Pi Zero 2 (Please be gentle).
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

appview/pulls: do not mark merged PRs as abandoned upon resubmit

Signed-off-by: oppiliappan <me@oppi.li>

authored by

oppiliappan and committed by
Tangled 85c4eb9b ffcab7fe

+10
+10
appview/pulls/pulls.go
··· 1713 1713 1714 1714 // deleted pulls are marked as deleted in the DB 1715 1715 for _, p := range deletions { 1716 + // do not do delete already merged PRs 1717 + if p.State == db.PullMerged { 1718 + continue 1719 + } 1720 + 1716 1721 err := db.DeletePull(tx, p.RepoAt, p.PullId) 1717 1722 if err != nil { 1718 1723 log.Println("failed to delete pull", err, p.PullId) ··· 1757 1752 for id := range updated { 1758 1753 op, _ := origById[id] 1759 1754 np, _ := newById[id] 1755 + 1756 + // do not update already merged PRs 1757 + if op.State == db.PullMerged { 1758 + continue 1759 + } 1760 1760 1761 1761 submission := np.Submissions[np.LastRoundNumber()] 1762 1762