magic_rb/forgejo
Template
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo synced 2024-11-28 12:46:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Load issue before accessing index in merge message (#22822) (#22830)

Browse source 
Backport #22822

---------

Signed-off-by: jolheiser <john.olheiser@gmail.com>
This commit is contained in:
John Olheiser 2023-02-09 15:53:14 -06:00 committed by GitHub
parent 638fbd0b78
commit 68b908d92a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/pull/merge.go
View file

@ -99,6 +99,9 @@ func GetDefaultMergeMessage(baseGitRepo *git.Repository, pr *issues_model.PullRe
} }
for _, ref := range refs { for _, ref := range refs {
if ref.RefAction == references.XRefActionCloses { if ref.RefAction == references.XRefActionCloses {
if err := ref.LoadIssue(); err != nil {
return "", err
}
closeIssueIndexes = append(closeIssueIndexes, fmt.Sprintf("%s %s%d", closeWord, issueReference, ref.Issue.Index)) closeIssueIndexes = append(closeIssueIndexes, fmt.Sprintf("%s %s%d", closeWord, issueReference, ref.Issue.Index))
} }
} }