femsci/forgejo
femsci/forgejo
1
0
Fork 0
forked from NYANDEV/forgejo
Code Pull requests Activity

Fix bug for ctx usage (#26762)

Browse source 
Regression from #26158

Fix #26684
This commit is contained in:
Lunny Xiao 2023-08-28 12:06:47 +08:00 committed by GitHub
parent 67daa7bcb0
commit 6945918d34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/repository/branch.go
View file

@ -106,15 +106,15 @@ func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository,
return int64(len(allBranches)), nil return int64(len(allBranches)), nil
} }
if err := db.WithTx(ctx, func(subCtx context.Context) error { if err := db.WithTx(ctx, func(ctx context.Context) error {
if len(toAdd) > 0 { if len(toAdd) > 0 {
if err := git_model.AddBranches(subCtx, toAdd); err != nil { if err := git_model.AddBranches(ctx, toAdd); err != nil {
return err return err
} }
} }
for _, b := range toUpdate { for _, b := range toUpdate {
if _, err := db.GetEngine(subCtx).ID(b.ID). if _, err := db.GetEngine(ctx).ID(b.ID).
Cols("commit_id, commit_message, pusher_id, commit_time, is_deleted"). Cols("commit_id, commit_message, pusher_id, commit_time, is_deleted").
Update(b); err != nil { Update(b); err != nil {
return err return err
@ -122,7 +122,7 @@ func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository,
} }
if len(toRemove) > 0 { if len(toRemove) > 0 {
if err := git_model.DeleteBranches(subCtx, repo.ID, doerID, toRemove); err != nil { if err := git_model.DeleteBranches(ctx, repo.ID, doerID, toRemove); err != nil {
return err return err
} }
} }

4
services/pull/review.go
View file

@ -333,9 +333,9 @@ func DismissApprovalReviews(ctx context.Context, doer *user_model.User, pull *is
return err return err
} }
return db.WithTx(ctx, func(subCtx context.Context) error { return db.WithTx(ctx, func(ctx context.Context) error {
for _, review := range reviews { for _, review := range reviews {
if err := issues_model.DismissReview(subCtx, review, true); err != nil { if err := issues_model.DismissReview(ctx, review, true); err != nil {
return err return err
} }