tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-09-17 14:18:15 +00:00
Code Releases Activity

Final round of db.DefaultContext refactor (#27587)

Browse Source 
Last part of #27065
This commit is contained in:
JakobDev
2023-10-14 10:37:24 +02:00
committed by GitHub
parent ae419fa494
commit 76a85a4ce9
64 changed files with 250 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
routers/web/repo/pull.go
View File

@@ -1170,7 +1170,7 @@ func MergePullRequest(ctx *context.Context) {
// handle manually-merged mark
if manuallyMerged {
if err := pull_service.MergedManually(pr, ctx.Doer, ctx.Repo.GitRepo, form.MergeCommitID); err != nil {
if err := pull_service.MergedManually(ctx, pr, ctx.Doer, ctx.Repo.GitRepo, form.MergeCommitID); err != nil {
switch {
case models.IsErrInvalidMergeStyle(err):