tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-11-04 13:28:25 +00:00
Code Releases Activity

Load PR Issue Poster on API too (#11033) (#11039)

Browse Source 
* Load pr Issue Poster on API too (#11033)

* ajust for 1.11 codebase
This commit is contained in:
6543
2020-04-11 06:10:16 +02:00
committed by GitHub
parent 0c4be64345
commit e11b3a1076
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/pull/merge.go
View File

@@ -285,6 +285,10 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
return err return err
} }
if err = pr.Issue.LoadPoster(); err != nil {
log.Error("LoadPoster: %v", err)
return fmt.Errorf("LoadPoster: %v", err)
}
sig := pr.Issue.Poster.NewGitSig() sig := pr.Issue.Poster.NewGitSig()
if signArg == "" { if signArg == "" {
if err := git.NewCommand("commit", fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email), "-m", message).RunInDirTimeoutEnvPipeline(env, -1, tmpBasePath, &outbuf, &errbuf); err != nil { if err := git.NewCommand("commit", fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email), "-m", message).RunInDirTimeoutEnvPipeline(env, -1, tmpBasePath, &outbuf, &errbuf); err != nil {