back round 0 view raw

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

merged

opened by

oppi.li 4 months ago targeting master from push-nnuvlyptxsqy

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

options

unified split

Changed files

appview

pulls

pulls.go

appview/pulls/pulls.go

···

       1713
        
       

     

       1714
        
       	// deleted pulls are marked as deleted in the DB

     

       1715
        
       	for _, p := range deletions {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1716
        
       		err := db.DeletePull(tx, p.RepoAt, p.PullId)

     

       1717
        
       		if err != nil {

     

       1718
        
       			log.Println("failed to delete pull", err, p.PullId)

···

       1713
        
       

     

       1714
        
       	// deleted pulls are marked as deleted in the DB

     

       1715
        
       	for _, p := range deletions {

     

       1716
       +
       		// do not do anything about already merged PRs

     

       1717
       +
       		if p.State == db.PullMerged {

     

       1718
       +
       			continue

     

       1719
       +
       		}

     

       1720
       +
       

     

       1721
        
       		err := db.DeletePull(tx, p.RepoAt, p.PullId)

     

       1722
        
       		if err != nil {

     

       1723
        
       			log.Println("failed to delete pull", err, p.PullId)