Browse Source

Load pr Issue Poster on API too (#11033)

tags/v1.13.0-dev
6543 GitHub 5 years ago
parent
commit
0f1140b515
1 changed files with 4 additions and 0 deletions
  1. +4
    -0
      services/pull/merge.go

+ 4
- 0
services/pull/merge.go View File

@@ -337,6 +337,10 @@ func rawMerge(pr *models.PullRequest, doer *models.User, mergeStyle models.Merge
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()
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 {


Loading…
Cancel
Save