Skip to content

Commit

Permalink
Handle "close" actionable references for manual merges (#31879)
Browse files Browse the repository at this point in the history
Fix #31743
  • Loading branch information
Zettat123 authored Aug 25, 2024
1 parent 41d9eaa commit 725a3ed
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion services/pull/merge.go
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,10 @@ func Merge(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.U
// Reset cached commit count
cache.Remove(pr.Issue.Repo.GetCommitsCountCacheKey(pr.BaseBranch, true))

return handleCloseCrossReferences(ctx, pr, doer)
}

func handleCloseCrossReferences(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.User) error {
// Resolve cross references
refs, err := pr.ResolveCrossReferences(ctx)
if err != nil {
Expand Down Expand Up @@ -542,5 +546,6 @@ func MergedManually(ctx context.Context, pr *issues_model.PullRequest, doer *use

notify_service.MergePullRequest(baseGitRepo.Ctx, doer, pr)
log.Info("manuallyMerged[%d]: Marked as manually merged into %s/%s by commit id: %s", pr.ID, pr.BaseRepo.Name, pr.BaseBranch, commitID)
return nil

return handleCloseCrossReferences(ctx, pr, doer)
}

0 comments on commit 725a3ed

Please sign in to comment.