Some more e-mail notification fixes (#9596)
* Some more e-mail notification fixes A few more small e-mail notification fixes/changes * Style footer of notification email to be smaller * Include text for when pull request is merged * Don't include original body of issue or PR when merging/closing by setting issue.Content to "" in these cases * Set Re: prefix and meessage-ID headers based on actName instead of checking for a comment. This fixes a bug where certain actions that didn't have a comment were setting Message-ID instead of In-Reply-To which caused some mail programs not to show those messages as they would have had the same Message-ID as a previous message. Also fixes the case where a final comment and closing message would have been displayed out of order if you didn't have a copy of the original issue/pr cretion message. * Update other template footers for consistencytokarchuk/v1.17
parent
134e3fdf3d
commit
b39fab41c8
@ -1,17 +1,21 @@ |
||||
<!DOCTYPE html> |
||||
<html> |
||||
<head> |
||||
<style> |
||||
.footer { font-size:small; color:#666;} |
||||
</style> |
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
||||
<title>{{.Subject}}</title> |
||||
</head> |
||||
|
||||
<body> |
||||
<p>@{{.Doer.Name}} assigned you to the {{if .IsPull}}pull request{{else}}issue{{end}} <a href="{{.Link}}">#{{.Issue.Index}}</a> in repository {{.Repo}}.</p> |
||||
<p> |
||||
--- |
||||
<br> |
||||
<a href="{{.Link}}">View it on {{AppName}}</a>. |
||||
</p> |
||||
|
||||
<div class="footer"> |
||||
<p> |
||||
--- |
||||
<br> |
||||
<a href="{{.Link}}">View it on {{AppName}}</a>. |
||||
</p> |
||||
</div> |
||||
</body> |
||||
</html> |
||||
|
@ -1,16 +1,21 @@ |
||||
<!DOCTYPE html> |
||||
<html> |
||||
<head> |
||||
<style> |
||||
.footer { font-size:small; color:#666;} |
||||
</style> |
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
||||
<title>{{.Subject}}</title> |
||||
</head> |
||||
|
||||
<body> |
||||
<p>You have been added as a collaborator of repository: <code>{{.RepoName}}</code></p> |
||||
<p> |
||||
--- |
||||
<br> |
||||
<a href="{{.Link}}">View it on Gitea</a>. |
||||
</p> |
||||
<div class="footer"> |
||||
<p> |
||||
--- |
||||
<br> |
||||
<a href="{{.Link}}">View it on {{AppName}}</a>. |
||||
</p> |
||||
</div> |
||||
</body> |
||||
</html> |
||||
|
Loading…
Reference in new issue