MirrorHub/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-11-18 16:01:36 +01:00
Code Issues Releases Wiki Activity

Fix #9552: Merge commits generated by pull request capture pull request details (#9635)

Browse source
This commit is contained in:
Shashvat Kedia 2020-01-08 17:23:07 +05:30 committed by zeripath
parent 74d6ec6807
commit 632fb5badc
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
models/pull.go
View file

@ -175,7 +175,11 @@ func (pr *PullRequest) GetDefaultMergeMessage() string {
return "" return ""
} }
} }
return fmt.Sprintf("Merge branch '%s' of %s/%s into %s", pr.HeadBranch, pr.MustHeadUserName(), pr.HeadRepo.Name, pr.BaseBranch) if err := pr.LoadIssue(); err != nil {
log.Error("Cannot load issue %d for PR id %d: Error: %v", pr.IssueID, pr.ID, err)
return ""
}
return fmt.Sprintf("Merge pull request '%s' (#%d) from %s/%s into %s", pr.Issue.Title, pr.Issue.Index, pr.MustHeadUserName(), pr.HeadBranch, pr.BaseBranch)
} }
// GetCommitMessages returns the commit messages between head and merge base (if there is one) // GetCommitMessages returns the commit messages between head and merge base (if there is one)