From aaea154eca493ab53e68f0f6c2a229cc9371330a Mon Sep 17 00:00:00 2001 From: Daniel Mowitz Date: Fri, 11 Apr 2025 17:59:34 +0200 Subject: [PATCH] Rebased to forgejo. --- templates/admin/notice.tmpl | 4 +-- templates/admin/queue_manage.tmpl | 2 +- templates/admin/repo/unadopted.tmpl | 2 +- templates/base/modal_actions_confirm.tmpl | 2 +- templates/package/settings.tmpl | 2 +- .../package/shared/cleanup_rules/edit.tmpl | 2 +- templates/repo/diff/compare.tmpl | 4 +-- templates/repo/diff/new_review.tmpl | 4 +-- templates/repo/editor/commit_form.tmpl | 2 +- templates/repo/migrate/migrating.tmpl | 4 +-- templates/repo/release/new.tmpl | 6 ++-- templates/repo/settings/lfs.tmpl | 2 +- templates/repo/settings/options.tmpl | 34 +++++++++---------- templates/repo/settings/tags.tmpl | 2 +- templates/repo/wiki/new.tmpl | 2 +- templates/repo/wiki/view.tmpl | 2 +- templates/shared/actions/runner_edit.tmpl | 2 +- templates/shared/blocked_users_list.tmpl | 2 +- templates/shared/user/profile_big_avatar.tmpl | 6 ++-- templates/status/404.tmpl | 2 +- templates/user/settings/account.tmpl | 4 +-- templates/user/settings/applications.tmpl | 2 +- templates/user/settings/grants_oauth2.tmpl | 2 +- templates/user/settings/keys_gpg.tmpl | 4 +-- templates/user/settings/keys_principal.tmpl | 2 +- templates/user/settings/keys_ssh.tmpl | 4 +-- templates/user/settings/organization.tmpl | 2 +- templates/user/settings/profile.tmpl | 2 +- templates/user/settings/repos.tmpl | 2 +- .../user/settings/security/accountlinks.tmpl | 2 +- templates/user/settings/security/openid.tmpl | 2 +- templates/user/settings/security/twofa.tmpl | 2 +- .../user/settings/security/webauthn.tmpl | 2 +- .../js/components/PullRequestMergeForm.vue | 4 +-- web_src/js/components/RepoActionView.vue | 2 +- 35 files changed, 63 insertions(+), 63 deletions(-) diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl index 08f0a4f204..7a45719a8f 100644 --- a/templates/admin/notice.tmpl +++ b/templates/admin/notice.tmpl @@ -35,7 +35,7 @@
{{.CsrfTokenHtml}} - +
- diff --git a/templates/admin/queue_manage.tmpl b/templates/admin/queue_manage.tmpl index dc0196fc6a..86618011d4 100644 --- a/templates/admin/queue_manage.tmpl +++ b/templates/admin/queue_manage.tmpl @@ -32,7 +32,7 @@ {{$sum}}
{{$.CsrfTokenHtml}} - +
{{end}} diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index a95f6b5120..de85a46da3 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -40,7 +40,7 @@ {{template "base/modal_actions_confirm"}} - + - + {{ctx.Locale.Tr "remove"}} @@ -139,7 +139,7 @@ {{ctx.Locale.Tr "repo.release.cancel"}} - + {{ctx.Locale.Tr "repo.release.delete_release"}} {{if .IsDraft}} diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl index 4928b1f5fd..7c41605590 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/options.tmpl b/templates/repo/settings/options.tmpl index c466541382..cda735b8af 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -59,7 +59,7 @@
- +
@@ -266,7 +266,7 @@ {{$.CsrfTokenHtml}} - + @@ -457,7 +457,7 @@
{{ctx.Locale.Tr "repo.settings.convert_desc"}}
- +
{{end}} @@ -468,7 +468,7 @@
{{ctx.Locale.Tr "repo.settings.convert_fork_desc"}}
- +
{{end}} @@ -488,10 +488,10 @@
{{.CsrfTokenHtml}} - +
{{else}} - + {{end}} @@ -503,7 +503,7 @@
{{ctx.Locale.Tr "repo.settings.wiki_rename_branch_main_desc" .DefaultWikiBranchName}}
- +
{{end}} @@ -513,7 +513,7 @@
{{ctx.Locale.Tr "repo.settings.wiki_delete_desc"}}
- +
{{end}} @@ -523,7 +523,7 @@
{{ctx.Locale.Tr "repo.settings.delete_desc"}}
- +
{{if not .Repository.IsMirror}} @@ -538,7 +538,7 @@ {{end}}
- - +
@@ -611,7 +611,7 @@
- +
@@ -647,7 +647,7 @@
- +
@@ -681,7 +681,7 @@
- +
@@ -713,7 +713,7 @@
- +
@@ -746,7 +746,7 @@
- +
@@ -777,7 +777,7 @@
- + diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index 81433db003..31187de4e2 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -40,7 +40,7 @@ - {{ctx.Locale.Tr "repo.wiki.cancel"}} + {{ctx.Locale.Tr "repo.wiki.cancel"}}
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 9f77976f35..992a7891d4 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -61,7 +61,7 @@
{{ctx.Locale.Tr "repo.wiki.edit_page_button"}} {{ctx.Locale.Tr "repo.wiki.new_page_button"}} - {{ctx.Locale.Tr "repo.wiki.delete_page_button"}} + {{ctx.Locale.Tr "repo.wiki.delete_page_button"}}
{{end}} diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl index d452d69f7a..eb54bc4635 100644 --- a/templates/shared/actions/runner_edit.tmpl +++ b/templates/shared/actions/runner_edit.tmpl @@ -40,7 +40,7 @@
-
diff --git a/templates/shared/blocked_users_list.tmpl b/templates/shared/blocked_users_list.tmpl index f445c1bb10..5a36be9cea 100644 --- a/templates/shared/blocked_users_list.tmpl +++ b/templates/shared/blocked_users_list.tmpl @@ -16,7 +16,7 @@
{{$.CsrfTokenHtml}} - +
diff --git a/templates/shared/user/profile_big_avatar.tmpl b/templates/shared/user/profile_big_avatar.tmpl index d718fa390f..06d0070850 100644 --- a/templates/shared/user/profile_big_avatar.tmpl +++ b/templates/shared/user/profile_big_avatar.tmpl @@ -103,7 +103,7 @@ {{if and .IsSigned (ne .SignedUserID .ContextUser.ID)}}
  • {{if $.IsFollowing}} - {{else}} @@ -114,11 +114,11 @@
  • {{if $.IsBlocked}} - {{else}} - {{end}} diff --git a/templates/status/404.tmpl b/templates/status/404.tmpl index bf6420aef3..0960bec1a3 100644 --- a/templates/status/404.tmpl +++ b/templates/status/404.tmpl @@ -4,7 +4,7 @@

    404

    {{if .NotFoundPrompt}}{{.NotFoundPrompt}}{{else}}{{ctx.Locale.Tr "error404"}}{{end}}

    - {{if .NotFoundGoBackURL}}{{ctx.Locale.Tr "go_back"}}{{end}} + {{if .NotFoundGoBackURL}}{{ctx.Locale.Tr "go_back"}}{{end}}

    diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index 55431392c7..afc2ad94aa 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -67,7 +67,7 @@
    {{if not .IsPrimary}}
    -
    @@ -147,7 +147,7 @@
    -
    diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index a5912c9e0f..5df85ad475 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -44,7 +44,7 @@ {{svg "octicon-issue-reopened" 16 "tw-mr-1"}} {{ctx.Locale.Tr "settings.regenerate_token"}} - diff --git a/templates/user/settings/grants_oauth2.tmpl b/templates/user/settings/grants_oauth2.tmpl index 23ab8f5696..072ef089aa 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 23cd86fce7..017ed34cfd 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -71,7 +71,7 @@
    - {{if and (not .Verified) (ne $.VerifyingID .KeyID)}} @@ -104,7 +104,7 @@ - + {{ctx.Locale.Tr "settings.cancel"}} diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl index 754bc374c2..a88e5291f0 100644 --- a/templates/user/settings/keys_principal.tmpl +++ b/templates/user/settings/keys_principal.tmpl @@ -26,7 +26,7 @@
    -
    diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index b8783dead0..c31bbad95f 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -57,7 +57,7 @@
    - {{if and (not .Verified) (ne $.VerifyingFingerprint .Fingerprint)}} @@ -99,7 +99,7 @@ - + {{ctx.Locale.Tr "settings.cancel"}} diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl index 16c27b52cd..fc1eedfd69 100644 --- a/templates/user/settings/organization.tmpl +++ b/templates/user/settings/organization.tmpl @@ -25,7 +25,7 @@
    {{$.CsrfTokenHtml}} - - +
    diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl index 09b00f0cec..8057cca8b7 100644 --- a/templates/user/settings/repos.tmpl +++ b/templates/user/settings/repos.tmpl @@ -51,7 +51,7 @@ {{end}} {{if $.allowDelete}} - + diff --git a/templates/user/settings/security/twofa.tmpl b/templates/user/settings/security/twofa.tmpl index adebce4265..e7829de8ad 100644 --- a/templates/user/settings/security/twofa.tmpl +++ b/templates/user/settings/security/twofa.tmpl @@ -13,7 +13,7 @@
    {{.CsrfTokenHtml}}

    {{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/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl index b04bcf4291..7a2e98c601 100644 --- a/templates/user/settings/security/webauthn.tmpl +++ b/templates/user/settings/security/webauthn.tmpl @@ -16,7 +16,7 @@
    -
    diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue index 46bda3a025..f47e135699 100644 --- a/web_src/js/components/PullRequestMergeForm.vue +++ b/web_src/js/components/PullRequestMergeForm.vue @@ -31,7 +31,7 @@ export default { computed: { mergeButtonStyleClass() { if (this.mergeForm.allOverridableChecksOk) return 'primary'; - return this.autoMergeWhenSucceed ? 'primary' : 'red'; + return this.autoMergeWhenSucceed ? 'primary' : 'danger'; }, forceMerge() { return this.mergeForm.canMergeNow && !this.mergeForm.allOverridableChecksOk; @@ -138,7 +138,7 @@ export default {
    -
    +
    -