Skip to content

Commit 725a3ed

Browse files
authored
Handle "close" actionable references for manual merges (#31879)
Fix #31743
1 parent 41d9eaa commit 725a3ed

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

services/pull/merge.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,10 @@ func Merge(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.U
219219
// Reset cached commit count
220220
cache.Remove(pr.Issue.Repo.GetCommitsCountCacheKey(pr.BaseBranch, true))
221221

222+
return handleCloseCrossReferences(ctx, pr, doer)
223+
}
224+
225+
func handleCloseCrossReferences(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.User) error {
222226
// Resolve cross references
223227
refs, err := pr.ResolveCrossReferences(ctx)
224228
if err != nil {
@@ -542,5 +546,6 @@ func MergedManually(ctx context.Context, pr *issues_model.PullRequest, doer *use
542546

543547
notify_service.MergePullRequest(baseGitRepo.Ctx, doer, pr)
544548
log.Info("manuallyMerged[%d]: Marked as manually merged into %s/%s by commit id: %s", pr.ID, pr.BaseRepo.Name, pr.BaseBranch, commitID)
545-
return nil
549+
550+
return handleCloseCrossReferences(ctx, pr, doer)
546551
}

0 commit comments

Comments
 (0)