2019-06-07 23:29:29 +03:00
{{ template "base/head" . }}
2023-02-02 01:56:10 +03:00
<div role="main" aria-label=" {{ .Title }} " class="page-content repository diff">
2019-06-07 23:29:29 +03:00
{{ template "repo/header" . }}
2023-02-16 22:25:00 +03:00
<div class="ui container fluid padded">
2020-02-27 22:20:55 +03: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 }}
2023-02-21 03:16:56 +03:00
<div class="ui top attached header clearing segment gt-relative commit-header {{ $ class }} ">
2023-02-13 20:59:59 +03:00
<div class="gt-df gt-mb-4 gt-fw">
2023-06-14 21:17:58 +03:00
<h3 class="gt-mb-0 gt-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>
2022-02-09 23:28:55 +03:00
{{ if not $ .PageIsWiki }}
2023-03-24 13:35:38 +03:00
<div>
2022-05-20 01:08:08 +03:00
<a class="ui primary tiny button" href=" {{ .SourcePath }} ">
2022-06-27 23:58:46 +03:00
{{ .locale .Tr "repo.diff.browse_source" }}
2022-02-09 23:28:55 +03:00
</a>
{{ if and ( $ .Permission .CanWrite $ .UnitTypeCode ) ( not $ .Repository .IsArchived ) ( not .IsDeleted ) }} {{ - / * * / - }}
2023-06-25 05:40:41 +03:00
<div class="ui dropdown primary tiny button">
{{ .locale .Tr "repo.commit.operations" }}
2022-12-02 06:39:19 +03:00
{{ svg "octicon-triangle-down" 1 4 "dropdown icon" }}
2022-02-09 23:28:55 +03:00
<div class="menu">
2022-12-08 16:14:09 +03:00
<div class="ui header"> {{ .locale .Tr "repo.commit.operations" }} </div>
2022-02-09 23:28:55 +03:00
<div class="divider"></div>
<div class="item show-create-branch-modal"
2023-03-24 13:35:38 +03:00
data-content=" {{ $ .locale .Tr "repo.branch.new_branch_from" ( .CommitID ) }} " {{ / * used by the form * / }}
2022-02-09 23:28:55 +03:00
data-branch-from=" {{ ShortSha .CommitID }} "
data-branch-from-urlcomponent=" {{ .CommitID }} "
data-modal="#create-branch-modal">
2022-06-27 23:58:46 +03:00
{{ .locale .Tr "repo.branch.create_branch_operation" }}
2022-02-09 23:28:55 +03:00
</div>
<div class="item show-create-branch-modal"
2023-03-24 13:35:38 +03:00
data-content=" {{ $ .locale .Tr "repo.branch.new_branch_from" ( .CommitID ) }} " {{ / * used by the form * / }}
2022-02-09 23:28:55 +03:00
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">
2022-06-27 23:58:46 +03:00
{{ .locale .Tr "repo.tag.create_tag_operation" }}
2022-02-09 23:28:55 +03:00
</div>
<div class="item show-modal revert-button"
data-modal="#cherry-pick-modal"
data-modal-cherry-pick-type="revert"
2022-06-27 23:58:46 +03:00
data-modal-cherry-pick-header=" {{ $ .locale .Tr "repo.commit.revert-header" ( ShortSha .CommitID ) }} "
data-modal-cherry-pick-content=" {{ $ .locale .Tr "repo.commit.revert-content" }} "
2023-03-11 13:47:09 +03:00
data-modal-cherry-pick-submit=" {{ .locale .Tr "repo.commit.revert" }} "> {{ .locale .Tr "repo.commit.revert" }} </div>
2022-02-09 23:28:55 +03:00
<div class="item cherry-pick-button show-modal"
data-modal="#cherry-pick-modal"
data-modal-cherry-pick-type="cherry-pick"
2022-06-27 23:58:46 +03:00
data-modal-cherry-pick-header=" {{ $ .locale .Tr "repo.commit.cherry-pick-header" ( ShortSha .CommitID ) }} "
data-modal-cherry-pick-content=" {{ $ .locale .Tr "repo.commit.cherry-pick-content" }} "
2023-03-11 13:47:09 +03:00
data-modal-cherry-pick-submit=" {{ .locale .Tr "repo.commit.cherry-pick" }} "> {{ .locale .Tr "repo.commit.cherry-pick" }} </div>
2023-04-24 14:08:59 +03:00
<div class="ui g-modal-confirm modal" id="cherry-pick-modal">
2023-04-23 12:24:19 +03:00
<div class="header">
2022-02-09 23:28:55 +03:00
<span id="cherry-pick-header"></span>
</div>
2023-04-23 12:24:19 +03:00
<div class="content">
2022-02-09 23:28:55 +03:00
<p id="cherry-pick-content" class="branch-dropdown"></p>
{{ template "repo/branch_dropdown" dict "root" .
2023-03-11 13:47:09 +03:00
"noTag" true "disableCreateBranch" true
2022-02-09 23:28:55 +03:00
"branchForm" "branch-dropdown-form"
"branchURLPrefix" (printf "%s/_cherrypick/%s/" $.RepoLink .CommitID) "branchURLSuffix" ""
2023-03-11 13:47:09 +03:00
"setAction" true "submitForm" true}}
2023-06-14 21:17:58 +03:00
<form method="get" action=" {{ $ .RepoLink }} /_cherrypick/ {{ .CommitID }} / {{ if $ .BranchName }} {{ PathEscapeSegments $ .BranchName }} {{ else }} {{ PathEscapeSegments $ .Repository .DefaultBranch }} {{ end }} " id="branch-dropdown-form">
2022-02-09 23:28:55 +03:00
<input type="hidden" name="ref" value=" {{ if $ .BranchName }} {{ $ .BranchName }} {{ else }} {{ $ .Repository .DefaultBranch }} {{ end }} ">
<input type="hidden" name="refType" value="branch">
2023-03-27 19:05:51 +03:00
<input type="hidden" id="cherry-pick-type" name="cherry-pick-type"><br>
2022-02-09 23:28:55 +03:00
<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">
2022-06-27 23:58:46 +03:00
{{ .locale .Tr "repo.branch.new_branch" }}
2022-02-09 23:28:55 +03:00
</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>
2022-08-26 00:55:52 +03:00
{{ .locale .Tr "repo.branch.new_branch_from" "<span class=\"text\" id=\"modal-create-branch-from-span\"></span>" | Safe }}
2022-02-09 23:28:55 +03:00
</label>
</div>
<div class="required field">
2022-06-27 23:58:46 +03:00
<label for="new_branch_name"> {{ .locale .Tr "repo.branch.name" }} </label>
2022-02-09 23:28:55 +03:00
<input id="new_branch_name" name="new_branch_name" required>
</div>
<div class="text right actions">
2023-03-14 06:34:09 +03:00
<button class="ui cancel button"> {{ .locale .Tr "settings.cancel" }} </button>
2022-06-27 23:58:46 +03:00
<button class="ui green button"> {{ .locale .Tr "repo.branch.confirm_create_branch" }} </button>
2022-02-09 23:28:55 +03:00
</div>
</form>
</div>
</div>
<div class="ui small modal" id="create-tag-modal">
<div class="header">
2022-06-27 23:58:46 +03:00
{{ .locale .Tr "repo.tag.create_tag_operation" }}
2022-02-09 23:28:55 +03:00
</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>
2022-08-26 00:55:52 +03:00
{{ .locale .Tr "repo.tag.create_tag_from" "<span class=\"text\" id=\"modal-create-tag-from-span\"></span>" | Safe }}
2022-02-09 23:28:55 +03:00
</label>
</div>
<div class="required field">
2022-06-27 23:58:46 +03:00
<label for="new_branch_name"> {{ .locale .Tr "repo.release.tag_name" }} </label>
2022-02-09 23:28:55 +03:00
<input id="new_branch_name" name="new_branch_name" required>
</div>
<div class="text right actions">
2023-03-14 06:34:09 +03:00
<button class="ui cancel button"> {{ .locale .Tr "settings.cancel" }} </button>
2022-06-27 23:58:46 +03:00
<button class="ui green button"> {{ .locale .Tr "repo.tag.confirm_create_tag" }} </button>
2022-02-09 23:28:55 +03:00
</div>
</form>
</div>
</div>
</div>
</div>
{{ end }}
</div>
{{ end }}
</div>
2019-06-07 23:29:29 +03:00
{{ if IsMultilineCommitMessage .Commit .Message }}
2023-09-04 16:38:59 +03:00
<pre class="commit-body"> {{ RenderCommitBody $ .Context .Commit .Message $ .RepoLink $ .Repository .ComposeMetas }} </pre>
2019-06-07 23:29:29 +03:00
{{ end }}
2023-07-27 13:47:41 +03:00
{{ template "repo/commit_load_branches_and_tags" . }}
2019-06-07 23:29:29 +03:00
</div>
2023-02-13 20:59:59 +03:00
<div class="ui attached segment gt-df gt-ac gt-sb gt-py-2 commit-header-row gt-fw {{ $ class }} ">
<div class="gt-df gt-ac author">
2019-06-07 23:29:29 +03:00
{{ if .Author }}
2023-08-10 06:19:39 +03:00
{{ ctx .AvatarUtils .Avatar .Author 2 8 "gt-mr-3" }}
2020-12-03 21:46:11 +03: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 23:29:29 +03:00
{{ else }}
2023-08-10 06:19:39 +03:00
{{ ctx .AvatarUtils .AvatarByEmail .Commit .Author .Email .Commit .Author .Email 2 8 "gt-mr-3" }}
2019-06-07 23:29:29 +03:00
<strong> {{ .Commit .Author .Name }} </strong>
{{ end }}
2023-02-13 20:59:59 +03:00
<span class="text grey gt-ml-3" id="authored-time"> {{ TimeSince .Commit .Author .When $ .locale }} </span>
2019-10-16 16:42:42 +03:00
{{ if or ( ne .Commit .Committer .Name .Commit .Author .Name ) ( ne .Commit .Committer .Email .Commit .Author .Email ) }}
2023-02-13 20:59:59 +03:00
<span class="text grey gt-mx-3"> {{ .locale .Tr "repo.diff.committed_by" }} </span>
2021-12-01 02:40:17 +03:00
{{ if ne .Verification .CommittingUser .ID 0 }}
2023-08-10 06:19:39 +03:00
{{ ctx .AvatarUtils .Avatar .Verification .CommittingUser 2 8 "gt-mx-3" }}
2021-12-01 02:40:17 +03:00
<a href=" {{ .Verification .CommittingUser .HomeLink }} "><strong> {{ .Commit .Committer .Name }} </strong></a>
{{ else }}
2023-08-10 06:19:39 +03:00
{{ ctx .AvatarUtils .AvatarByEmail .Commit .Committer .Email .Commit .Committer .Name 2 8 "gt-mr-3" }}
2021-12-01 02:40:17 +03:00
<strong> {{ .Commit .Committer .Name }} </strong>
{{ end }}
{{ end }}
</div>
2023-02-13 20:59:59 +03:00
<div class="ui horizontal list gt-df gt-ac">
2021-12-01 02:40:17 +03:00
{{ if .Parents }}
<div class="item">
2022-06-27 23:58:46 +03:00
<span> {{ .locale .Tr "repo.diff.parent" }} </span>
2021-12-01 02:40:17 +03:00
{{ range .Parents }}
{{ if $ .PageIsWiki }}
2022-05-20 01:08:08 +03:00
<a class="ui primary sha label" href=" {{ $ .RepoLink }} /wiki/commit/ {{ PathEscape . }} "> {{ ShortSha . }} </a>
2021-12-01 02:40:17 +03:00
{{ else }}
2022-05-20 01:08:08 +03:00
<a class="ui primary sha label" href=" {{ $ .RepoLink }} /commit/ {{ PathEscape . }} "> {{ ShortSha . }} </a>
2021-12-01 02:40:17 +03:00
{{ end }}
2020-06-03 05:40:08 +03:00
{{ end }}
</div>
2019-10-16 16:42:42 +03:00
{{ end }}
2022-05-16 19:45:12 +03:00
<div class="item">
2022-06-27 23:58:46 +03:00
<span> {{ .locale .Tr "repo.diff.commit" }} </span>
2022-05-20 01:08:08 +03:00
<span class="ui primary sha label"> {{ ShortSha .CommitID }} </span>
2022-05-16 19:45:12 +03:00
</div>
2019-06-07 23:29:29 +03:00
</div>
</div>
{{ if .Commit .Signature }}
2023-07-08 12:53:56 +03:00
<div class="ui bottom attached message gt-text-left gt-df gt-ac gt-sb commit-header-row gt-fw {{ $ class }} ">
2023-02-13 20:59:59 +03:00
<div class="gt-df gt-ac">
2021-12-01 02:40:17 +03:00
{{ if .Verification .Verified }}
{{ if ne .Verification .SigningUser .ID 0 }}
2023-02-13 20:59:59 +03:00
{{ svg "gitea-lock" 1 6 "gt-mr-3" }}
2021-12-01 02:40:17 +03:00
{{ if eq .Verification .TrustStatus "trusted" }}
2023-02-13 20:59:59 +03:00
<span class="ui text gt-mr-3"> {{ .locale .Tr "repo.commits.signed_by" }} :</span>
2021-12-01 02:40:17 +03:00
{{ else if eq .Verification .TrustStatus "untrusted" }}
2023-02-13 20:59:59 +03:00
<span class="ui text gt-mr-3"> {{ .locale .Tr "repo.commits.signed_by_untrusted_user" }} :</span>
2021-12-01 02:40:17 +03:00
{{ else }}
2023-02-13 20:59:59 +03:00
<span class="ui text gt-mr-3"> {{ .locale .Tr "repo.commits.signed_by_untrusted_user_unmatched" }} :</span>
2021-12-01 02:40:17 +03:00
{{ end }}
2023-08-10 06:19:39 +03:00
{{ ctx .AvatarUtils .Avatar .Verification .SigningUser 2 8 "gt-mr-3" }}
2022-02-20 22:50:11 +03:00
<a href=" {{ .Verification .SigningUser .HomeLink }} "><strong> {{ .Verification .SigningUser .GetDisplayName }} </strong></a>
2020-02-27 22:20:55 +03:00
{{ else }}
2023-02-13 20:59:59 +03:00
<span title=" {{ .locale .Tr "gpg.default_key" }} "> {{ svg "gitea-lock-cog" 1 6 "gt-mr-3" }} </span>
<span class="ui text gt-mr-3"> {{ .locale .Tr "repo.commits.signed_by" }} :</span>
2023-08-10 06:19:39 +03:00
{{ ctx .AvatarUtils .AvatarByEmail .Verification .SigningEmail "" 2 8 }}
2022-02-20 22:50:11 +03:00
<strong> {{ .Verification .SigningUser .GetDisplayName }} </strong>
2020-02-27 22:20:55 +03:00
{{ end }}
2019-10-16 16:42:42 +03:00
{{ else }}
2023-02-13 20:59:59 +03:00
{{ svg "gitea-unlock" 1 6 "gt-mr-3" }}
2022-06-27 23:58:46 +03:00
<span class="ui text"> {{ .locale .Tr .Verification .Reason }} </span>
2019-10-16 16:42:42 +03:00
{{ end }}
2021-12-01 02:40:17 +03:00
</div>
2023-02-13 20:59:59 +03:00
<div class="gt-df gt-ac">
2021-12-01 02:40:17 +03:00
{{ if .Verification .Verified }}
{{ if ne .Verification .SigningUser .ID 0 }}
2023-03-17 08:12:40 +03:00
{{ svg "octicon-verified" 1 6 "gt-mr-3" }}
2021-12-19 08:37:18 +03:00
{{ if .Verification .SigningSSHKey }}
2023-02-13 20:59:59 +03:00
<span class="ui text gt-mr-3"> {{ .locale .Tr "repo.commits.ssh_key_fingerprint" }} :</span>
2021-12-19 08:37:18 +03:00
{{ .Verification .SigningSSHKey .Fingerprint }}
{{ else }}
2023-02-13 20:59:59 +03:00
<span class="ui text gt-mr-3"> {{ .locale .Tr "repo.commits.gpg_key_id" }} :</span>
2022-08-21 09:50:15 +03:00
{{ .Verification .SigningKey .PaddedKeyID }}
2021-12-19 08:37:18 +03:00
{{ end }}
2021-12-01 02:40:17 +03:00
{{ else }}
2023-03-17 08:12:40 +03:00
{{ svg "octicon-unverified" 1 6 "gt-mr-3" }}
2021-12-19 08:37:18 +03:00
{{ if .Verification .SigningSSHKey }}
2023-03-24 13:35:38 +03:00
<span class="ui text gt-mr-3" data-tooltip-content=" {{ .locale .Tr "gpg.default_key" }} "> {{ .locale .Tr "repo.commits.ssh_key_fingerprint" }} :</span>
2021-12-19 08:37:18 +03:00
{{ .Verification .SigningSSHKey .Fingerprint }}
{{ else }}
2023-03-24 13:35:38 +03:00
<span class="ui text gt-mr-3" data-tooltip-content=" {{ .locale .Tr "gpg.default_key" }} "> {{ .locale .Tr "repo.commits.gpg_key_id" }} :</span>
2022-08-21 09:50:15 +03:00
{{ .Verification .SigningKey .PaddedKeyID }}
2021-12-19 08:37:18 +03:00
{{ end }}
2021-12-01 02:40:17 +03:00
{{ end }}
{{ else if .Verification .Warning }}
2023-03-17 08:12:40 +03:00
{{ svg "octicon-unverified" 1 6 "gt-mr-3" }}
2021-12-19 08:37:18 +03:00
{{ if .Verification .SigningSSHKey }}
2023-02-13 20:59:59 +03:00
<span class="ui text gt-mr-3"> {{ .locale .Tr "repo.commits.ssh_key_fingerprint" }} :</span>
2021-12-19 08:37:18 +03:00
{{ .Verification .SigningSSHKey .Fingerprint }}
{{ else }}
2023-02-13 20:59:59 +03:00
<span class="ui text gt-mr-3"> {{ .locale .Tr "repo.commits.gpg_key_id" }} :</span>
2022-08-21 09:50:15 +03:00
{{ .Verification .SigningKey .PaddedKeyID }}
2021-12-19 08:37:18 +03:00
{{ end }}
2021-12-01 02:40:17 +03:00
{{ else }}
{{ if .Verification .SigningKey }}
{{ if ne .Verification .SigningKey .KeyID "" }}
2023-03-17 08:12:40 +03:00
{{ svg "octicon-verified" 1 6 "gt-mr-3" }}
2023-02-13 20:59:59 +03:00
<span class="ui text gt-mr-3"> {{ .locale .Tr "repo.commits.gpg_key_id" }} :</span>
2022-08-21 09:50:15 +03:00
{{ .Verification .SigningKey .PaddedKeyID }}
2021-12-01 02:40:17 +03:00
{{ end }}
2021-04-11 06:46:37 +03:00
{{ end }}
2021-12-19 08:37:18 +03:00
{{ if .Verification .SigningSSHKey }}
{{ if ne .Verification .SigningSSHKey .Fingerprint "" }}
2023-03-17 08:12:40 +03:00
{{ svg "octicon-verified" 1 6 "gt-mr-3" }}
2023-02-13 20:59:59 +03:00
<span class="ui text gt-mr-3"> {{ .locale .Tr "repo.commits.ssh_key_fingerprint" }} :</span>
2021-12-19 08:37:18 +03:00
{{ .Verification .SigningSSHKey .Fingerprint }}
{{ end }}
{{ end }}
2021-04-11 06:46:37 +03:00
{{ end }}
2021-12-01 02:40:17 +03:00
</div>
2020-02-27 22:20:55 +03:00
</div>
2019-06-07 23:29:29 +03:00
{{ end }}
{{ if .Note }}
2021-12-01 02:40:17 +03:00
<div class="ui top attached header segment git-notes">
2023-02-13 20:59:59 +03:00
{{ svg "octicon-note" 1 6 "gt-mr-3" }}
2022-06-27 23:58:46 +03:00
{{ .locale .Tr "repo.diff.git-notes" }} :
2019-06-07 23:29:29 +03:00
{{ if .NoteAuthor }}
<a href=" {{ .NoteAuthor .HomeLink }} ">
{{ if .NoteAuthor .FullName }}
2021-04-11 06:46:37 +03:00
<strong> {{ .NoteAuthor .FullName }} </strong>
2019-06-07 23:29:29 +03:00
{{ else }}
2021-04-11 06:46:37 +03:00
<strong> {{ .NoteCommit .Author .Name }} </strong>
2019-06-07 23:29:29 +03:00
{{ end }}
</a>
{{ else }}
<strong> {{ .NoteCommit .Author .Name }} </strong>
{{ end }}
2022-06-27 23:58:46 +03:00
<span class="text grey" id="note-authored-time"> {{ TimeSince .NoteCommit .Author .When $ .locale }} </span>
2019-06-07 23:29:29 +03:00
</div>
<div class="ui bottom attached info segment git-notes">
2022-01-20 02:26:57 +03:00
<pre class="commit-body"> {{ RenderNote $ .Context .Note $ .RepoLink $ .Repository .ComposeMetas }} </pre>
2019-06-07 23:29:29 +03:00
</div>
{{ end }}
{{ template "repo/diff/box" . }}
</div>
</div>
{{ template "base/footer" . }}