mirror of
https://github.com/go-gitea/gitea.git
synced 2024-12-04 14:46:57 -05:00
0903b1ac8c
* Add push commits history comment on PR time-line * Add notify by email and ui of this comment type also Signed-off-by: a1012112796 <1012112796@qq.com> * Add migrations for IsForcePush * fix wrong force-push judgement * Apply suggestions from code review * Remove commit number check * add own notify fun * fix some typo Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com> * fix lint * fix style again, I forgot something before * Change email notify way * fix api * add number check if It's force-push * Add repo commit link fuction remove unnecessary check skip show push commits comment which not have commits alive * Update issue_comment.go * Apply suggestions from code review Co-authored-by: mrsdizzie <info@mrsdizzie.com> * Apply suggestions from code review * fix ui view Co-authored-by: silverwind <me@silverwind.io> * fix height * remove unnecessary style define * simplify GetBranchName * Apply suggestions from code review * save commit ids and isForce push by json * simplify GetBranchName * fix bug Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com> Co-authored-by: mrsdizzie <info@mrsdizzie.com> Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: silverwind <me@silverwind.io>
91 lines
2.7 KiB
Cheetah
91 lines
2.7 KiB
Cheetah
<!DOCTYPE html>
|
|
<html>
|
|
<head>
|
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
|
<title>{{.Subject}}</title>
|
|
|
|
<style>
|
|
blockquote { padding-left: 1em; margin: 1em 0; border-left: 1px solid grey; color: #777}
|
|
.footer { font-size:small; color:#666;}
|
|
{{if .ReviewComments}}
|
|
.review { padding-left: 1em; margin: 1em 0; }
|
|
.review > pre { padding: 1em; border-left: 1px solid grey; }
|
|
{{end}}
|
|
</style>
|
|
|
|
</head>
|
|
|
|
<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}}.
|
|
{{else if eq .ActionName "reopen"}}
|
|
Reopened #{{.Issue.Index}}.
|
|
{{else if eq .ActionName "merge"}}
|
|
Merged #{{.Issue.Index}} into {{.Issue.PullRequest.BaseBranch}}.
|
|
{{else if eq .ActionName "approve"}}
|
|
<b>@{{.Doer.Name}}</b> approved this pull request.
|
|
{{else if eq .ActionName "reject"}}
|
|
<b>@{{.Doer.Name}}</b> requested changes on this pull request.
|
|
{{else if eq .ActionName "review"}}
|
|
<b>@{{.Doer.Name}}</b> commented on this pull request.
|
|
{{end}}
|
|
|
|
{{- if eq .Body ""}}
|
|
{{if eq .ActionName "new"}}
|
|
Created #{{.Issue.Index}}.
|
|
{{end}}
|
|
{{else}}
|
|
{{.Body | Str2html}}
|
|
{{end -}}
|
|
{{- range .ReviewComments}}
|
|
<hr>
|
|
In {{.TreePath}}:
|
|
<div class="review">
|
|
<pre>{{.Patch}}</pre>
|
|
<div>{{.RenderedContent | Safe}}</div>
|
|
</div>
|
|
{{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>
|
|
---
|
|
<br>
|
|
<a href="{{.Link}}">View it on {{AppName}}</a>.
|
|
</p>
|
|
</div>
|
|
</body>
|
|
</html>
|