2019-06-07 16:29:29 -04:00
|
|
|
{{template "base/head" .}}
|
|
|
|
<div class="repository diff">
|
|
|
|
{{template "repo/header" .}}
|
|
|
|
<div class="ui container {{if .IsSplitStyle}}fluid padded{{end}}">
|
2020-02-27 14:20:55 -05:00
|
|
|
{{$class := ""}}
|
|
|
|
{{if .Commit.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}}
|
|
|
|
<div class="ui top attached info clearing segment {{$class}}">
|
2020-05-16 12:38:40 -04:00
|
|
|
{{if not $.PageIsWiki}}
|
2019-06-07 16:29:29 -04:00
|
|
|
<a class="ui floated right blue tiny button" href="{{EscapePound .SourcePath}}">
|
|
|
|
{{.i18n.Tr "repo.diff.browse_source"}}
|
|
|
|
</a>
|
2020-05-16 12:38:40 -04:00
|
|
|
{{end}}
|
2020-04-28 14:05:39 -04:00
|
|
|
<h3><span class="message-wrapper"><span class="commit-summary" title="{{.Commit.Summary}}">{{RenderCommitMessage .Commit.Message $.RepoLink $.Repository.ComposeMetas}}</span></span>{{template "repo/commit_status" .CommitStatus}}</h3>
|
2019-06-07 16:29:29 -04:00
|
|
|
{{if IsMultilineCommitMessage .Commit.Message}}
|
|
|
|
<pre class="commit-body">{{RenderCommitBody .Commit.Message $.RepoLink $.Repository.ComposeMetas}}</pre>
|
|
|
|
{{end}}
|
2020-02-11 12:02:41 -05:00
|
|
|
<span class="text grey">{{svg "octicon-git-branch" 16}}{{.BranchName}}</span>
|
2019-06-07 16:29:29 -04:00
|
|
|
</div>
|
2020-02-27 14:20:55 -05:00
|
|
|
<div class="ui attached info segment {{$class}}">
|
2019-06-07 16:29:29 -04:00
|
|
|
<div class="ui stackable grid">
|
|
|
|
<div class="nine wide column">
|
|
|
|
{{if .Author}}
|
|
|
|
<img class="ui avatar image" src="{{.Author.RelAvatarLink}}" />
|
|
|
|
{{if .Author.FullName}}
|
2020-02-27 14:20:55 -05:00
|
|
|
<a href="{{.Author.HomeLink}}"><strong>{{.Author.FullName}}</strong> {{if .IsSigned}}<{{.Commit.Author.Email}}>{{end}}</a>
|
2019-06-07 16:29:29 -04:00
|
|
|
{{else}}
|
2020-02-27 14:20:55 -05:00
|
|
|
<a href="{{.Author.HomeLink}}"><strong>{{.Commit.Author.Name}}</strong> {{if .IsSigned}}<{{.Commit.Author.Email}}>{{end}}</a>
|
2019-06-07 16:29:29 -04:00
|
|
|
{{end}}
|
|
|
|
{{else}}
|
|
|
|
<img class="ui avatar image" src="{{AvatarLink .Commit.Author.Email}}" />
|
|
|
|
<strong>{{.Commit.Author.Name}}</strong>
|
|
|
|
{{end}}
|
2019-10-16 09:42:42 -04:00
|
|
|
{{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}}
|
|
|
|
<span> </span>
|
|
|
|
{{if ne .Verification.CommittingUser.ID 0}}
|
|
|
|
<img class="ui avatar image" src="{{.Verification.CommittingUser.RelAvatarLink}}" />
|
2020-02-27 14:20:55 -05:00
|
|
|
<a href="{{.Verification.CommittingUser.HomeLink}}"><strong>{{.Commit.Committer.Name}}</strong> <{{.Commit.Committer.Email}}></a>
|
2019-10-16 09:42:42 -04:00
|
|
|
{{else}}
|
|
|
|
<img class="ui avatar image" src="{{AvatarLink .Commit.Committer.Email}}" />
|
|
|
|
<strong>{{.Commit.Committer.Name}}</strong>
|
|
|
|
{{end}}
|
|
|
|
{{end}}
|
2019-06-07 16:29:29 -04:00
|
|
|
<span class="text grey" id="authored-time">{{TimeSince .Commit.Author.When $.Lang}}</span>
|
|
|
|
</div>
|
|
|
|
<div class="seven wide right aligned column">
|
|
|
|
<div class="ui horizontal list">
|
|
|
|
{{if .Parents}}
|
|
|
|
<div class="item">
|
|
|
|
{{.i18n.Tr "repo.diff.parent"}}
|
|
|
|
</div>
|
|
|
|
<div class="item">
|
|
|
|
{{range .Parents}}
|
2020-05-16 12:38:40 -04:00
|
|
|
{{if $.PageIsWiki}}
|
|
|
|
<a class="ui blue sha label" href="{{$.RepoLink}}/wiki/commit/{{.}}">{{ShortSha .}}</a>
|
|
|
|
{{else}}
|
|
|
|
<a class="ui blue sha label" href="{{$.RepoLink}}/commit/{{.}}">{{ShortSha .}}</a>
|
|
|
|
{{end}}
|
2019-06-07 16:29:29 -04:00
|
|
|
{{end}}
|
|
|
|
</div>
|
|
|
|
{{end}}
|
|
|
|
<div class="mobile-only"></div>
|
|
|
|
<div class="item">{{.i18n.Tr "repo.diff.commit"}}</div>
|
|
|
|
<div class="item"><span class="ui blue sha label">{{ShortSha .CommitID}}</span></div>
|
|
|
|
</div>
|
|
|
|
</div><!-- end column -->
|
|
|
|
</div><!-- end grid -->
|
|
|
|
</div>
|
|
|
|
{{if .Commit.Signature}}
|
2020-02-27 14:20:55 -05:00
|
|
|
<div class="ui bottom attached message {{$class}}">
|
|
|
|
{{if .Verification.Verified }}
|
2019-10-16 09:42:42 -04:00
|
|
|
{{if ne .Verification.SigningUser.ID 0}}
|
2020-02-27 14:20:55 -05:00
|
|
|
<i class="lock icon"></i>
|
|
|
|
{{if eq .Verification.TrustStatus "trusted"}}
|
|
|
|
<span class="ui text">{{.i18n.Tr "repo.commits.signed_by"}}:</span>
|
|
|
|
{{else if eq .Verification.TrustStatus "untrusted"}}
|
|
|
|
<span class="ui text">{{.i18n.Tr "repo.commits.signed_by_untrusted_user"}}:</span>
|
|
|
|
{{else}}
|
|
|
|
<span class="ui text">{{.i18n.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}:</span>
|
|
|
|
{{end}}
|
2019-10-16 09:42:42 -04:00
|
|
|
<img class="ui avatar image" src="{{.Verification.SigningUser.RelAvatarLink}}" />
|
2020-02-27 14:20:55 -05:00
|
|
|
<a href="{{.Verification.SigningUser.HomeLink}}"><strong>{{.Verification.SigningUser.Name}}</strong> <{{.Verification.SigningEmail}}></a>
|
|
|
|
<span class="pull-right"><span class="ui text">{{.i18n.Tr "repo.commits.gpg_key_id"}}:</span> {{.Verification.SigningKey.KeyID}}</span>
|
2019-10-16 09:42:42 -04:00
|
|
|
{{else}}
|
|
|
|
<i class="icons" title="{{.i18n.Tr "gpg.default_key"}}">
|
2020-02-27 14:20:55 -05:00
|
|
|
<i class="lock icon"></i>
|
2019-10-16 09:42:42 -04:00
|
|
|
<i class="tiny inverted cog icon centerlock"></i>
|
|
|
|
</i>
|
2020-02-27 14:20:55 -05:00
|
|
|
<span class="ui text">{{.i18n.Tr "repo.commits.signed_by"}}:</span>
|
2019-10-16 09:42:42 -04:00
|
|
|
<img class="ui avatar image" src="{{AvatarLink .Verification.SigningEmail}}" />
|
|
|
|
<strong>{{.Verification.SigningUser.Name}}</strong> <{{.Verification.SigningEmail}}>
|
2020-02-27 14:20:55 -05:00
|
|
|
<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>
|
2019-10-16 09:42:42 -04:00
|
|
|
{{end}}
|
2020-02-27 14:20:55 -05:00
|
|
|
{{else if .Verification.Warning}}
|
|
|
|
<i class="unlock icon"></i>
|
|
|
|
<span class="ui text">{{.i18n.Tr .Verification.Reason}}</span>
|
|
|
|
<span class="pull-right"><span class="ui text">{{.i18n.Tr "repo.commits.gpg_key_id"}}:</span> <i class="warning icon"></i>{{.Verification.SigningKey.KeyID}}</span>
|
|
|
|
{{else}}
|
|
|
|
<i class="unlock icon"></i>
|
2019-06-07 16:29:29 -04:00
|
|
|
{{.i18n.Tr .Verification.Reason}}
|
2020-05-12 17:01:27 -04:00
|
|
|
{{if .Verification.SigningKey}}
|
|
|
|
{{if ne .Verification.SigningKey.KeyID ""}}
|
|
|
|
<span class="pull-right"><span class="ui text">{{.i18n.Tr "repo.commits.gpg_key_id"}}:</span> <i class="warning icon"></i>{{.Verification.SigningKey.KeyID}}</span>
|
|
|
|
{{end}}
|
2019-10-16 09:42:42 -04:00
|
|
|
{{end}}
|
2020-02-27 14:20:55 -05:00
|
|
|
{{end}}
|
|
|
|
</div>
|
2019-06-07 16:29:29 -04:00
|
|
|
{{end}}
|
|
|
|
{{if .Note}}
|
|
|
|
<div class="ui top attached info segment message git-notes">
|
|
|
|
<i class="sticky note icon"></i>
|
|
|
|
{{.i18n.Tr "repo.diff.git-notes"}}:
|
|
|
|
{{if .NoteAuthor}}
|
|
|
|
<a href="{{.NoteAuthor.HomeLink}}">
|
|
|
|
{{if .NoteAuthor.FullName}}
|
|
|
|
<strong>{{.NoteAuthor.FullName}}</strong>
|
|
|
|
{{else}}
|
|
|
|
<strong>{{.NoteCommit.Author.Name}}</strong>
|
|
|
|
{{end}}
|
|
|
|
</a>
|
|
|
|
{{else}}
|
|
|
|
<strong>{{.NoteCommit.Author.Name}}</strong>
|
|
|
|
{{end}}
|
|
|
|
<span class="text grey" id="note-authored-time">{{TimeSince .NoteCommit.Author.When $.Lang}}</span>
|
|
|
|
</div>
|
|
|
|
<div class="ui bottom attached info segment git-notes">
|
|
|
|
<pre class="commit-body">{{RenderNote .Note $.RepoLink $.Repository.ComposeMetas}}</pre>
|
|
|
|
</div>
|
|
|
|
{{end}}
|
|
|
|
{{template "repo/diff/box" .}}
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
{{template "base/footer" .}}
|