diff --git a/pyproject.toml b/pyproject.toml index 7ccde9f2b32..e94e01e2908 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,11 +5,11 @@ requires-python = ">=3.10" [dependency-groups] dev = [ - "djlint==1.44.2", + "djlint==1.46.0", "yamllint==1.38.0", "zizmor==1.30.0", ] [tool.djlint] profile="golang" -ignore="H005,H013,H016,H020,H021,H030" +ignore="H005,H013,H016,H020,H021,H030,H045,H046,H054" diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 40f19667b3c..523820c5488 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -428,8 +428,8 @@
- - + diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index 6bc273c80df..1d9559b15f2 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -72,7 +72,7 @@
- +
diff --git a/templates/admin/badge/edit.tmpl b/templates/admin/badge/edit.tmpl index 582ba60cd65..0d2e1c16dde 100644 --- a/templates/admin/badge/edit.tmpl +++ b/templates/admin/badge/edit.tmpl @@ -21,8 +21,8 @@
- - + +
diff --git a/templates/admin/badge/list.tmpl b/templates/admin/badge/list.tmpl index 691bc44811f..86e769fd9f4 100644 --- a/templates/admin/badge/list.tmpl +++ b/templates/admin/badge/list.tmpl @@ -20,10 +20,10 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- - - - + + + +
diff --git a/templates/admin/badge/new.tmpl b/templates/admin/badge/new.tmpl index 0c64c39608c..18174948849 100644 --- a/templates/admin/badge/new.tmpl +++ b/templates/admin/badge/new.tmpl @@ -18,7 +18,7 @@
- +
diff --git a/templates/admin/badge/users.tmpl b/templates/admin/badge/users.tmpl index 051de1b4666..ef660ca448b 100644 --- a/templates/admin/badge/users.tmpl +++ b/templates/admin/badge/users.tmpl @@ -8,7 +8,7 @@ - + {{if .Users}} diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 14fbf448fab..0bd6e7a5090 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -223,7 +223,7 @@
- + {{end}} @@ -249,7 +249,7 @@
{{ctx.Locale.Tr "admin.config.cache_test"}}
- +
diff --git a/templates/admin/config_settings/instance.tmpl b/templates/admin/config_settings/instance.tmpl index c6203aca4a3..05b2323214c 100644 --- a/templates/admin/config_settings/instance.tmpl +++ b/templates/admin/config_settings/instance.tmpl @@ -57,7 +57,7 @@
{{ctx.Locale.Tr "admin.config.common.skip_time_check"}}
- +
diff --git a/templates/admin/config_settings/repository.tmpl b/templates/admin/config_settings/repository.tmpl index 2d5845ba4ed..339e281ddac 100644 --- a/templates/admin/config_settings/repository.tmpl +++ b/templates/admin/config_settings/repository.tmpl @@ -21,7 +21,7 @@
- +
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl index c4c29fc8306..98ab7310049 100644 --- a/templates/admin/notice.tmpl +++ b/templates/admin/notice.tmpl @@ -50,7 +50,7 @@ - diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index 1b3bcb46177..41fba825f86 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -6,7 +6,7 @@ {{ctx.Locale.Tr "admin.packages.unreferenced_size" (FormatByteSize .TotalUnreferencedBlobSize)}})
- +
diff --git a/templates/admin/queue_manage.tmpl b/templates/admin/queue_manage.tmpl index a57273f0556..c57979dac9b 100644 --- a/templates/admin/queue_manage.tmpl +++ b/templates/admin/queue_manage.tmpl @@ -31,7 +31,7 @@ {{else}} {{$sum}}
- +
{{end}} @@ -51,7 +51,7 @@ - + diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index 8e9b8937968..981fe48a408 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -101,7 +101,7 @@

{{ctx.Locale.Tr "repo.settings.delete_desc"}}

{{ctx.Locale.Tr "repo.settings.delete_notices_2" (HTMLFormat `` "repo-name")}}
- {{ctx.Locale.Tr "repo.settings.delete_notices_fork_1"}}
+ {{ctx.Locale.Tr "repo.settings.delete_notices_fork_1"}}
{{template "base/modal_actions_confirm" .}} diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index db27b11ac57..c3ea0ad98a5 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -23,7 +23,7 @@
{{svg "octicon-file-directory-fill"}} {{$dir}}
- + diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl index 8fe91bd343e..c651ae9c5b7 100644 --- a/templates/admin/user/new.tmpl +++ b/templates/admin/user/new.tmpl @@ -81,7 +81,7 @@ {{end}}
- +
diff --git a/templates/admin/user/view.tmpl b/templates/admin/user/view.tmpl index 63011e47c6d..9492037560a 100644 --- a/templates/admin/user/view.tmpl +++ b/templates/admin/user/view.tmpl @@ -6,7 +6,7 @@

{{.Title}} - + {{ctx.Locale.Tr "admin.users.edit"}}

diff --git a/templates/admin/user/view_orgs.tmpl b/templates/admin/user/view_orgs.tmpl index e0f3980fd3e..f3145f30a75 100644 --- a/templates/admin/user/view_orgs.tmpl +++ b/templates/admin/user/view_orgs.tmpl @@ -4,7 +4,7 @@

{{ctx.Locale.Tr "settings.organization"}} ({{ctx.Locale.Tr "admin.total" $userOrgsTotal}}) {{if $userOrgs}} - +

form-fetch-action

- +
-
+
bad action url
-
+
diff --git a/templates/devtest/flex-list.tmpl b/templates/devtest/flex-list.tmpl index 2551941f7ff..65808ebb5a6 100644 --- a/templates/devtest/flex-list.tmpl +++ b/templates/devtest/flex-list.tmpl @@ -33,13 +33,13 @@

- - -
@@ -62,7 +62,7 @@
-
diff --git a/templates/devtest/fomantic-dropdown.tmpl b/templates/devtest/fomantic-dropdown.tmpl index 8fea2307689..020eb337bdd 100644 --- a/templates/devtest/fomantic-dropdown.tmpl +++ b/templates/devtest/fomantic-dropdown.tmpl @@ -41,7 +41,7 @@
- +
{{svg "octicon-triangle-down"}}
diff --git a/templates/devtest/fomantic-modal.tmpl b/templates/devtest/fomantic-modal.tmpl index 98c3f332ae7..19e4caafbcb 100644 --- a/templates/devtest/fomantic-modal.tmpl +++ b/templates/devtest/fomantic-modal.tmpl @@ -72,7 +72,7 @@
- - - - + + + +

  • Recommended colors:

    - - - - + + + +

  • Inline / Plain:

    - - - + + +
    • @@ -50,10 +50,10 @@

    Buttons

    -
    -
    -
    -
    +
    +
    +
    +
    @@ -128,12 +128,12 @@

    Button with SVG

    - +
    - + 123
    - +

    Input with SVG

    @@ -152,7 +152,7 @@

    Tailwind CSS Demo

    - +
    {{template "devtest/devtest-footer"}} diff --git a/templates/devtest/keyboard-shortcut.tmpl b/templates/devtest/keyboard-shortcut.tmpl index 4b55c0a1e99..e68ab28d93c 100644 --- a/templates/devtest/keyboard-shortcut.tmpl +++ b/templates/devtest/keyboard-shortcut.tmpl @@ -15,7 +15,7 @@ T
    - +
    diff --git a/templates/devtest/toast-and-message.tmpl b/templates/devtest/toast-and-message.tmpl index 7c6d347784d..f1de2e279c0 100644 --- a/templates/devtest/toast-and-message.tmpl +++ b/templates/devtest/toast-and-message.tmpl @@ -4,12 +4,12 @@

    Toast

    - - - - - - + + + + + +
    diff --git a/templates/install.tmpl b/templates/install.tmpl index bc6fed08e95..4fe5a9bff39 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -321,11 +321,11 @@
    {{$copyBtn := svg "octicon-copy" 14}} - {{$filePath := HTMLFormat `%s ` .CustomConfFile .CustomConfFile $copyBtn}} + {{$filePath := HTMLFormat `%s ` .CustomConfFile .CustomConfFile $copyBtn}} {{ctx.Locale.Tr "install.config_write_file_prompt" $filePath}}
    - +
    diff --git a/templates/mail/repo/release.tmpl b/templates/mail/repo/release.tmpl index a68d990ff0d..533d8ea825d 100644 --- a/templates/mail/repo/release.tmpl +++ b/templates/mail/repo/release.tmpl @@ -24,8 +24,7 @@ {{.Release.RenderedNote}} {{end -}}

    -

    -

    +

    ---
    {{.locale.Tr "mail.release.downloads"}} diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl index 60d659c8cb8..e7c47db1e9d 100644 --- a/templates/org/create.tmpl +++ b/templates/org/create.tmpl @@ -41,7 +41,7 @@

    -
    diff --git a/templates/org/follow_unfollow.tmpl b/templates/org/follow_unfollow.tmpl index 77977c12794..cccc84863ef 100644 --- a/templates/org/follow_unfollow.tmpl +++ b/templates/org/follow_unfollow.tmpl @@ -1,4 +1,4 @@ - {{else if $.IsOrganizationOwner}} - +
    {{template "repo/issue/labels/label_list" .}} diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index 939f5072f6b..25f8b333b0d 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -49,7 +49,7 @@ {{end}}
    - +
    @@ -60,8 +60,8 @@ {{template "shared/avatar_upload_crop" dict "LabelText" (ctx.Locale.Tr "settings.choose_new_avatar")}}
    - - + +
    diff --git a/templates/org/settings/options_dangerzone.tmpl b/templates/org/settings/options_dangerzone.tmpl index ed9cb4e4622..e28a10c9282 100644 --- a/templates/org/settings/options_dangerzone.tmpl +++ b/templates/org/settings/options_dangerzone.tmpl @@ -9,7 +9,7 @@
    {{ctx.Locale.Tr "org.settings.visibility_desc"}}
    - +
    @@ -19,7 +19,7 @@
    {{ctx.Locale.Tr "org.settings.rename_desc"}}
    - +
    @@ -29,7 +29,7 @@
    {{ctx.Locale.Tr "org.settings.delete_prompt"}}
    - +
    @@ -65,8 +65,8 @@
    - - + +
    @@ -101,8 +101,8 @@
    - - + +
    @@ -134,8 +134,8 @@
    - - + +
    diff --git a/templates/org/team/invite.tmpl b/templates/org/team/invite.tmpl index d591414efc7..594b86301ef 100644 --- a/templates/org/team/invite.tmpl +++ b/templates/org/team/invite.tmpl @@ -9,7 +9,7 @@
    {{ctx.Locale.Tr "org.teams.invite.by" .Inviter.Name}}
    {{ctx.Locale.Tr "org.teams.invite.description"}}
    - +
    diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index 2b51764cb4f..78af9086e57 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -16,7 +16,7 @@ - + {{end}} @@ -34,7 +34,7 @@
    {{if and $.IsOrganizationOwner (not (and ($.Team.IsOwnerTeam) (eq (len $.Team.Members) 1)))}} - @@ -60,7 +60,7 @@
    - +
    diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 31f35ef9942..45503ac8fe4 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -179,11 +179,11 @@
    {{if .PageIsOrgTeamsNew}} - + {{else}} - + {{if not .Team.IsOwnerTeam}} - + {{end}} {{end}}
    diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index 54d0a3ea700..6eea0c4958a 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -18,11 +18,11 @@ - +
    - - + +
    {{end}} diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl index 156a92ef140..97662e23b1e 100644 --- a/templates/org/team/sidebar.tmpl +++ b/templates/org/team/sidebar.tmpl @@ -12,7 +12,7 @@
    {{if .Team.IsMember ctx $.SignedUser.ID}} - diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index 9f8030f28c9..62ee9a51e3c 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -36,7 +36,7 @@ · {{.NumRepos}} {{ctx.Locale.Tr "org.lower_repositories"}} {{if .IsMember ctx $.SignedUser.ID}} - diff --git a/templates/org/worktime.tmpl b/templates/org/worktime.tmpl index 5d999981292..bbe617bb65e 100644 --- a/templates/org/worktime.tmpl +++ b/templates/org/worktime.tmpl @@ -14,7 +14,7 @@
    - +
    diff --git a/templates/package/metadata/terraform.tmpl b/templates/package/metadata/terraform.tmpl index 3cecdc38ba1..1012b596b32 100644 --- a/templates/package/metadata/terraform.tmpl +++ b/templates/package/metadata/terraform.tmpl @@ -18,7 +18,7 @@ {{if .CanWritePackages}}
    - +
    {{end}} @@ -30,7 +30,7 @@ {{if .CanWritePackages}}
    - +
    {{end}} diff --git a/templates/package/settings.tmpl b/templates/package/settings.tmpl index 0192376652e..271fb683118 100644 --- a/templates/package/settings.tmpl +++ b/templates/package/settings.tmpl @@ -39,7 +39,7 @@
    - +

    @@ -53,7 +53,7 @@
    {{ctx.Locale.Tr "packages.settings.delete.description"}}
    - +
    diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 8f4f1d60fda..387e24bd8ea 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -38,24 +38,24 @@ {{ctx.Locale.Tr "repo.issues.label_edit"}} {{if .Project.IsClosed}} - {{else}} - {{end}} - - + diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index d4179ab3e34..ab5aa5f8b3d 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -129,7 +129,7 @@ {{if or $showCreateWorkflowBadge $showEnableDisableWorkflow}} - +
    diff --git a/templates/repo/actions/workflow_dispatch.tmpl b/templates/repo/actions/workflow_dispatch.tmpl index 92e6b755031..acba9e828e3 100644 --- a/templates/repo/actions/workflow_dispatch.tmpl +++ b/templates/repo/actions/workflow_dispatch.tmpl @@ -2,7 +2,7 @@
    {{ctx.Locale.Tr "actions.workflow.has_workflow_dispatch"}}
    {{/*make the button have correct hovered color */}} - +

    diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index f95361b3502..9ac6ad873bd 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -24,7 +24,7 @@ {{if .DefaultBranchBranch.IsProtected}} {{svg "octicon-shield-lock"}} {{end}} - + {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DefaultBranchBranch.DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DefaultBranchBranch.DBBranch.CommitID)}}

    {{svg "octicon-git-commit" 16 "tw-mr-1"}}{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}} · {{ctx.RenderUtils.RenderCommitMessage .DefaultBranchBranch.DBBranch.CommitMessage .Repository}} · {{ctx.Locale.Tr "org.repo_updated"}} {{DateUtils.TimeSince .DefaultBranchBranch.DBBranch.CommitTime}}{{if .DefaultBranchBranch.DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}

    @@ -32,7 +32,7 @@
    {{if and $.IsWriter $.Repository.CanContentChange (not .IsDeleted)}} - +

    {{ctx.Locale.Tr "repo.branch.deleted_by" .DBBranch.DeletedBy.Name}} {{DateUtils.TimeSince .DBBranch.DeletedUnix}}

    {{else}} @@ -103,7 +103,7 @@ {{if .IsProtected}} {{svg "octicon-shield-lock"}} {{end}} - + {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DBBranch.CommitID)}}

    {{svg "octicon-git-commit" 16 "tw-mr-1"}}{{ShortSha .DBBranch.CommitID}} · {{ctx.RenderUtils.RenderCommitMessage .DBBranch.CommitMessage $.Repository}} · {{ctx.Locale.Tr "org.repo_updated"}} {{DateUtils.TimeSince .DBBranch.CommitTime}}{{if .DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}}  {{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}

    @@ -161,7 +161,7 @@
    {{if and $.IsWriter $.Repository.CanContentChange (not .DBBranch.IsDeleted)}} - {{else}} - {{end}} diff --git a/templates/repo/cite/cite_buttons.tmpl b/templates/repo/cite/cite_buttons.tmpl index 426ca3858e5..b80fc47e05a 100644 --- a/templates/repo/cite/cite_buttons.tmpl +++ b/templates/repo/cite/cite_buttons.tmpl @@ -1,11 +1,11 @@ - - - diff --git a/templates/repo/cite/cite_modal.tmpl b/templates/repo/cite/cite_modal.tmpl index fb251442caa..59da3b5ae54 100644 --- a/templates/repo/cite/cite_modal.tmpl +++ b/templates/repo/cite/cite_modal.tmpl @@ -13,7 +13,7 @@
    -
    diff --git a/templates/repo/clone_buttons.tmpl b/templates/repo/clone_buttons.tmpl index 24024134f42..7aef2ff3adb 100644 --- a/templates/repo/clone_buttons.tmpl +++ b/templates/repo/clone_buttons.tmpl @@ -3,13 +3,13 @@ {{if or $cloneLink.SupportHTTPS $cloneLink.SupportSSH}}
    {{if $cloneLink.SupportHTTPS}} - + {{end}} {{if $cloneLink.SupportSSH}} - + {{end}} -
    diff --git a/templates/repo/clone_panel.tmpl b/templates/repo/clone_panel.tmpl index a17a4b3a802..24cc1bd31bc 100644 --- a/templates/repo/clone_panel.tmpl +++ b/templates/repo/clone_panel.tmpl @@ -4,7 +4,7 @@ {{$showCloneLinks := or $cloneLink.SupportHTTPS $cloneLink.SupportSSH}} {{$showOpenWithEditorApps := and $showCloneLinks $openWithEditorApps}}{{/* the editor apps need the clone link */}} {{if or $showCloneLinks $showOpenWithEditorApps $downloadArchiveLinkPrefix}} - + {{end}} {{if $cloneLink.SupportSSH}} - + {{end}} {{if not $cloneLink.IsWikiRepo}} - + {{end}}
    diff --git a/templates/repo/code/upstream_diverging_info.tmpl b/templates/repo/code/upstream_diverging_info.tmpl index b3d35c05e51..e6d08fedd16 100644 --- a/templates/repo/code/upstream_diverging_info.tmpl +++ b/templates/repo/code/upstream_diverging_info.tmpl @@ -12,7 +12,7 @@ {{end}} {{if .CanWriteCode}} - diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 242c746a98c..c335404ae77 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -86,8 +86,8 @@
    - - + +
    @@ -105,13 +105,13 @@
    - - + +
    - - + +
    @@ -164,7 +164,7 @@
    {{ctx.Locale.Tr "repo.diff.commit"}} {{ShortSha .CommitID}} - +
    diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl index 51a111609e9..db9f703f9bc 100644 --- a/templates/repo/commits_list.tmpl +++ b/templates/repo/commits_list.tmpl @@ -43,7 +43,7 @@ {{end}} {{if $gitCommit.MessageBody}} - + {{end}} {{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses}} {{if $gitCommit.MessageBody}} @@ -57,7 +57,7 @@ {{DateUtils.TimeSince $gitCommit.Committer.When}} - + {{/* at the moment, wiki doesn't support these "view" links like "view at history point" */}} {{if not $.PageIsWiki}} {{/* view single file diff */}} diff --git a/templates/repo/commits_list_small.tmpl b/templates/repo/commits_list_small.tmpl index 2dd6727e93c..1312d0690fa 100644 --- a/templates/repo/commits_list_small.tmpl +++ b/templates/repo/commits_list_small.tmpl @@ -16,7 +16,7 @@ {{if $gitCommit.MessageBody}} - + {{end}} diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 35dec3e3099..767210173b0 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -207,7 +207,7 @@
    -
    diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 49ec6a97c66..298e8c905f7 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -3,7 +3,7 @@
    {{if $showFileTree}} -
    - + {{if $file.IsLFSFile}} LFS {{end}} @@ -131,8 +131,8 @@ {{if $showFileViewToggle}}
    - - + +
    {{end}} {{if $file.IsProtected}} @@ -147,13 +147,13 @@ {{end}} {{if not $file.IsSubmodule}} - +
    {{if not (or $file.IsIncomplete $file.IsBin)}} - - + + {{end}} - + {{if not $.PageIsWiki}} {{if $file.IsDeleted}} {{ctx.Locale.Tr "repo.diff.view_file"}} @@ -259,8 +259,8 @@
    {{end}}
    - - + +
    diff --git a/templates/repo/diff/conversation.tmpl b/templates/repo/diff/conversation.tmpl index f601b62fb34..16feaaefeb9 100644 --- a/templates/repo/diff/conversation.tmpl +++ b/templates/repo/diff/conversation.tmpl @@ -23,10 +23,10 @@ {{end}}
    - -
    @@ -40,15 +40,15 @@
    - -
    {{if and $.CanMarkConversation $hasReview (not $isReviewPending)}} - {{end}} {{if and $.SignedUserID (not $.Repository.IsArchived)}} - {{end}} diff --git a/templates/repo/diff/new_review.tmpl b/templates/repo/diff/new_review.tmpl index e2c5b633a95..b4be2ebae12 100644 --- a/templates/repo/diff/new_review.tmpl +++ b/templates/repo/diff/new_review.tmpl @@ -1,5 +1,5 @@
    -
    - +
    diff --git a/templates/repo/graph.tmpl b/templates/repo/graph.tmpl index 33ff19f3b5a..d35f2ac9b51 100644 --- a/templates/repo/graph.tmpl +++ b/templates/repo/graph.tmpl @@ -40,8 +40,8 @@ {{end}} - - + +
    diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index bee08e53a50..e70ac25a469 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -58,7 +58,7 @@ >{{ctx.Locale.Tr "repo.transfer.reject"}} {{else if $.RepoTransfer}}
    - +
    {{end}} {{if $.EnableFeed}} diff --git a/templates/repo/header/watch.tmpl b/templates/repo/header/watch.tmpl index 5ee916b3909..0c666c9a185 100644 --- a/templates/repo/header/watch.tmpl +++ b/templates/repo/header/watch.tmpl @@ -7,7 +7,7 @@ {{$isAll := eq $mode "all"}} {{$isCustom := eq $mode "custom"}} {{$isParticipating := eq $mode "participate"}} -
    {{if and .Permission.IsAdmin (not .Repository.IsArchived)}} - +
    @@ -39,8 +39,8 @@
    - - + +
    {{end}} diff --git a/templates/repo/issue/filter_actions.tmpl b/templates/repo/issue/filter_actions.tmpl index 3729c467c15..28af2cd0bae 100644 --- a/templates/repo/issue/filter_actions.tmpl +++ b/templates/repo/issue/filter_actions.tmpl @@ -2,12 +2,12 @@ {{if not .Repository.IsArchived}} {{if and .IsShowClosed.Has .IsShowClosed.Value}} - + {{else if and .IsShowClosed.Has (not .IsShowClosed.Value)}} - + {{end}} {{if $.IsRepoAdmin}} - diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl index 317fe090002..258c39dafd2 100644 --- a/templates/repo/issue/labels.tmpl +++ b/templates/repo/issue/labels.tmpl @@ -5,7 +5,7 @@
    {{template "repo/issue/navbar" .}} {{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}} - + {{end}}
    {{template "base/alert" .}} diff --git a/templates/repo/issue/labels/label_edit_modal.tmpl b/templates/repo/issue/labels/label_edit_modal.tmpl index 373d752f039..85d53514195 100644 --- a/templates/repo/issue/labels/label_edit_modal.tmpl +++ b/templates/repo/issue/labels/label_edit_modal.tmpl @@ -57,11 +57,11 @@
    - - diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl index 0220392b382..d73323f5286 100644 --- a/templates/repo/issue/milestone_new.tmpl +++ b/templates/repo/issue/milestone_new.tmpl @@ -47,11 +47,11 @@ {{ctx.Locale.Tr "repo.milestones.cancel"}} - {{else}} - {{end}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 7d669fe4a71..71d5028e615 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -33,7 +33,7 @@ {{template "repo/issue/comment_tab" .}} {{end}}
    - + {{end}}
    diff --git a/templates/repo/issue/sidebar/issue_dependencies.tmpl b/templates/repo/issue/sidebar/issue_dependencies.tmpl index 37245f48f6b..82214c72714 100644 --- a/templates/repo/issue/sidebar/issue_dependencies.tmpl +++ b/templates/repo/issue/sidebar/issue_dependencies.tmpl @@ -117,7 +117,7 @@
    {{ctx.Locale.Tr "repo.issues.dependency.add"}}
    - diff --git a/templates/repo/issue/sidebar/issue_management.tmpl b/templates/repo/issue/sidebar/issue_management.tmpl index efae665e11a..2f9688800e4 100644 --- a/templates/repo/issue/sidebar/issue_management.tmpl +++ b/templates/repo/issue/sidebar/issue_management.tmpl @@ -4,7 +4,7 @@ {{/* Pin issue */}} {{if or .PinEnabled .Issue.IsPinned}}
    - + {{/* explicitly focus the submit button, to avoid Fomantic modal focuses and popups the dropdown */}} -
    diff --git a/templates/repo/issue/sidebar/reference_link.tmpl b/templates/repo/issue/sidebar/reference_link.tmpl index ad7c0f6bc02..6ec993dd7f0 100644 --- a/templates/repo/issue/sidebar/reference_link.tmpl +++ b/templates/repo/issue/sidebar/reference_link.tmpl @@ -2,5 +2,5 @@ {{$issueReferenceLink := printf "%s#%d" .Issue.Repo.FullName .Issue.Index}}
    {{ctx.Locale.Tr "repo.issues.reference_link" $issueReferenceLink}} - +
    diff --git a/templates/repo/issue/sidebar/reviewer_list.tmpl b/templates/repo/issue/sidebar/reviewer_list.tmpl index b78d9561d81..99c549e6234 100644 --- a/templates/repo/issue/sidebar/reviewer_list.tmpl +++ b/templates/repo/issue/sidebar/reviewer_list.tmpl @@ -121,7 +121,7 @@
    - +
    diff --git a/templates/repo/issue/sidebar/stopwatch_timetracker.tmpl b/templates/repo/issue/sidebar/stopwatch_timetracker.tmpl index 853820d5490..ef2b99e817c 100644 --- a/templates/repo/issue/sidebar/stopwatch_timetracker.tmpl +++ b/templates/repo/issue/sidebar/stopwatch_timetracker.tmpl @@ -4,23 +4,23 @@
    {{ctx.Locale.Tr "repo.issues.tracker"}} -
    {{if $.IsStopwatchRunning}} - - {{else}} - - {{end}} @@ -41,8 +41,8 @@
    - - + +
    @@ -57,8 +57,8 @@
    - - + +
    diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index c236ef8fcfe..dbf2712e100 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -99,12 +99,12 @@ {{$btnTextNoComment = ctx.Locale.Tr (Iif .Issue.IsPull "repo.pulls.close" "repo.issues.close")}} {{$btnTextWithComment = ctx.Locale.Tr "repo.issues.close_comment_issue"}}{{/* general: Close with Comment */}} {{end}} - {{end}} - diff --git a/templates/repo/issue/view_content/comments_delete_time.tmpl b/templates/repo/issue/view_content/comments_delete_time.tmpl index dfbbd5fd7a1..8c69679cc13 100644 --- a/templates/repo/issue/view_content/comments_delete_time.tmpl +++ b/templates/repo/issue/view_content/comments_delete_time.tmpl @@ -2,7 +2,7 @@ {{if (not .comment.Time.Deleted)}} {{if (or ctx.RootData.IsAdmin (and ctx.RootData.IsSigned (eq ctx.RootData.SignedUserID .comment.PosterID)))}} - - {{end}} {{if and $.SignedUserID (not $.Repository.IsArchived)}} - {{end}} diff --git a/templates/repo/issue/view_content/pull_merge_box.tmpl b/templates/repo/issue/view_content/pull_merge_box.tmpl index 8be1079e809..ab3d4b9ac5d 100644 --- a/templates/repo/issue/view_content/pull_merge_box.tmpl +++ b/templates/repo/issue/view_content/pull_merge_box.tmpl @@ -23,7 +23,7 @@ {{if $data.IsPullBranchDeletable}}
    - +
    {{end}} @@ -56,7 +56,7 @@ {{svg "octicon-x"}} {{ctx.Locale.Tr "repo.pulls.cannot_merge_work_in_progress"}} {{if or .HasIssuesOrPullsWritePermission .IsIssuePoster}} - {{end}} diff --git a/templates/repo/issue/view_content/pull_merge_status_checks.tmpl b/templates/repo/issue/view_content/pull_merge_status_checks.tmpl index 5bb48f20097..bcd5cd280da 100644 --- a/templates/repo/issue/view_content/pull_merge_status_checks.tmpl +++ b/templates/repo/issue/view_content/pull_merge_status_checks.tmpl @@ -6,7 +6,7 @@ {{$commitStatuses := $statusCheckData.PullCommitStatuses}}
    {{$statusCheckData.CommitStatusCheckPrompt ctx.Locale}}
    - @@ -19,7 +19,7 @@

    {{ctx.Locale.Tr "repo.pulls.status_checks_need_approvals_helper"}}

    {{if $statusCheckData.CanApprove}} - {{end}} diff --git a/templates/repo/issue/view_content/reference_issue_dialog.tmpl b/templates/repo/issue/view_content/reference_issue_dialog.tmpl index 723dcdb94b2..bbe80f3f16c 100644 --- a/templates/repo/issue/view_content/reference_issue_dialog.tmpl +++ b/templates/repo/issue/view_content/reference_issue_dialog.tmpl @@ -20,7 +20,7 @@
    - +
    diff --git a/templates/repo/issue/view_content/update_branch_by_merge.tmpl b/templates/repo/issue/view_content/update_branch_by_merge.tmpl index 975133469ae..fe98829ab18 100644 --- a/templates/repo/issue/view_content/update_branch_by_merge.tmpl +++ b/templates/repo/issue/view_content/update_branch_by_merge.tmpl @@ -6,7 +6,7 @@ {{if $data.UpdatePrimaryAction}}
    - {{if gt (len $data.UpdateStyleOptions) 1}} diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index f1ccbe68c13..3c6ad2949f1 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -18,7 +18,7 @@
    {{if $canEditIssueTitle}} - + {{end}} {{if not .Issue.IsPull}} {{ctx.Locale.Tr "repo.issues.new"}} @@ -56,7 +56,7 @@ {{if .Issue.IsPull}} {{$headHref := .HeadTarget}} {{if .HeadBranchLink}} - {{$headHref = HTMLFormat `%s ` .HeadBranchLink $headHref (ctx.Locale.Tr "copy_branch") .HeadTarget (svg "octicon-copy" 14)}} + {{$headHref = HTMLFormat `%s ` .HeadBranchLink $headHref (ctx.Locale.Tr "copy_branch") .HeadTarget (svg "octicon-copy" 14)}} {{else}} {{if .Issue.PullRequest.IsAgitFlow}} {{$headHref = HTMLFormat `%s AGit` $headHref "https://docs.gitea.com/usage/agit" (ctx.Locale.Tr "repo.pull.agit_documentation")}} diff --git a/templates/repo/latest_commit.tmpl b/templates/repo/latest_commit.tmpl index b2aebf0d42c..5ce37114465 100644 --- a/templates/repo/latest_commit.tmpl +++ b/templates/repo/latest_commit.tmpl @@ -12,7 +12,7 @@ {{ctx.RenderUtils.RenderCommitMessageLinkSubject .LatestCommit.MessageUTF8 $commitLink $.Repository}} {{if .LatestCommit.MessageBody}} - + 
    {{ctx.RenderUtils.RenderCommitBody .LatestCommit.MessageUTF8 $.Repository}}
    {{end}}     diff --git a/templates/repo/migrate/codebase.tmpl b/templates/repo/migrate/codebase.tmpl index 33fd9a2e8c1..1fccce00cf5 100644 --- a/templates/repo/migrate/codebase.tmpl +++ b/templates/repo/migrate/codebase.tmpl @@ -104,7 +104,7 @@
    -
    diff --git a/templates/repo/migrate/codecommit.tmpl b/templates/repo/migrate/codecommit.tmpl index 587259ea33b..b64f2f99173 100644 --- a/templates/repo/migrate/codecommit.tmpl +++ b/templates/repo/migrate/codecommit.tmpl @@ -105,7 +105,7 @@
    -
    diff --git a/templates/repo/migrate/git.tmpl b/templates/repo/migrate/git.tmpl index dc9384d889b..28e0dfd7a6b 100644 --- a/templates/repo/migrate/git.tmpl +++ b/templates/repo/migrate/git.tmpl @@ -78,7 +78,7 @@
    -
    diff --git a/templates/repo/migrate/gitbucket.tmpl b/templates/repo/migrate/gitbucket.tmpl index 8a77274a390..abc93870ef5 100644 --- a/templates/repo/migrate/gitbucket.tmpl +++ b/templates/repo/migrate/gitbucket.tmpl @@ -120,7 +120,7 @@
    -
    diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl index 4b5ce2f76ec..a9827a11829 100644 --- a/templates/repo/migrate/gitea.tmpl +++ b/templates/repo/migrate/gitea.tmpl @@ -116,7 +116,7 @@
    -
    diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl index 87a95d3ce42..1a417b7e47a 100644 --- a/templates/repo/migrate/github.tmpl +++ b/templates/repo/migrate/github.tmpl @@ -118,7 +118,7 @@
    -
    diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl index 6754ecdfa81..803ae291b70 100644 --- a/templates/repo/migrate/gitlab.tmpl +++ b/templates/repo/migrate/gitlab.tmpl @@ -115,7 +115,7 @@
    -
    diff --git a/templates/repo/migrate/gogs.tmpl b/templates/repo/migrate/gogs.tmpl index ab67c956b07..3450eb12c5f 100644 --- a/templates/repo/migrate/gogs.tmpl +++ b/templates/repo/migrate/gogs.tmpl @@ -54,7 +54,7 @@
    - + */}}
    @@ -118,7 +118,7 @@
    -
    diff --git a/templates/repo/migrate/migrating.tmpl b/templates/repo/migrate/migrating.tmpl index 9d5f8d247c9..e1a652385db 100644 --- a/templates/repo/migrate/migrating.tmpl +++ b/templates/repo/migrate/migrating.tmpl @@ -36,11 +36,11 @@
    {{if .Failed}} - + {{else}} - + {{end}} - +
    {{end}} diff --git a/templates/repo/migrate/onedev.tmpl b/templates/repo/migrate/onedev.tmpl index f176a3f7582..1eca3ff94c2 100644 --- a/templates/repo/migrate/onedev.tmpl +++ b/templates/repo/migrate/onedev.tmpl @@ -105,7 +105,7 @@
    -
    diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl index 6a594dc9fe0..7225e750808 100644 --- a/templates/repo/pulls/fork.tmpl +++ b/templates/repo/pulls/fork.tmpl @@ -74,7 +74,7 @@
    -
    diff --git a/templates/repo/pulls/status_items.tmpl b/templates/repo/pulls/status_items.tmpl index f3dc1bb23f9..42fbdb04461 100644 --- a/templates/repo/pulls/status_items.tmpl +++ b/templates/repo/pulls/status_items.tmpl @@ -3,7 +3,7 @@ * StatusCheckData: optional, additional status check data, see backend pullCommitStatusCheckData struct */}} {{$statusCheckData := $.StatusCheckData}} -{{$commitActionsStatuses := ctx.ActionsUtils.CommitStatusesToActionsStatuses $.CommitStatuses}} +{{$commitActionsStatuses := ctx.ActionsUtils.CommitStatusesToActionsStatuses $.CommitStatuses}} {{range $cs := $.CommitStatuses}}
    diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index 1588477364b..0495142fa7c 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -129,16 +129,16 @@ {{if .IsDraft}} - + {{else}} - + {{end}} {{else}} {{if .ShowCreateTagOnlyButton}} - + {{end}} - - + + {{end}}
    @@ -153,7 +153,7 @@
    - +
    diff --git a/templates/repo/settings/actions_general.tmpl b/templates/repo/settings/actions_general.tmpl index 0d55c546629..46db84920ce 100644 --- a/templates/repo/settings/actions_general.tmpl +++ b/templates/repo/settings/actions_general.tmpl @@ -17,7 +17,7 @@ {{if not $isActionsGlobalDisabled}}
    - +
    {{end}} @@ -48,7 +48,7 @@
    - +
    @@ -74,7 +74,7 @@
    -
    - +
    {{ctx.Locale.Tr "actions.general.collaborative_owners_management_help"}} diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl index 6ec80c057f5..f8538fed99c 100644 --- a/templates/repo/settings/branches.tmpl +++ b/templates/repo/settings/branches.tmpl @@ -23,7 +23,7 @@ {{end}} - +
    {{ctx.Locale.Tr "repo.settings.default_target_branch_desc"}}
    @@ -50,7 +50,7 @@
    {{ctx.Locale.Tr "repo.settings.edit_protected_branch"}} -
    diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 62acc053e26..ecd57ff9bb8 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -29,7 +29,7 @@ - @@ -43,7 +43,7 @@ - + @@ -91,7 +91,7 @@ {{if $allowedToChangeTeams}}
    -
    @@ -107,7 +107,7 @@ - + {{else}}
    diff --git a/templates/repo/settings/deploy_key_list.tmpl b/templates/repo/settings/deploy_key_list.tmpl index bfe9a85fa42..16aadc56f5e 100644 --- a/templates/repo/settings/deploy_key_list.tmpl +++ b/templates/repo/settings/deploy_key_list.tmpl @@ -28,11 +28,11 @@
    {{if $key.IsKeyTypeToken}} - {{end}} -
    diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index eda429820c1..7b2e6397988 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -4,11 +4,11 @@ {{ctx.Locale.Tr "repo.settings.deploy_keys"}}
    {{if not .DisableSSH}} - + {{else}} - + {{end}} - +
    @@ -30,8 +30,8 @@ {{ctx.Locale.Tr "repo.settings.is_writable_info"}}
    - - + +
    @@ -50,8 +50,8 @@ {{ctx.Locale.Tr "repo.settings.is_writable_info"}} - - + +
    diff --git a/templates/repo/settings/githook_edit.tmpl b/templates/repo/settings/githook_edit.tmpl index 43394439547..8e42e3929f4 100644 --- a/templates/repo/settings/githook_edit.tmpl +++ b/templates/repo/settings/githook_edit.tmpl @@ -19,7 +19,7 @@ {{end}}
    - +
    diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl index 7b279b2347e..0ba27bbdecd 100644 --- a/templates/repo/settings/lfs.tmpl +++ b/templates/repo/settings/lfs.tmpl @@ -20,7 +20,7 @@ {{DateUtils.TimeSince .CreatedUnix}} {{ctx.Locale.Tr "repo.settings.lfs_findcommits"}} - diff --git a/templates/repo/settings/lfs_locks.tmpl b/templates/repo/settings/lfs_locks.tmpl index f91ad46afb4..223d283f1a6 100644 --- a/templates/repo/settings/lfs_locks.tmpl +++ b/templates/repo/settings/lfs_locks.tmpl @@ -8,7 +8,7 @@
    - +
    @@ -37,7 +37,7 @@ {{DateUtils.TimeSince .Created}}
    - +
    diff --git a/templates/repo/settings/lfs_pointers.tmpl b/templates/repo/settings/lfs_pointers.tmpl index 9e558c9af59..2a697aa88f7 100644 --- a/templates/repo/settings/lfs_pointers.tmpl +++ b/templates/repo/settings/lfs_pointers.tmpl @@ -10,7 +10,7 @@ {{end}} {{end}} - + {{end}} diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index f07cb1012b8..9f999800b76 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -31,7 +31,7 @@
    - +
    @@ -41,8 +41,8 @@ {{template "shared/avatar_upload_crop" dict "LabelText" (ctx.Locale.Tr "settings.choose_new_avatar")}}
    - - + +
    @@ -69,25 +69,35 @@ {{else}} {{if $newMirrorsEntirelyEnabled}} - {{ctx.Locale.Tr "repo.settings.mirror_settings.docs"}} - {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.doc_link_title"}}

    - {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.pull_mirror_instructions"}} - {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.doc_link_pull_section"}}
    +

    + {{ctx.Locale.Tr "repo.settings.mirror_settings.docs"}} + {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.doc_link_title"}} +

    +

    + {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.pull_mirror_instructions"}} + {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.doc_link_pull_section"}} +

    {{else if $onlyNewPushMirrorsEnabled}} - {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.disabled_pull_mirror.instructions"}} - {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.more_information_if_disabled"}} - {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.doc_link_title"}}
    +

    + {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.disabled_pull_mirror.instructions"}} + {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.more_information_if_disabled"}} + {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.doc_link_title"}} +

    {{else if $onlyNewPullMirrorsEnabled}} - {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.disabled_push_mirror.instructions"}} - {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.disabled_push_mirror.pull_mirror_warning"}} - {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.more_information_if_disabled"}} - {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.doc_link_title"}}

    - {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.disabled_push_mirror.info"}} - {{if $existingPushMirror}} - {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.can_still_use"}} - {{end}} +

    + {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.disabled_push_mirror.instructions"}} + {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.disabled_push_mirror.pull_mirror_warning"}} + {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.more_information_if_disabled"}} + {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.doc_link_title"}} +

    +

    + {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.disabled_push_mirror.info"}} + {{if $existingPushMirror}} + {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.can_still_use"}} + {{end}} +

    {{else}} - {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.no_new_mirrors"}} {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.can_still_use"}}
    +

    {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.no_new_mirrors"}} {{ctx.Locale.Tr "repo.settings.mirror_settings.docs.can_still_use"}}

    {{end}} {{if .Repository.IsMirror}} @@ -118,7 +128,7 @@
    - +
    @@ -176,7 +186,7 @@ {{end}}
    - +
    @@ -212,6 +222,7 @@ +
    - +
    @@ -275,7 +286,7 @@
    - +
    @@ -668,7 +679,7 @@
    - +
    @@ -713,7 +724,7 @@
    - +
    @@ -733,7 +744,7 @@
    - +
    @@ -754,7 +765,7 @@ {{end}}
    - +
    {{end}} @@ -773,7 +784,7 @@ {{end}}
    - +
    @@ -797,7 +808,7 @@ {{end}}
    -
    - +
    {{end}} @@ -825,7 +836,7 @@
    {{ctx.Locale.Tr "repo.settings.convert_fork_desc"}}
    - +
    {{end}} @@ -844,10 +855,10 @@ {{if .RepoTransfer}}
    - +
    {{else}} - + {{end}} @@ -858,7 +869,7 @@
    {{ctx.Locale.Tr "repo.settings.wiki_delete_desc"}}
    - +
    {{end}} @@ -868,7 +879,7 @@
    {{ctx.Locale.Tr "repo.settings.delete_desc"}}
    - +
    {{if not .Repository.IsMirror}} @@ -883,7 +894,7 @@ {{end}}
    - +
    diff --git a/templates/repo/settings/public_access.tmpl b/templates/repo/settings/public_access.tmpl index de3fe0d9f0f..fe5edf74fd2 100644 --- a/templates/repo/settings/public_access.tmpl +++ b/templates/repo/settings/public_access.tmpl @@ -46,7 +46,7 @@
  • {{ctx.Locale.Tr "repo.settings.public_access.docs.everyone_read"}}
  • {{ctx.Locale.Tr "repo.settings.public_access.docs.everyone_write"}}
    • - + diff --git a/templates/repo/settings/push_mirror_sync_modal.tmpl b/templates/repo/settings/push_mirror_sync_modal.tmpl index 0ae7393ca90..25e293447c4 100644 --- a/templates/repo/settings/push_mirror_sync_modal.tmpl +++ b/templates/repo/settings/push_mirror_sync_modal.tmpl @@ -14,11 +14,11 @@
    - - diff --git a/templates/repo/settings/tags.tmpl b/templates/repo/settings/tags.tmpl index 5abac11ebbd..c064a1f4d97 100644 --- a/templates/repo/settings/tags.tmpl +++ b/templates/repo/settings/tags.tmpl @@ -56,14 +56,14 @@ {{end}}
    {{if .PageIsEditProtectedTag}} - {{ctx.Locale.Tr "cancel"}} {{else}} - {{end}} @@ -107,7 +107,7 @@ {{ctx.Locale.Tr "edit"}}
    - +
    diff --git a/templates/repo/settings/webhook/history.tmpl b/templates/repo/settings/webhook/history.tmpl index 7762fca85f2..122eb76f2fc 100644 --- a/templates/repo/settings/webhook/history.tmpl +++ b/templates/repo/settings/webhook/history.tmpl @@ -2,7 +2,7 @@

    {{ctx.Locale.Tr "repo.settings.recent_deliveries"}} {{if .Permission.IsAdmin}} - +

    {{DateUtils.TimeSince .Delivered}} @@ -49,7 +49,7 @@
    - +
    diff --git a/templates/repo/settings/webhook/settings.tmpl b/templates/repo/settings/webhook/settings.tmpl index 5f8ba7bbf1f..a518e86ce86 100644 --- a/templates/repo/settings/webhook/settings.tmpl +++ b/templates/repo/settings/webhook/settings.tmpl @@ -351,9 +351,9 @@
    {{if $isNew}} - + {{else}} - + - +
    {{ctx.Locale.Tr "repo.invisible_runes_header"}}
    @@ -12,7 +12,7 @@
    {{else if .EscapeStatus.HasAmbiguous}}
    - +
    {{ctx.Locale.Tr "repo.ambiguous_runes_header"}}
    diff --git a/templates/repo/view_content.tmpl b/templates/repo/view_content.tmpl index 4b9e71ddb83..ac9be6b21c8 100644 --- a/templates/repo/view_content.tmpl +++ b/templates/repo/view_content.tmpl @@ -42,7 +42,7 @@ / {{- if eq $i $treeNameIdxLast -}} {{$v}} - + {{- else -}} {{$p := index $.Paths $i}}    {{$v}} {{- end -}} @@ -70,7 +70,7 @@ {{$addFilePath = ""}} {{end}} {{end}} - {{if and (not .IsViewFile) (not $isTreePathRoot)}} - - + + {{end}}
    {{svg "octicon-download"}} @@ -82,8 +82,8 @@ {{end}} {{end}} {{else if .EscapeStatus.Escaped}} - - + + {{end}} {{if and .ReadmeInList .CanEditReadmeFile}} {{svg "octicon-pencil"}} diff --git a/templates/repo/view_file_tree.tmpl b/templates/repo/view_file_tree.tmpl index f79fcc22aa3..eb7565ee9a3 100644 --- a/templates/repo/view_file_tree.tmpl +++ b/templates/repo/view_file_tree.tmpl @@ -1,6 +1,6 @@
    - +
    diff --git a/templates/shared/actions/owner_general_settings.tmpl b/templates/shared/actions/owner_general_settings.tmpl index 39a79c94c27..0126ce5b61e 100644 --- a/templates/shared/actions/owner_general_settings.tmpl +++ b/templates/shared/actions/owner_general_settings.tmpl @@ -52,7 +52,7 @@ {{template "shared/actions/permissions_table" .}}
    - +
    diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl index fe55d84c654..4fff302d557 100644 --- a/templates/shared/actions/runner_edit.tmpl +++ b/templates/shared/actions/runner_edit.tmpl @@ -48,11 +48,11 @@
    - + -
    diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index c4d4fb3b80a..be79d0fed42 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -4,7 +4,7 @@ {{ctx.Locale.Tr "actions.runners.runner_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}})
    - @@ -18,7 +18,7 @@
    -
    @@ -44,9 +44,9 @@
    - - - + +
    - + @@ -23,7 +23,7 @@ {{$src.Repo.FullName}}
    - +
    {{if $src.ScopedWorkflowInfos}} @@ -78,7 +78,7 @@
    {{ctx.Locale.Tr "actions.scoped_workflows.required.patterns_help"}}
    - + {{else}}
    {{ctx.Locale.Tr "actions.scoped_workflows.no_files"}}
    diff --git a/templates/shared/avatar_upload_crop.tmpl b/templates/shared/avatar_upload_crop.tmpl index 3bc012dd99e..4622dbcecdb 100644 --- a/templates/shared/avatar_upload_crop.tmpl +++ b/templates/shared/avatar_upload_crop.tmpl @@ -4,5 +4,5 @@ {{- /* the cropper-panel must be next sibling of the input "avatar" */ -}}
    {{ctx.Locale.Tr "settings.cropper_prompt"}}
    -
    +
    diff --git a/templates/shared/repo/list.tmpl b/templates/shared/repo/list.tmpl index 545b1c98f8b..40224c45d00 100644 --- a/templates/shared/repo/list.tmpl +++ b/templates/shared/repo/list.tmpl @@ -57,7 +57,7 @@ {{$watch := and $.Watches (index $.Watches .ID)}} {{if $watch}} - + diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl index c6ed1c31627..500378ed610 100644 --- a/templates/shared/secrets/add_list.tmpl +++ b/templates/shared/secrets/add_list.tmpl @@ -1,7 +1,7 @@

    {{ctx.Locale.Tr "secrets.management"}}
    - -
    - - + +
    diff --git a/templates/shared/user/blocked_users.tmpl b/templates/shared/user/blocked_users.tmpl index b788f906f05..86baa5d5af3 100644 --- a/templates/shared/user/blocked_users.tmpl +++ b/templates/shared/user/blocked_users.tmpl @@ -9,7 +9,7 @@
    @@ -39,11 +39,11 @@ {{end}}
    - +
    - +
    @@ -64,8 +64,8 @@

    {{ctx.Locale.Tr "user.block.note.info"}}

    - - + +
    diff --git a/templates/shared/user/profile_big_avatar.tmpl b/templates/shared/user/profile_big_avatar.tmpl index bf2fd7f9777..ed13bc7af00 100644 --- a/templates/shared/user/profile_big_avatar.tmpl +++ b/templates/shared/user/profile_big_avatar.tmpl @@ -125,7 +125,7 @@
    {{$buttonExtraClass := Iif $.IsFollowing "" "primary"}} {{$followAction := Iif $.IsFollowing "unfollow" "follow"}} - -
    - {{/* a fake button to make the UI looks better*/}} + {{/* a fake button to make the UI looks better*/}}
    diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl index 4a592f259be..4dafef3e291 100644 --- a/templates/user/auth/activate.tmpl +++ b/templates/user/auth/activate.tmpl @@ -14,7 +14,7 @@
    - +
    {{else}} @@ -28,7 +28,7 @@
    - +
    {{end}} diff --git a/templates/user/auth/captcha.tmpl b/templates/user/auth/captcha.tmpl index c93d7cc3a4c..4360e02b7a9 100644 --- a/templates/user/auth/captcha.tmpl +++ b/templates/user/auth/captcha.tmpl @@ -10,12 +10,12 @@
    - + {{else if eq .CaptchaType "hcaptcha"}}
    - + {{else if eq .CaptchaType "mcaptcha"}}
    @@ -28,5 +28,5 @@
    - + {{end}}{{end}} diff --git a/templates/user/auth/change_passwd_inner.tmpl b/templates/user/auth/change_passwd_inner.tmpl index 3c87790e455..a9bc0104c18 100644 --- a/templates/user/auth/change_passwd_inner.tmpl +++ b/templates/user/auth/change_passwd_inner.tmpl @@ -15,7 +15,7 @@
    - +
    diff --git a/templates/user/auth/forgot_passwd.tmpl b/templates/user/auth/forgot_passwd.tmpl index f55d3cae51b..7a710cd4262 100644 --- a/templates/user/auth/forgot_passwd.tmpl +++ b/templates/user/auth/forgot_passwd.tmpl @@ -17,7 +17,7 @@
    - +
    {{else if .IsResetDisable}}

    diff --git a/templates/user/auth/reset_passwd.tmpl b/templates/user/auth/reset_passwd.tmpl index efe536649e7..afa78795063 100644 --- a/templates/user/auth/reset_passwd.tmpl +++ b/templates/user/auth/reset_passwd.tmpl @@ -48,7 +48,7 @@ {{end}}

    - + {{if and .has_two_factor (not .scratch_code)}} {{ctx.Locale.Tr "auth.use_scratch_code"}} {{end}} diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl index 864e0993d63..5fbfdc79217 100644 --- a/templates/user/auth/signin_inner.tmpl +++ b/templates/user/auth/signin_inner.tmpl @@ -37,7 +37,7 @@ {{template "user/auth/captcha" .}}
    -
    - +
    diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl index 0c1f1a39064..a03e40c7b1b 100644 --- a/templates/user/auth/signup_inner.tmpl +++ b/templates/user/auth/signup_inner.tmpl @@ -40,7 +40,7 @@ {{template "user/auth/captcha" .}}
    -
    - + {{ctx.Locale.Tr "auth.forgot_password"}}
    diff --git a/templates/user/auth/signup_openid_register.tmpl b/templates/user/auth/signup_openid_register.tmpl index bee1ca2d2ca..a9889cae66c 100644 --- a/templates/user/auth/signup_openid_register.tmpl +++ b/templates/user/auth/signup_openid_register.tmpl @@ -27,7 +27,7 @@
    - +
    diff --git a/templates/user/auth/twofa.tmpl b/templates/user/auth/twofa.tmpl index 51e1e5c806b..57b41b5a6c1 100644 --- a/templates/user/auth/twofa.tmpl +++ b/templates/user/auth/twofa.tmpl @@ -14,7 +14,7 @@
    - + {{ctx.Locale.Tr "auth.use_scratch_code"}}
    diff --git a/templates/user/auth/twofa_scratch.tmpl b/templates/user/auth/twofa_scratch.tmpl index 5014f247a52..bd9e2c4bd21 100644 --- a/templates/user/auth/twofa_scratch.tmpl +++ b/templates/user/auth/twofa_scratch.tmpl @@ -14,7 +14,7 @@
    - +
    diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index 258473c354b..49ca184f54d 100644 --- a/templates/user/notification/notification_div.tmpl +++ b/templates/user/notification/notification_div.tmpl @@ -15,7 +15,7 @@ {{if and (not $pageTypeIsRead) $notificationUnreadCount}}
    -
    @@ -58,20 +58,20 @@ > {{if ne $one.Status $statusPinned}} - {{end}} {{if or (eq $one.Status $statusUnread) (eq $one.Status $statusPinned)}} - {{else if eq $one.Status $statusRead}} - + {{ctx.Locale.Tr "auth.forgot_password"}} @@ -56,14 +56,14 @@
    {{if not .IsPrimary}} - {{if .CanBePrimary}}
    - +
    {{end}} {{end}} @@ -72,9 +72,9 @@ {{if $.ActivationsPending}} - + {{else}} - + {{end}} {{end}} @@ -93,7 +93,7 @@
    - @@ -122,7 +122,7 @@
    -
    diff --git a/templates/user/settings/appearance.tmpl b/templates/user/settings/appearance.tmpl index ecce437af72..0a2f17750bc 100644 --- a/templates/user/settings/appearance.tmpl +++ b/templates/user/settings/appearance.tmpl @@ -30,7 +30,7 @@
    - +
    @@ -54,7 +54,7 @@
    - +
    @@ -154,7 +154,7 @@
    - +
    diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index e0642c2c2f9..68032eac90d 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -40,11 +40,11 @@
    - - @@ -83,7 +83,7 @@ {{end}}
    - diff --git a/templates/user/settings/applications_oauth2_edit_form.tmpl b/templates/user/settings/applications_oauth2_edit_form.tmpl index 4323e4d9852..872e0aa816c 100644 --- a/templates/user/settings/applications_oauth2_edit_form.tmpl +++ b/templates/user/settings/applications_oauth2_edit_form.tmpl @@ -50,7 +50,7 @@ - diff --git a/templates/user/settings/applications_oauth2_list.tmpl b/templates/user/settings/applications_oauth2_list.tmpl index 53e5af4eb16..5598866c9df 100644 --- a/templates/user/settings/applications_oauth2_list.tmpl +++ b/templates/user/settings/applications_oauth2_list.tmpl @@ -24,7 +24,7 @@ {{svg "octicon-pencil"}} {{ctx.Locale.Tr "settings.oauth2_application_edit"}} - diff --git a/templates/user/settings/grants_oauth2.tmpl b/templates/user/settings/grants_oauth2.tmpl index 6646d877aa2..3b5c19c674a 100644 --- a/templates/user/settings/grants_oauth2.tmpl +++ b/templates/user/settings/grants_oauth2.tmpl @@ -18,7 +18,7 @@
    - diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index 2faf2d619ca..8f738d7a6fd 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -1,7 +1,7 @@

    {{ctx.Locale.Tr "settings.manage_gpg_keys"}}
    - +

    @@ -30,10 +30,10 @@
    {{end}} - - @@ -68,7 +68,7 @@
    - {{if and (not .Verified) (ne $.VerifyingID .KeyID)}} @@ -90,14 +90,13 @@ {{ctx.Locale.Tr "settings.gpg_token_help"}} 
    {{printf `echo "%s" | gpg -a --default-key %s --detach-sig` $.TokenToSign .PaddedKeyID}}
    -
    - - + +
    - diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl index f4ac3336de1..fb395a2aab8 100644 --- a/templates/user/settings/keys_principal.tmpl +++ b/templates/user/settings/keys_principal.tmpl @@ -3,9 +3,9 @@ {{ctx.Locale.Tr "settings.manage_ssh_principals"}}
    {{if not .DisableSSH}} - + {{else}} - + {{end}}

    @@ -26,7 +26,7 @@
    -
    @@ -48,7 +48,7 @@ - diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index c4dc3a5c0cd..5248531b08f 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -1,7 +1,7 @@

    {{ctx.Locale.Tr "settings.manage_ssh_keys"}}
    -
    @@ -18,10 +18,10 @@ - - @@ -56,7 +56,7 @@
    - {{if and (not .Verified) (ne $.VerifyingFingerprint .Fingerprint)}} @@ -86,14 +86,13 @@ 
    set /p={{$.TokenToSign}}| ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey
    -
    -     diff --git a/templates/user/settings/notifications.tmpl b/templates/user/settings/notifications.tmpl index 421bc3f0de2..e205b1af650 100644 --- a/templates/user/settings/notifications.tmpl +++ b/templates/user/settings/notifications.tmpl @@ -22,7 +22,7 @@
    - +
    @@ -51,7 +51,7 @@
    - +
    diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl index 42d958b1a5d..b6aa1a02798 100644 --- a/templates/user/settings/organization.tmpl +++ b/templates/user/settings/organization.tmpl @@ -23,7 +23,7 @@
    - diff --git a/templates/user/settings/packages.tmpl b/templates/user/settings/packages.tmpl index 1773ebbcfc5..b320deb8788 100644 --- a/templates/user/settings/packages.tmpl +++ b/templates/user/settings/packages.tmpl @@ -12,7 +12,7 @@
    - +
    diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl index bd39e0a1b4a..7e3b906d2a0 100644 --- a/templates/user/settings/profile.tmpl +++ b/templates/user/settings/profile.tmpl @@ -51,9 +51,7 @@
    - {{if .SignedUser.Visibility.IsPublic}}{{end}} - {{if .SignedUser.Visibility.IsLimited}}{{end}} - {{if .SignedUser.Visibility.IsPrivate}}{{end}} +
    {{if .SignedUser.Visibility.IsPublic}}{{ctx.Locale.Tr "settings.visibility.public"}}{{end}} {{if .SignedUser.Visibility.IsLimited}}{{ctx.Locale.Tr "settings.visibility.limited"}}{{end}} @@ -91,7 +89,7 @@
    - +
    @@ -126,8 +124,8 @@
    - - + +
    diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl index 13011664feb..b5242f40600 100644 --- a/templates/user/settings/repos.tmpl +++ b/templates/user/settings/repos.tmpl @@ -34,7 +34,7 @@ {{$.ContextUser.Name}}/{{$dir}}
    {{if $.allowAdopt}} - + - diff --git a/templates/user/settings/security/twofa.tmpl b/templates/user/settings/security/twofa.tmpl index ff1e3963100..2e063f00509 100644 --- a/templates/user/settings/security/twofa.tmpl +++ b/templates/user/settings/security/twofa.tmpl @@ -7,11 +7,11 @@

    {{ctx.Locale.Tr "settings.twofa_is_enrolled"}}

    {{ctx.Locale.Tr "settings.regenerate_scratch_token_desc"}}

    - +

    {{ctx.Locale.Tr "settings.twofa_disable_note"}}

    - +
    {{else}} {{/* The recovery tip is there as a means of encouraging a user to enroll */}} diff --git a/templates/user/settings/security/twofa_enroll.tmpl b/templates/user/settings/security/twofa_enroll.tmpl index 76d1cfdc99c..a0bd69ad8aa 100644 --- a/templates/user/settings/security/twofa_enroll.tmpl +++ b/templates/user/settings/security/twofa_enroll.tmpl @@ -15,7 +15,7 @@
    - +
    diff --git a/templates/user/settings/security/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl index 1bf0159d372..941f01ff606 100644 --- a/templates/user/settings/security/webauthn.tmpl +++ b/templates/user/settings/security/webauthn.tmpl @@ -16,7 +16,7 @@
    -
    @@ -28,7 +28,7 @@ - +