troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-10 04:39:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request 'Rename Str2html to SanitizeHTML and clarify its behavior (followup) (take 2)' (#3744) from earl-warren/forgejo:wip-notify-push into forgejo

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3744
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
This commit is contained in:
Earl Warren 2024-05-13 18:26:47 +00:00
commit b873107275
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
release-notes/8.0.0/fix/3744.md Normal file
View file

@ -0,0 +1 @@
- mail notifications of pull requests push are empty

2
templates/mail/issue/default.tmpl
View file

@ -30,7 +30,7 @@
{{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink}} {{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink}}
{{else}} {{else}}
{{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits) | SanitizeHTML}} {{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits)}}
{{end}} {{end}}
</p> </p>
{{end}} {{end}}