Skip to content

Commit d0a18a1

Browse files
CirnoTzeripathlafriks
authored
Show full GPG commit status on PR commit history (#11702)
* Show full GPG commit status on PR commit history * move shabox badge to separate template * unnecessary $ Co-authored-by: zeripath <[email protected]> Co-authored-by: Lauris BH <[email protected]>
1 parent a1ad188 commit d0a18a1

File tree

6 files changed

+35
-47
lines changed

6 files changed

+35
-47
lines changed

‎templates/repo/commits_list.tmpl‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,24 +48,7 @@
4848
{{end}}
4949
<span class="shortsha">{{ShortSha .ID.String}}</span>
5050
{{if .Signature}}
51-
<div class="ui detail icon button">
52-
{{if .Verification.Verified}}
53-
<div title="{{if eq .Verification.TrustStatus "trusted"}}{{else if eq .Verification.TrustStatus "untrusted"}}{{$.i18n.Tr "repo.commits.signed_by_untrusted_user"}}: {{else}}{{$.i18n.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}: {{end}}{{.Verification.Reason}}">
54-
{{if ne .Verification.SigningUser.ID 0}}
55-
<i class="lock icon"></i>
56-
<img class="ui signature avatar image" src="{{.Verification.SigningUser.RelAvatarLink}}" />
57-
{{else}}
58-
<i title="{{.Verification.Reason}}" class="icons">
59-
<i class="lock icon"></i>
60-
<i class="tiny inverted cog icon centerlock"></i>
61-
</i>
62-
<img class="ui signature avatar image" src="{{AvatarLink .Verification.SigningEmail}}" />
63-
{{end}}
64-
</div>
65-
{{else}}
66-
<i title="{{$.i18n.Tr .Verification.Reason}}" class="unlock icon"></i>
67-
{{end}}
68-
</div>
51+
{{template "repo/shabox_badge" dict "root" $ "verification" .Verification}}
6952
{{end}}
7053
{{if $.Reponame}}
7154
</a>

‎templates/repo/commits_list_small.tmpl‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
{{ $r:= List .Commits}}
1+
{{ $r:= List .comment.Commits}}
22
{{ $index := 0}}
33
<div class="timeline-item commits-list">
44
{{range $r}}
5-
{{ $tag := printf "%s-%d" $.HashTag $index }}
5+
{{ $tag := printf "%s-%d" $.comment.HashTag $index }}
66
{{ $index = Add $index 1}}
77
<div class="singular-commit" id="{{$tag}}">
88
<span class="badge badge-commit">{{svg "octicon-git-commit" 16}}</span>
@@ -31,28 +31,31 @@
3131
{{$class = (printf "%s%s" $class " isWarning")}}
3232
{{end}}
3333
{{end}}
34-
{{if $.Issue.PullRequest.BaseRepo.Name}}
35-
<a href="{{AppSubUrl}}/{{$.Issue.PullRequest.BaseRepo.OwnerName}}/{{$.Issue.PullRequest.BaseRepo.Name}}/commit/{{.ID}}" rel="nofollow" class="{{$class}}">
34+
{{if $.comment.Issue.PullRequest.BaseRepo.Name}}
35+
<a href="{{AppSubUrl}}/{{$.comment.Issue.PullRequest.BaseRepo.OwnerName}}/{{$.comment.Issue.PullRequest.BaseRepo.Name}}/commit/{{.ID}}" rel="nofollow" class="{{$class}}">
3636
{{else}}
3737
<span class="{{$class}}">
3838
{{end}}
39-
<span class="shortsha">{{ShortSha .ID.String}}</span>
40-
{{if $.Issue.PullRequest.BaseRepo.Name}}
39+
<span class="shortsha">{{ShortSha .ID.String}}</span>
40+
{{if .Signature}}
41+
{{template "repo/shabox_badge" dict "root" $.root "verification" .Verification}}
42+
{{end}}
43+
{{if $.comment.Issue.PullRequest.BaseRepo.Name}}
4144
</a>
4245
{{else}}
4346
</span>
4447
{{end}}
4548
</span>
4649

4750
<span class="message-wrapper">
48-
{{ $commitLink:= printf "%s/%s/%s/commit/%s" AppSubUrl $.Issue.PullRequest.BaseRepo.OwnerName $.Issue.PullRequest.BaseRepo.Name .ID }}
49-
<span class="mono 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>
51+
{{ $commitLink:= printf "%s/%s/%s/commit/%s" AppSubUrl $.comment.Issue.PullRequest.BaseRepo.OwnerName $.comment.Issue.PullRequest.BaseRepo.Name .ID }}
52+
<span class="mono commit-summary{{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{RenderCommitMessageLinkSubject .Message ($.comment.Issue.PullRequest.BaseRepo.Link|Escape) $commitLink $.comment.Issue.PullRequest.BaseRepo.ComposeMetas}}</span>
5053
</span>
5154
{{if IsMultilineCommitMessage .Message}}
5255
<button class="basic compact mini ui icon button commit-button"><i class="ellipsis horizontal icon"></i></button>
5356
{{end}}
5457
{{if IsMultilineCommitMessage .Message}}
55-
<pre class="commit-body" style="display: none;">{{RenderCommitBody .Message ($.Issue.PullRequest.BaseRepo.Link|Escape) $.Issue.PullRequest.BaseRepo.ComposeMetas}}</pre>
58+
<pre class="commit-body" style="display: none;">{{RenderCommitBody .Message ($.comment.Issue.PullRequest.BaseRepo.Link|Escape) $.comment.Issue.PullRequest.BaseRepo.ComposeMetas}}</pre>
5659
{{end}}
5760
</div>
5861
{{end}}

‎templates/repo/issue/view_content/comments.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@
608608
</span>
609609
</div>
610610
{{if not .IsForcePush}}
611-
{{template "repo/commits_list_small" .}}
611+
{{template "repo/commits_list_small" dict "comment" . "root" $}}
612612
{{end}}
613613
{{end}}
614614
{{end}}

‎templates/repo/shabox_badge.tmpl‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<div class="ui detail icon button">
2+
{{if .verification.Verified}}
3+
<div title="{{if eq .verification.TrustStatus "trusted"}}{{else if eq .verification.TrustStatus "untrusted"}}{{$.root.i18n.Tr "repo.commits.signed_by_untrusted_user"}}: {{else}}{{$.root.i18n.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}: {{end}}{{.verification.Reason}}">
4+
{{if ne .verification.SigningUser.ID 0}}
5+
<i class="lock icon"></i>
6+
<img class="ui signature avatar image" src="{{.verification.SigningUser.RelAvatarLink}}" />
7+
{{else}}
8+
<i title="{{.verification.Reason}}" class="icons">
9+
<i class="lock icon"></i>
10+
<i class="tiny inverted cog icon centerlock"></i>
11+
</i>
12+
<img class="ui signature avatar image" src="{{AvatarLink .verification.SigningEmail}}" />
13+
{{end}}
14+
</div>
15+
{{else}}
16+
<i title="{{$.root.i18n.Tr .verification.Reason}}" class="unlock icon"></i>
17+
{{end}}
18+
</div>

‎templates/repo/view_list.tmpl‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,7 @@
1818
<a rel="nofollow" class="ui sha label {{if .LatestCommit.Signature}} isSigned {{if .LatestCommitVerification.Verified }} isVerified{{if eq .LatestCommitVerification.TrustStatus "trusted"}}{{else if eq .LatestCommitVerification.TrustStatus "untrusted"}}Untrusted{{else}}Unmatched{{end}}{{else if .LatestCommitVerification.Warning}} isWarning{{end}}{{end}}" href="{{.RepoLink}}/commit/{{.LatestCommit.ID}}">
1919
<span class="shortsha">{{ShortSha .LatestCommit.ID.String}}</span>
2020
{{if .LatestCommit.Signature}}
21-
<div class="ui detail icon button">
22-
{{if .LatestCommitVerification.Verified}}
23-
<div title="{{if eq .LatestCommitVerification.TrustStatus "trusted"}}{{else if eq .LatestCommitVerification.TrustStatus "untrusted"}}{{.i18n.Tr "repo.commits.signed_by_untrusted_user"}}: {{else}}{{.i18n.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}: {{end}}{{.LatestCommitVerification.Reason}}">
24-
{{if ne .LatestCommitVerification.SigningUser.ID 0}}
25-
<i class="lock icon"></i>
26-
<img class="ui signature avatar image" src="{{.LatestCommitVerification.SigningUser.RelAvatarLink}}" />
27-
{{else}}
28-
<i title="{{.LatestCommitVerification.Reason}}" class="icons">
29-
<i class="lock icon"></i>
30-
<i class="tiny inverted cog icon centerlock"></i>
31-
</i>
32-
<img class="ui signature avatar image" src="{{AvatarLink .LatestCommitVerification.SigningEmail}}" />
33-
{{end}}
34-
</div>
35-
{{else}}
36-
<i title="{{$.i18n.Tr .LatestCommitVerification.Reason}}" class="unlock icon"></i>
37-
{{end}}
38-
</div>
21+
{{template "repo/shabox_badge" dict "root" $ "verification" .LatestCommitVerification}}
3922
{{end}}
4023
</a>
4124
{{template "repo/commit_status" .LatestCommitStatus}}

‎web_src/less/_repository.less‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1427,7 +1427,8 @@
14271427
}
14281428

14291429
#commits-table td.sha .sha.label,
1430-
#repo-files-table .sha.label {
1430+
#repo-files-table .sha.label,
1431+
.timeline-item.commits-list .singular-commit .sha.label {
14311432
border: 1px solid #bbbbbb;
14321433

14331434
.ui.signature.avatar {

0 commit comments

Comments
 (0)