浏览代码

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

tags/v1.10.5
Shashvat Kedia 4 年前
父节点
当前提交
632fb5badc
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5
    1
      models/pull.go

+ 5
- 1
models/pull.go 查看文件

@@ -175,7 +175,11 @@ func (pr *PullRequest) GetDefaultMergeMessage() string {
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)

正在加载...
取消
保存