diff options
Diffstat (limited to 'templates/mail/issue/default.tmpl')
| -rw-r--r-- | templates/mail/issue/default.tmpl | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/templates/mail/issue/default.tmpl b/templates/mail/issue/default.tmpl index 7cd3975277..00bb561d69 100644 --- a/templates/mail/issue/default.tmpl +++ b/templates/mail/issue/default.tmpl @@ -17,6 +17,25 @@ <body> {{if .IsMention}}<p><b>@{{.Doer.Name}}</b> mentioned you:</p>{{end}} + {{if eq .Comment.Type 29}} + <p> + <b>{{.Doer.Name}}</b> + {{if .Comment.IsForcePush}} + {{ $oldCommitLink:= printf "%s%s/%s/commit/%s" AppUrl .Comment.Issue.PullRequest.BaseRepo.OwnerName .Comment.Issue.PullRequest.BaseRepo.Name .Comment.OldCommit}} + {{ $newCommitLink:= printf "%s%s/%s/commit/%s" AppUrl .Comment.Issue.PullRequest.BaseRepo.OwnerName .Comment.Issue.PullRequest.BaseRepo.Name .Comment.NewCommit}} + force-pushed the <b>{{.Comment.Issue.PullRequest.HeadBranch}}</b> from + <a href="{{$oldCommitLink}}"><b>{{ShortSha .Comment.OldCommit}}</b></a> + to + <a href="{{$newCommitLink}}"><b>{{ShortSha .Comment.NewCommit}}</b></a>. + {{else}} + {{if eq .Comment.Commits.Len 1}} + {{printf "pushed 1 commit to %s:" .Comment.Issue.PullRequest.HeadBranch}} + {{else}} + {{printf "pushed %d commits to %s:" .Comment.Commits.Len .Comment.Issue.PullRequest.HeadBranch}} + {{end}} + {{end}} + </p> + {{end}} <p> {{if eq .ActionName "close"}} Closed #{{.Issue.Index}}. @@ -46,7 +65,19 @@ <pre>{{.Patch}}</pre> <div>{{.RenderedContent | Safe}}</div> </div> - {{end -}} + {{end -}} + {{if eq .Comment.Type 29}} + {{ $r:= List .Comment.Commits}} + <ul> + {{range $r}} + <li> + <a href="{{AppUrl}}{{$.Comment.Issue.PullRequest.BaseRepo.OwnerName}}/{{$.Comment.Issue.PullRequest.BaseRepo.Name}}/commit/{{.ID}}"> + {{ShortSha .ID.String}} + </a> - {{.Summary}} + </li> + {{end}} + </ul> + {{end}} </p> <div class="footer"> <p> |