diff options
| author | Jason Song <i@wolfogre.com> | 2023-01-09 11:50:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-09 11:50:54 +0800 |
| commit | 7adc2de46404e32ed33f999d308ed56232cdfea5 (patch) | |
| tree | 2404a22b5fa8a941eb5bfd16fd717fab29d899e4 /routers/web/repo/issue.go | |
| parent | b878155b8741c2769b6aa50a80609c36822451c9 (diff) | |
| download | gitea-7adc2de46404e32ed33f999d308ed56232cdfea5.tar.gz gitea-7adc2de46404e32ed33f999d308ed56232cdfea5.zip | |
Use context parameter in models/git (#22367)
After #22362, we can feel free to use transactions without
`db.DefaultContext`.
And there are still lots of models using `db.DefaultContext`, I think we
should refactor them carefully and one by one.
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'routers/web/repo/issue.go')
| -rw-r--r-- | routers/web/repo/issue.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 100e343de4..07dd98f1a5 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -1604,7 +1604,7 @@ func ViewIssue(ctx *context.Context) { if perm.CanWrite(unit.TypeCode) { // Check if branch is not protected if pull.HeadBranch != pull.HeadRepo.DefaultBranch { - if protected, err := git_model.IsProtectedBranch(pull.HeadRepo.ID, pull.HeadBranch); err != nil { + if protected, err := git_model.IsProtectedBranch(ctx, pull.HeadRepo.ID, pull.HeadBranch); err != nil { log.Error("IsProtectedBranch: %v", err) } else if !protected { canDelete = true @@ -1688,7 +1688,7 @@ func ViewIssue(ctx *context.Context) { if pull.ProtectedBranch != nil { var showMergeInstructions bool if ctx.Doer != nil { - showMergeInstructions = pull.ProtectedBranch.CanUserPush(ctx.Doer.ID) + showMergeInstructions = pull.ProtectedBranch.CanUserPush(ctx, ctx.Doer.ID) } ctx.Data["IsBlockedByApprovals"] = !issues_model.HasEnoughApprovals(ctx, pull.ProtectedBranch, pull) ctx.Data["IsBlockedByRejection"] = issues_model.MergeBlockedByRejectedReview(ctx, pull.ProtectedBranch, pull) |