summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
author赵智超 <1012112796@qq.com>2020-05-20 20:47:24 +0800
committerGitHub <noreply@github.com>2020-05-20 09:47:24 -0300
commit0903b1ac8c7b64bb571d02cdd69fa671cc1c18c1 (patch)
treeeaa680114a5a0d736ff7b71baf526fe2bb1f2966 /templates
parent9e0e2a9fcfae4336958dc3e93d4beacfc7a2f642 (diff)
downloadgitea-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')
-rw-r--r--templates/mail/issue/default.tmpl33
-rw-r--r--templates/repo/commits_list_small.tmpl57
-rw-r--r--templates/repo/issue/view_content/comments.tmpl21
3 files changed, 109 insertions, 2 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>
diff --git a/templates/repo/commits_list_small.tmpl b/templates/repo/commits_list_small.tmpl
new file mode 100644
index 0000000000..1450cdafbc
--- /dev/null
+++ b/templates/repo/commits_list_small.tmpl
@@ -0,0 +1,57 @@
+{{ $r:= List .Commits}}
+{{ $index := 0}}
+{{range $r}}
+ {{ $tag := printf "%s-%d" $.HashTag $index }}
+ {{ $index = Add $index 1}}
+ <div class="timeline-item event small-line-spacing" id="{{$tag}}">
+ <span class="badge badge-commit">{{svg "octicon-git-commit" 16}}</span>
+ {{if .User}}
+ <a class="ui avatar image" href="{{AppSubUrl}}/{{.User.Name}}"><img src="{{.User.RelAvatarLink}}" alt=""/></a>
+ {{else}}
+ <img class="ui avatar image" src="{{AvatarLink .Author.Email}}" alt=""/>
+ {{end}}
+
+ <span class="ui float right shabox">
+ {{$class := "ui sha label"}}
+ {{if .Signature}}
+ {{$class = (printf "%s%s" $class " isSigned")}}
+ {{if .Verification.Verified}}
+ {{if eq .Verification.TrustStatus "trusted"}}
+ {{$class = (printf "%s%s" $class " isVerified")}}
+ {{else if eq .Verification.TrustStatus "untrusted"}}
+ {{$class = (printf "%s%s" $class " isVerifiedUntrusted")}}
+ {{else}}
+ {{$class = (printf "%s%s" $class " isVerifiedUnmatched")}}
+ {{end}}
+ {{else if .Verification.Warning}}
+ {{$class = (printf "%s%s" $class " isWarning")}}
+ {{end}}
+ {{end}}
+ {{if $.Issue.PullRequest.BaseRepo.Name}}
+ <a href="{{AppSubUrl}}/{{$.Issue.PullRequest.BaseRepo.OwnerName}}/{{$.Issue.PullRequest.BaseRepo.Name}}/commit/{{.ID}}" rel="nofollow" class="{{$class}}">
+ {{else}}
+ <span class="{{$class}}">
+ {{end}}
+ <span class="shortsha">{{ShortSha .ID.String}}</span>
+ {{if $.Issue.PullRequest.BaseRepo.Name}}
+ </a>
+ {{else}}
+ </span>
+ {{end}}
+ </span>
+
+ <span class="message-wrapper">
+ {{ $commitLink:= printf "%s/%s/%s/commit/%s" AppSubUrl $.Issue.PullRequest.BaseRepo.OwnerName $.Issue.PullRequest.BaseRepo.Name .ID }}
+ <span class="commit-summary has-emoji{{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{RenderCommitMessageLinkSubject .Message ($.Issue.PullRequest.BaseRepo.Link|Escape) $commitLink $.Issue.PullRequest.BaseRepo.ComposeMetas}}</span>
+ </span>
+ {{if IsMultilineCommitMessage .Message}}
+ <button class="basic compact mini ui icon button commit-button"><i class="ellipsis horizontal icon"></i></button>
+ {{end}}
+ {{if eq (CommitType .) "SignCommitWithStatuses"}}
+ {{template "repo/commit_status" .Status}}
+ {{end}}
+ {{if IsMultilineCommitMessage .Message}}
+ <pre class="commit-body" style="display: none;">{{RenderCommitBody .Message ($.Issue.PullRequest.BaseRepo.Link|Escape) $.Issue.PullRequest.BaseRepo.ComposeMetas}}</pre>
+ {{end}}
+ </div>
+{{end}}
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index e3c7df6745..24984baebb 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -7,7 +7,8 @@
13 = STOP_TRACKING, 14 = ADD_TIME_MANUAL, 16 = ADDED_DEADLINE, 17 = MODIFIED_DEADLINE,
18 = REMOVED_DEADLINE, 19 = ADD_DEPENDENCY, 20 = REMOVE_DEPENDENCY, 21 = CODE,
22 = REVIEW, 23 = ISSUE_LOCKED, 24 = ISSUE_UNLOCKED, 25 = TARGET_BRANCH_CHANGED,
- 26 = DELETE_TIME_MANUAL, 27 = REVIEW_REQUEST, 28 = MERGE_PULL_REQUEST -->
+ 26 = DELETE_TIME_MANUAL, 27 = REVIEW_REQUEST, 28 = MERGE_PULL_REQUEST,
+ 29 = PULL_PUSH_EVENT -->
{{if eq .Type 0}}
<div class="timeline-item comment" id="{{.HashTag}}">
{{if .OriginalAuthor }}
@@ -594,5 +595,23 @@
{{end}}
</span>
</div>
+ {{else if and (eq .Type 29) (or (gt .CommitsNum 0) .IsForcePush)}}
+ <div class="timeline-item event" id="{{.HashTag}}">
+ <span class="badge">{{svg "octicon-repo-force-push" 16}}</span>
+ <a class="ui avatar image" href="{{.Poster.HomeLink}}">
+ <img src="{{.Poster.RelAvatarLink}}">
+ </a>
+ <span class="text grey">
+ <a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
+ {{ if .IsForcePush }}
+ {{$.i18n.Tr "repo.issues.force_push_codes" $.Issue.PullRequest.HeadBranch (ShortSha .OldCommit) ($.Issue.Repo.CommitLink .OldCommit) (ShortSha .NewCommit) ($.Issue.Repo.CommitLink .NewCommit) $createdStr | Safe}}
+ {{else}}
+ {{$.i18n.Tr (TrN $.i18n.Lang .Commits.Len "repo.issues.push_commit_1" "repo.issues.push_commits_n") .Commits.Len $createdStr | Safe}}
+ {{end}}
+ </span>
+ </div>
+ {{if not .IsForcePush}}
+ {{template "repo/commits_list_small" .}}
+ {{end}}
{{end}}
{{end}}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 17:48:35 +0000