loading up the forgejo repo on tangled to test page performance
0
fork

Configure Feed

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

Fix bug for ctx usage (#26762)

Regression from #26158

Fix #26684

authored by

Lunny Xiao and committed by
GitHub
6945918d 67daa7bc

+6 -6
+4 -4
modules/repository/branch.go
··· 106 106 return int64(len(allBranches)), nil 107 107 } 108 108 109 - if err := db.WithTx(ctx, func(subCtx context.Context) error { 109 + if err := db.WithTx(ctx, func(ctx context.Context) error { 110 110 if len(toAdd) > 0 { 111 - if err := git_model.AddBranches(subCtx, toAdd); err != nil { 111 + if err := git_model.AddBranches(ctx, toAdd); err != nil { 112 112 return err 113 113 } 114 114 } 115 115 116 116 for _, b := range toUpdate { 117 - if _, err := db.GetEngine(subCtx).ID(b.ID). 117 + if _, err := db.GetEngine(ctx).ID(b.ID). 118 118 Cols("commit_id, commit_message, pusher_id, commit_time, is_deleted"). 119 119 Update(b); err != nil { 120 120 return err ··· 122 122 } 123 123 124 124 if len(toRemove) > 0 { 125 - if err := git_model.DeleteBranches(subCtx, repo.ID, doerID, toRemove); err != nil { 125 + if err := git_model.DeleteBranches(ctx, repo.ID, doerID, toRemove); err != nil { 126 126 return err 127 127 } 128 128 }
+2 -2
services/pull/review.go
··· 333 333 return err 334 334 } 335 335 336 - return db.WithTx(ctx, func(subCtx context.Context) error { 336 + return db.WithTx(ctx, func(ctx context.Context) error { 337 337 for _, review := range reviews { 338 - if err := issues_model.DismissReview(subCtx, review, true); err != nil { 338 + if err := issues_model.DismissReview(ctx, review, true); err != nil { 339 339 return err 340 340 } 341 341