Match GH with Commit page (#12425) (#12431)

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: zeripath <art27@cantab.net>

diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
index dde87c08d18ccdcd9ab0dbff489626dab15ab6d2..16ab7a17500c3f7b333df9259ed4dc34a884eb71 100644 (file)
--- a/templates/repo/commit_page.tmpl
+++ b/templates/repo/commit_page.tmpl
@@ -35,9 +35,9 @@
                                        {{if .Author}}
                                                <img class="ui avatar image" src="{{.Author.RelAvatarLink}}" />
                                        {{if .Author.FullName}}
-                                       <a href="{{.Author.HomeLink}}"><strong>{{.Author.FullName}}</strong> {{if .IsSigned}}&lt;{{.Commit.Author.Email}}&gt;{{end}}</a>
+                                       <a href="{{.Author.HomeLink}}"><strong>{{.Author.FullName}}</strong></a>
                                        {{else}}
-                                       <a href="{{.Author.HomeLink}}"><strong>{{.Commit.Author.Name}}</strong> {{if .IsSigned}}&lt;{{.Commit.Author.Email}}&gt;{{end}}</a>
+                                       <a href="{{.Author.HomeLink}}"><strong>{{.Commit.Author.Name}}</strong></a>
                                        {{end}}
                                        {{else}}
                                                <img class="ui avatar image" src="{{AvatarLink .Commit.Author.Email}}" />
@@ -49,7 +49,7 @@
                                                        <span class="text grey">{{svg "octicon-git-commit" 16}}{{.i18n.Tr "repo.diff.committed_by"}}</span>
                                                        {{if ne .Verification.CommittingUser.ID 0}}
                                                                <img class="ui avatar image" src="{{.Verification.CommittingUser.RelAvatarLink}}" />
-                                                               <a href="{{.Verification.CommittingUser.HomeLink}}"><strong>{{.Commit.Committer.Name}}</strong> &lt;{{.Commit.Committer.Email}}&gt;</a>
+                                                               <a href="{{.Verification.CommittingUser.HomeLink}}"><strong>{{.Commit.Committer.Name}}</strong></a>
                                                        {{else}}
                                                                <img class="ui avatar image" src="{{AvatarLink .Commit.Committer.Email}}" />
                                                                <strong>{{.Commit.Committer.Name}}</strong>
@@ -94,7 +94,7 @@
                                                        <span class="ui text">{{.i18n.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}:</span>
                                                {{end}}
                                                <img class="ui avatar image" src="{{.Verification.SigningUser.RelAvatarLink}}" />
-                                               <a href="{{.Verification.SigningUser.HomeLink}}"><strong>{{.Verification.SigningUser.Name}}</strong> <{{.Verification.SigningEmail}}></a>
+                                               <a href="{{.Verification.SigningUser.HomeLink}}"><strong>{{.Verification.SigningUser.Name}}</strong></a>
                                                <span class="pull-right"><span class="ui text">{{.i18n.Tr "repo.commits.gpg_key_id"}}:</span> {{.Verification.SigningKey.KeyID}}</span>
                                        {{else}}
                                                <i class="icons" title="{{.i18n.Tr "gpg.default_key"}}">
@@ -103,7 +103,7 @@
                                                </i>
                                                <span class="ui text">{{.i18n.Tr "repo.commits.signed_by"}}:</span>
                                                <img class="ui avatar image" src="{{AvatarLink .Verification.SigningEmail}}" />
-                                               <strong>{{.Verification.SigningUser.Name}}</strong> <{{.Verification.SigningEmail}}>
+                                               <strong>{{.Verification.SigningUser.Name}}</strong>
                                                <span class="pull-right"><span class="ui text">{{.i18n.Tr "repo.commits.gpg_key_id"}}:</span> <i class="cogs icon" title="{{.i18n.Tr "gpg.default_key"}}"></i>{{.Verification.SigningKey.KeyID}}</span>
                                        {{end}}
                                {{else if .Verification.Warning}}