Backport #23267 Follow #21986 , fix regression. The mail templates should always use `AppURL` (the full absolute URL) Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>tags/v1.19.0-rc1
@@ -8,7 +8,7 @@ | |||
<title>{{.Subject}}</title> | |||
</head> | |||
{{$repo_url := printf "<a href='%s'>%s</a>" (Escape .Issue.Repo.Link) (Escape .Issue.Repo.FullName)}} | |||
{{$repo_url := printf "<a href='%s'>%s</a>" (Escape .Issue.Repo.HTMLURL) (Escape .Issue.Repo.FullName)}} | |||
{{$link := printf "<a href='%s'>#%d</a>" (Escape .Link) .Issue.Index}} | |||
<body> | |||
<p> |
@@ -20,11 +20,11 @@ | |||
{{if eq .ActionName "push"}} | |||
<p> | |||
{{if .Comment.IsForcePush}} | |||
{{$oldCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.Link .Comment.OldCommit}} | |||
{{$oldCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.OldCommit}} | |||
{{$oldShortSha := ShortSha .Comment.OldCommit}} | |||
{{$oldCommitLink := printf "<a href='%[1]s'><b>%[2]s</b></a>" (Escape $oldCommitUrl) (Escape $oldShortSha)}} | |||
{{$newCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.Link .Comment.NewCommit}} | |||
{{$newCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.NewCommit}} | |||
{{$newShortSha := ShortSha .Comment.NewCommit}} | |||
{{$newCommitLink := printf "<a href='%[1]s'><b>%[2]s</b></a>" (Escape $newCommitUrl) (Escape $newShortSha)}} | |||
@@ -72,7 +72,7 @@ | |||
<ul> | |||
{{range .Comment.Commits}} | |||
<li> | |||
<a href="{{$.Comment.Issue.PullRequest.BaseRepo.Link}}/commit/{{.ID}}"> | |||
<a href="{{$.Comment.Issue.PullRequest.BaseRepo.HTMLURL}}/commit/{{.ID}}"> | |||
{{ShortSha .ID.String}} | |||
</a> - {{.Summary}} | |||
</li> |
@@ -11,8 +11,8 @@ | |||
</head> | |||
{{$release_url := printf "<a href='%s'>%s</a>" (.Release.Link | Escape) (.Release.TagName | Escape)}} | |||
{{$repo_url := printf "<a href='%s'>%s</a>" (.Release.Repo.Link | Escape) (.Release.Repo.FullName | Escape)}} | |||
{{$release_url := printf "<a href='%s'>%s</a>" (.Release.HTMLURL | Escape) (.Release.TagName | Escape)}} | |||
{{$repo_url := printf "<a href='%s'>%s</a>" (.Release.Repo.HTMLURL | Escape) (.Release.Repo.FullName | Escape)}} | |||
<body> | |||
<p> | |||
{{.locale.Tr "mail.release.new.text" .Release.Publisher.Name $release_url $repo_url | Str2html}} |