Move SetMerged to service layer (#33045)

No code change.
Extract from #32178
This commit is contained in:
Lunny Xiao authored and GitHub committed 2024-12-30 07:04:03 +00:00
1 parent 8eecca3478
commit d45456b1b5
5 files changed
+65 -65

No files matched your search

+1 -1
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