diff options
| author | 赵智超 <1012112796@qq.com> | 2020-05-20 20:47:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 09:47:24 -0300 |
| commit | 0903b1ac8c7b64bb571d02cdd69fa671cc1c18c1 (patch) | |
| tree | eaa680114a5a0d736ff7b71baf526fe2bb1f2966 /templates/mail/issue | |
| parent | 9e0e2a9fcfae4336958dc3e93d4beacfc7a2f642 (diff) | |
| download | gitea-0903b1ac8c7b64bb571d02cdd69fa671cc1c18c1.tar.gz gitea-0903b1ac8c7b64bb571d02cdd69fa671cc1c18c1.zip | |
Add push commits history comment on PR time-line (#11167)
* 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>
Diffstat (limited to 'templates/mail/issue')
| -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> |