2019-06-07 20:29:29 +00:00
|
|
|
{{template "base/head" .}}
|
2020-12-01 04:00:14 +00:00
|
|
|
<div class="page-content repository diff">
|
2019-06-07 20:29:29 +00:00
|
|
|
{{template "repo/header" .}}
|
|
|
|
|
<div class="ui container {{if .IsSplitStyle}}fluid padded{{end}}">
|
2020-02-27 19:20:55 +00: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}}
|
2021-11-30 23:40:17 +00:00
|
|
|
<div class="ui top attached header clearing segment pr {{$class}}">
|
2022-02-09 20:28:55 +00:00
|
|
|
<div class="df mb-4">
|
|
|
|
|
<h3 class="mb-0 f1"><span class="commit-summary" title="{{.Commit.Summary}}">{{RenderCommitMessage $.Context .Commit.Message $.RepoLink $.Repository.ComposeMetas}}</span>{{template "repo/commit_statuses" dict "Status" .CommitStatus "Statuses" .CommitStatuses "root" $}}</h3>
|
|
|
|
|
{{if not $.PageIsWiki}}
|
|
|
|
|
<div class="ui">
|
|
|
|
|
<a class="ui blue tiny button" href="{{.SourcePath}}">
|
|
|
|
|
{{.i18n.Tr "repo.diff.browse_source"}}
|
|
|
|
|
</a>
|
|
|
|
|
{{if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}}{{- /* */ -}}
|
|
|
|
|
<div class="ui blue tiny floating dropdown icon button">{{.i18n.Tr "repo.commit.actions"}}
|
|
|
|
|
{{svg "octicon-triangle-down" 14 "dropdown icon"}}<span class="sr-mobile-only">{{.i18n.Tr "repo.commit.actions"}}</span>
|
|
|
|
|
<div class="menu">
|
|
|
|
|
<div class="ui header">{{.i18n.Tr "repo.commit.actions"}}</div>
|
|
|
|
|
<div class="divider"></div>
|
|
|
|
|
<div class="item show-create-branch-modal"
|
|
|
|
|
data-content="{{$.i18n.Tr "repo.branch.new_branch_from" (.CommitID)}}"
|
|
|
|
|
data-branch-from="{{ShortSha .CommitID}}"
|
|
|
|
|
data-branch-from-urlcomponent="{{.CommitID}}"
|
|
|
|
|
data-modal="#create-branch-modal">
|
|
|
|
|
{{.i18n.Tr "repo.branch.create_branch_operation"}}
|
|
|
|
|
</div>
|
|
|
|
|
<div class="item show-create-branch-modal"
|
|
|
|
|
data-content="{{$.i18n.Tr "repo.branch.new_branch_from" (.CommitID)}}"
|
|
|
|
|
data-branch-from="{{ShortSha .CommitID}}"
|
|
|
|
|
data-branch-from-urlcomponent="{{.CommitID}}"
|
|
|
|
|
data-modal="#create-tag-modal"
|
|
|
|
|
data-modal-from-span="#modal-create-tag-from-span"
|
|
|
|
|
data-modal-form="#create-tag-form">
|
|
|
|
|
{{.i18n.Tr "repo.tag.create_tag_operation"}}
|
|
|
|
|
</div>
|
|
|
|
|
<div class="item show-modal revert-button"
|
|
|
|
|
data-modal="#cherry-pick-modal"
|
|
|
|
|
data-modal-cherry-pick-type="revert"
|
|
|
|
|
data-modal-cherry-pick-header="{{$.i18n.Tr "repo.commit.revert-header" (ShortSha .CommitID)}}"
|
|
|
|
|
data-modal-cherry-pick-content="{{$.i18n.Tr "repo.commit.revert-content"}}"
|
|
|
|
|
data-modal-cherry-pick-submit="{{.i18n.Tr "repo.commit.revert"}}">{{.i18n.Tr "repo.commit.revert"}}</a></div>
|
|
|
|
|
<div class="item cherry-pick-button show-modal"
|
|
|
|
|
data-modal="#cherry-pick-modal"
|
|
|
|
|
data-modal-cherry-pick-type="cherry-pick"
|
|
|
|
|
data-modal-cherry-pick-header="{{$.i18n.Tr "repo.commit.cherry-pick-header" (ShortSha .CommitID)}}"
|
|
|
|
|
data-modal-cherry-pick-content="{{$.i18n.Tr "repo.commit.cherry-pick-content"}}"
|
|
|
|
|
data-modal-cherry-pick-submit="{{.i18n.Tr "repo.commit.cherry-pick"}}">{{.i18n.Tr "repo.commit.cherry-pick"}}</a></div>
|
|
|
|
|
<div class="ui basic modal" id="cherry-pick-modal">
|
|
|
|
|
<div class="ui icon header">
|
|
|
|
|
<span id="cherry-pick-header"></span>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="content center">
|
|
|
|
|
<p id="cherry-pick-content" class="branch-dropdown"></p>
|
|
|
|
|
{{template "repo/branch_dropdown" dict "root" .
|
|
|
|
|
"noTag" "true" "canCreateBranch" "false"
|
|
|
|
|
"branchForm" "branch-dropdown-form"
|
|
|
|
|
"branchURLPrefix" (printf "%s/_cherrypick/%s/" $.RepoLink .CommitID) "branchURLSuffix" ""
|
|
|
|
|
"setAction" "true" "submitForm" "true"}}
|
|
|
|
|
<form method="GET" action="{{$.RepoLink}}/_cherrypick/{{.CommitID}}/{{if $.BranchName}}{{PathEscapeSegments $.BranchName}}{{else}}{{PathEscapeSegments $.Repository.DefaultBranch}}{{end}}" id="branch-dropdown-form">
|
|
|
|
|
<input type="hidden" name="ref" value="{{if $.BranchName}}{{$.BranchName}}{{else}}{{$.Repository.DefaultBranch}}{{end}}">
|
|
|
|
|
<input type="hidden" name="refType" value="branch">
|
|
|
|
|
<input type="hidden" id="cherry-pick-type" name="cherry-pick-type"><br/>
|
|
|
|
|
<button type="submit" id="cherry-pick-submit" class="ui green button"></button>
|
|
|
|
|
</form>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="ui small modal" id="create-branch-modal">
|
|
|
|
|
<div class="header">
|
|
|
|
|
{{.i18n.Tr "repo.branch.new_branch"}}
|
|
|
|
|
</div>
|
|
|
|
|
<div class="content">
|
|
|
|
|
<form class="ui form" id="create-branch-form" action="" data-base-action="{{.RepoLink}}/branches/_new/commit/" method="post">
|
|
|
|
|
{{.CsrfTokenHtml}}
|
|
|
|
|
<div class="field">
|
|
|
|
|
<label>
|
|
|
|
|
{{.i18n.Tr "repo.branch.new_branch_from" "<span class=\"text\" id=\"modal-create-branch-from-span\"></span>" | Safe }}
|
|
|
|
|
</label>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="required field">
|
|
|
|
|
<label for="new_branch_name">{{.i18n.Tr "repo.branch.name"}}</label>
|
|
|
|
|
<input id="new_branch_name" name="new_branch_name" required>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<div class="text right actions">
|
|
|
|
|
<div class="ui cancel button">{{.i18n.Tr "settings.cancel"}}</div>
|
|
|
|
|
<button class="ui green button">{{.i18n.Tr "repo.branch.confirm_create_branch"}}</button>
|
|
|
|
|
</div>
|
|
|
|
|
</form>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="ui small modal" id="create-tag-modal">
|
|
|
|
|
<div class="header">
|
|
|
|
|
{{.i18n.Tr "repo.tag.create_tag_operation"}}
|
|
|
|
|
</div>
|
|
|
|
|
<div class="content">
|
|
|
|
|
<form class="ui form" id="create-tag-form" action="" data-base-action="{{.RepoLink}}/branches/_new/commit/" method="post">
|
|
|
|
|
{{.CsrfTokenHtml}}
|
|
|
|
|
<input type="hidden" name="create_tag" value="true">
|
|
|
|
|
<div class="field">
|
|
|
|
|
<label>
|
|
|
|
|
{{.i18n.Tr "repo.tag.create_tag_from" "<span class=\"text\" id=\"modal-create-tag-from-span\"></span>" | Safe }}
|
|
|
|
|
</label>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="required field">
|
|
|
|
|
<label for="new_branch_name">{{.i18n.Tr "repo.release.tag_name"}}</label>
|
|
|
|
|
<input id="new_branch_name" name="new_branch_name" required>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<div class="text right actions">
|
|
|
|
|
<div class="ui cancel button">{{.i18n.Tr "settings.cancel"}}</div>
|
|
|
|
|
<button class="ui green button">{{.i18n.Tr "repo.tag.confirm_create_tag"}}</button>
|
|
|
|
|
</div>
|
|
|
|
|
</form>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
2019-06-07 20:29:29 +00:00
|
|
|
{{if IsMultilineCommitMessage .Commit.Message}}
|
2022-02-09 20:28:55 +00:00
|
|
|
<pre class="commit-body mt-0">{{RenderCommitBody $.Context .Commit.Message $.RepoLink $.Repository.ComposeMetas}}</pre>
|
2019-06-07 20:29:29 +00:00
|
|
|
{{end}}
|
2020-05-23 19:49:48 +00:00
|
|
|
{{if .BranchName}}
|
2021-11-30 23:40:17 +00:00
|
|
|
<span class="text grey mr-3">{{svg "octicon-git-branch" 16 "mr-2"}}{{.BranchName}}</span>
|
2020-05-23 19:49:48 +00:00
|
|
|
{{end}}
|
2020-06-11 19:42:55 +00:00
|
|
|
{{if .TagName}}
|
2021-11-30 23:40:17 +00:00
|
|
|
<span class="text grey mr-3">{{svg "octicon-tag" 16 "mr-2"}}{{.TagName}}</span>
|
2020-06-11 19:42:55 +00:00
|
|
|
{{end}}
|
2019-06-07 20:29:29 +00:00
|
|
|
</div>
|
2021-11-30 23:40:17 +00:00
|
|
|
<div class="ui attached segment df ac sb py-2 commit-header-row {{$class}}">
|
|
|
|
|
<div class="df ac">
|
2019-06-07 20:29:29 +00:00
|
|
|
{{if .Author}}
|
2021-11-30 23:40:17 +00:00
|
|
|
{{avatar .Author 28 "mr-3"}}
|
2020-12-03 18:46:11 +00:00
|
|
|
{{if .Author.FullName}}
|
|
|
|
|
<a href="{{.Author.HomeLink}}"><strong>{{.Author.FullName}}</strong></a>
|
|
|
|
|
{{else}}
|
|
|
|
|
<a href="{{.Author.HomeLink}}"><strong>{{.Commit.Author.Name}}</strong></a>
|
|
|
|
|
{{end}}
|
2019-06-07 20:29:29 +00:00
|
|
|
{{else}}
|
2021-11-30 23:40:17 +00:00
|
|
|
{{avatarByEmail .Commit.Author.Email .Commit.Author.Email 28 "mr-3"}}
|
2019-06-07 20:29:29 +00:00
|
|
|
<strong>{{.Commit.Author.Name}}</strong>
|
|
|
|
|
{{end}}
|
2022-02-08 03:02:30 +00:00
|
|
|
<span class="text grey ml-3" id="authored-time">{{TimeSince .Commit.Author.When $.i18n.Lang}}</span>
|
2019-10-16 13:42:42 +00:00
|
|
|
{{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}}
|
2021-11-30 23:40:17 +00:00
|
|
|
<span class="text grey mx-3">{{.i18n.Tr "repo.diff.committed_by"}}</span>
|
|
|
|
|
{{if ne .Verification.CommittingUser.ID 0}}
|
|
|
|
|
{{avatar .Verification.CommittingUser 28 "mx-3"}}
|
|
|
|
|
<a href="{{.Verification.CommittingUser.HomeLink}}"><strong>{{.Commit.Committer.Name}}</strong></a>
|
|
|
|
|
{{else}}
|
|
|
|
|
{{avatarByEmail .Commit.Committer.Email .Commit.Committer.Name 28 "mr-3"}}
|
|
|
|
|
<strong>{{.Commit.Committer.Name}}</strong>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
<div class="ui horizontal list df ac">
|
|
|
|
|
{{if .Parents}}
|
|
|
|
|
<div class="item">
|
|
|
|
|
{{.i18n.Tr "repo.diff.parent"}}
|
|
|
|
|
</div>
|
|
|
|
|
<div class="item">
|
|
|
|
|
{{range .Parents}}
|
|
|
|
|
{{if $.PageIsWiki}}
|
|
|
|
|
<a class="ui blue sha label" href="{{$.RepoLink}}/wiki/commit/{{PathEscape .}}">{{ShortSha .}}</a>
|
|
|
|
|
{{else}}
|
|
|
|
|
<a class="ui blue sha label" href="{{$.RepoLink}}/commit/{{PathEscape .}}">{{ShortSha .}}</a>
|
|
|
|
|
{{end}}
|
2020-06-03 02:40:08 +00:00
|
|
|
{{end}}
|
|
|
|
|
</div>
|
2019-10-16 13:42:42 +00:00
|
|
|
{{end}}
|
2021-11-30 23:40:17 +00:00
|
|
|
<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>
|
2019-06-07 20:29:29 +00:00
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{if .Commit.Signature}}
|
2021-11-30 23:40:17 +00:00
|
|
|
<div class="ui bottom attached message tl df ac sb commit-header-row {{$class}}">
|
|
|
|
|
<div class="df ac">
|
|
|
|
|
{{if .Verification.Verified}}
|
|
|
|
|
{{if ne .Verification.SigningUser.ID 0}}
|
|
|
|
|
{{svg "gitea-lock" 16 "mr-3"}}
|
|
|
|
|
{{if eq .Verification.TrustStatus "trusted"}}
|
|
|
|
|
<span class="ui text mr-3">{{.i18n.Tr "repo.commits.signed_by"}}:</span>
|
|
|
|
|
{{else if eq .Verification.TrustStatus "untrusted"}}
|
|
|
|
|
<span class="ui text mr-3">{{.i18n.Tr "repo.commits.signed_by_untrusted_user"}}:</span>
|
|
|
|
|
{{else}}
|
|
|
|
|
<span class="ui text mr-3">{{.i18n.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}:</span>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{avatar .Verification.SigningUser 28}}
|
2022-02-20 19:50:11 +00:00
|
|
|
<a href="{{.Verification.SigningUser.HomeLink}}"><strong>{{.Verification.SigningUser.GetDisplayName}}</strong></a>
|
2020-02-27 19:20:55 +00:00
|
|
|
{{else}}
|
2021-11-30 23:40:17 +00:00
|
|
|
<span title="{{.i18n.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog"}}</span>
|
|
|
|
|
<span class="ui text">{{.i18n.Tr "repo.commits.signed_by"}}:</span>
|
|
|
|
|
{{avatarByEmail .Verification.SigningEmail "" 28}}
|
2022-02-20 19:50:11 +00:00
|
|
|
<strong>{{.Verification.SigningUser.GetDisplayName}}</strong>
|
2020-02-27 19:20:55 +00:00
|
|
|
{{end}}
|
2019-10-16 13:42:42 +00:00
|
|
|
{{else}}
|
2021-11-30 23:40:17 +00:00
|
|
|
{{svg "gitea-unlock" 16 "mr-3"}}
|
|
|
|
|
<span class="ui text">{{.i18n.Tr .Verification.Reason}}</span>
|
2019-10-16 13:42:42 +00:00
|
|
|
{{end}}
|
2021-11-30 23:40:17 +00:00
|
|
|
</div>
|
|
|
|
|
<div class="df ac">
|
|
|
|
|
{{if .Verification.Verified}}
|
|
|
|
|
{{if ne .Verification.SigningUser.ID 0}}
|
|
|
|
|
{{svg "octicon-shield-check" 16 "mr-3"}}
|
2021-12-19 05:37:18 +00:00
|
|
|
{{if .Verification.SigningSSHKey}}
|
|
|
|
|
<span class="ui text mr-3">{{.i18n.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
|
|
|
|
|
{{.Verification.SigningSSHKey.Fingerprint}}
|
|
|
|
|
{{else}}
|
|
|
|
|
<span class="ui text mr-3">{{.i18n.Tr "repo.commits.gpg_key_id"}}:</span>
|
|
|
|
|
{{.Verification.SigningKey.KeyID}}
|
|
|
|
|
{{end}}
|
2021-11-30 23:40:17 +00:00
|
|
|
{{else}}
|
|
|
|
|
{{svg "octicon-shield-lock" 16 "mr-3"}}
|
2021-12-19 05:37:18 +00:00
|
|
|
{{if .Verification.SigningSSHKey}}
|
|
|
|
|
<span class="ui text mr-3 tooltip" data-content="{{.i18n.Tr "gpg.default_key"}}">{{.i18n.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
|
|
|
|
|
{{.Verification.SigningSSHKey.Fingerprint}}
|
|
|
|
|
{{else}}
|
|
|
|
|
<span class="ui text mr-3 tooltip" data-content="{{.i18n.Tr "gpg.default_key"}}">{{.i18n.Tr "repo.commits.gpg_key_id"}}:</span>
|
|
|
|
|
{{.Verification.SigningKey.KeyID}}
|
|
|
|
|
{{end}}
|
2021-11-30 23:40:17 +00:00
|
|
|
{{end}}
|
|
|
|
|
{{else if .Verification.Warning}}
|
|
|
|
|
{{svg "octicon-shield" 16 "mr-3"}}
|
2021-12-19 05:37:18 +00:00
|
|
|
{{if .Verification.SigningSSHKey}}
|
|
|
|
|
<span class="ui text mr-3">{{.i18n.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
|
|
|
|
|
{{.Verification.SigningSSHKey.Fingerprint}}
|
|
|
|
|
{{else}}
|
|
|
|
|
<span class="ui text mr-3">{{.i18n.Tr "repo.commits.gpg_key_id"}}:</span>
|
|
|
|
|
{{.Verification.SigningKey.KeyID}}
|
|
|
|
|
{{end}}
|
2021-11-30 23:40:17 +00:00
|
|
|
{{else}}
|
|
|
|
|
{{if .Verification.SigningKey}}
|
|
|
|
|
{{if ne .Verification.SigningKey.KeyID ""}}
|
|
|
|
|
{{svg "octicon-shield" 16 "mr-3"}}
|
|
|
|
|
<span class="ui text mr-3">{{.i18n.Tr "repo.commits.gpg_key_id"}}:</span>
|
|
|
|
|
{{.Verification.SigningKey.KeyID}}
|
|
|
|
|
{{end}}
|
2021-04-11 03:46:37 +00:00
|
|
|
{{end}}
|
2021-12-19 05:37:18 +00:00
|
|
|
{{if .Verification.SigningSSHKey}}
|
|
|
|
|
{{if ne .Verification.SigningSSHKey.Fingerprint ""}}
|
|
|
|
|
{{svg "octicon-shield" 16 "mr-3"}}
|
|
|
|
|
<span class="ui text mr-3">{{.i18n.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
|
|
|
|
|
{{.Verification.SigningSSHKey.Fingerprint}}
|
|
|
|
|
{{end}}
|
|
|
|
|
{{end}}
|
2021-04-11 03:46:37 +00:00
|
|
|
{{end}}
|
2021-11-30 23:40:17 +00:00
|
|
|
</div>
|
2020-02-27 19:20:55 +00:00
|
|
|
</div>
|
2019-06-07 20:29:29 +00:00
|
|
|
{{end}}
|
|
|
|
|
{{if .Note}}
|
2021-11-30 23:40:17 +00:00
|
|
|
<div class="ui top attached header segment git-notes">
|
|
|
|
|
{{svg "octicon-note" 16 "mr-3"}}
|
2019-06-07 20:29:29 +00:00
|
|
|
{{.i18n.Tr "repo.diff.git-notes"}}:
|
|
|
|
|
{{if .NoteAuthor}}
|
|
|
|
|
<a href="{{.NoteAuthor.HomeLink}}">
|
|
|
|
|
{{if .NoteAuthor.FullName}}
|
2021-04-11 03:46:37 +00:00
|
|
|
<strong>{{.NoteAuthor.FullName}}</strong>
|
2019-06-07 20:29:29 +00:00
|
|
|
{{else}}
|
2021-04-11 03:46:37 +00:00
|
|
|
<strong>{{.NoteCommit.Author.Name}}</strong>
|
2019-06-07 20:29:29 +00:00
|
|
|
{{end}}
|
|
|
|
|
</a>
|
|
|
|
|
{{else}}
|
|
|
|
|
<strong>{{.NoteCommit.Author.Name}}</strong>
|
|
|
|
|
{{end}}
|
2022-02-08 03:02:30 +00:00
|
|
|
<span class="text grey" id="note-authored-time">{{TimeSince .NoteCommit.Author.When $.i18n.Lang}}</span>
|
2019-06-07 20:29:29 +00:00
|
|
|
</div>
|
|
|
|
|
<div class="ui bottom attached info segment git-notes">
|
2022-01-19 23:26:57 +00:00
|
|
|
<pre class="commit-body">{{RenderNote $.Context .Note $.RepoLink $.Repository.ComposeMetas}}</pre>
|
2019-06-07 20:29:29 +00:00
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{template "repo/diff/box" .}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{template "base/footer" .}}
|
