diff options
| -rw-r--r-- | modules/repository/branch.go | 8 | ||||
| -rw-r--r-- | services/pull/review.go | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/repository/branch.go b/modules/repository/branch.go index bffadd62f4..8daceecb44 100644 --- a/modules/repository/branch.go +++ b/modules/repository/branch.go @@ -106,15 +106,15 @@ func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository, 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 err := git_model.AddBranches(subCtx, toAdd); err != nil { + if err := git_model.AddBranches(ctx, toAdd); err != nil { return err } } 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"). Update(b); err != nil { return err @@ -122,7 +122,7 @@ func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository, } 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 } } diff --git a/services/pull/review.go b/services/pull/review.go index 58470142e1..6e088382f9 100644 --- a/services/pull/review.go +++ b/services/pull/review.go @@ -333,9 +333,9 @@ func DismissApprovalReviews(ctx context.Context, doer *user_model.User, pull *is return err } - return db.WithTx(ctx, func(subCtx context.Context) error { + return db.WithTx(ctx, func(ctx context.Context) error { 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 } |