tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00
Code Releases Activity

Move SetMerged to service layer (#33045)

Browse Source 
No code change.
Extract from #32178
This commit is contained in:
Lunny Xiao
2024-12-29 23:04:03 -08:00
committed by GitHub
parent 8eecca3478
commit d45456b1b5
5 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
routers/private/hook_post_receive.go
View File

@@ -368,7 +368,7 @@ func handlePullRequestMerging(ctx *gitea_context.PrivateContext, opts *private.H
if err := pull_model.DeleteScheduledAutoMerge(ctx, pr.ID); err != nil && !db.IsErrNotExist(err) {
return fmt.Errorf("DeleteScheduledAutoMerge[%d]: %v", opts.PullRequestID, err)
}
if _, err := pr.SetMerged(ctx); err != nil {
if _, err := pull_service.SetMerged(ctx, pr); err != nil {
return fmt.Errorf("SetMerged failed: %s/%s Error: %v", ownerName, repoName, err)
}
return nil