From 471567b3baf20ea6adae6ba55f32fc5bf99ca409 Mon Sep 17 00:00:00 2001 From: Solomon Victorino Date: Wed, 28 Aug 2024 16:56:35 -0600 Subject: [PATCH 001/443] fix: use ValidateEmail as binding across web forms --- models/user/email_address.go | 99 ------------- models/user/email_address_test.go | 57 -------- models/user/user.go | 6 +- models/user/user_test.go | 3 +- modules/structs/admin_user.go | 2 +- modules/structs/user_email.go | 2 +- modules/validation/binding.go | 31 +++++ modules/validation/email.go | 131 ++++++++++++++++++ modules/validation/email_test.go | 67 +++++++++ modules/validation/helpers.go | 25 ---- modules/web/middleware/binding.go | 2 + routers/api/v1/activitypub/repository_test.go | 8 +- routers/api/v1/admin/user.go | 11 +- routers/api/v1/user/email.go | 7 +- routers/web/admin/users.go | 9 +- routers/web/auth/auth.go | 5 +- routers/web/org/teams.go | 3 +- routers/web/user/setting/account.go | 3 +- .../auth/source/pam/source_authenticate.go | 5 +- services/doctor/breaking.go | 5 +- services/forms/admin.go | 4 +- services/forms/user_form.go | 8 +- services/forms/user_form_auth_openid.go | 2 +- services/user/email.go | 7 +- 24 files changed, 281 insertions(+), 221 deletions(-) create mode 100644 modules/validation/email.go create mode 100644 modules/validation/email_test.go diff --git a/models/user/email_address.go b/models/user/email_address.go index 8c6f24e57b..b14ff7886c 100644 --- a/models/user/email_address.go +++ b/models/user/email_address.go @@ -7,8 +7,6 @@ package user import ( "context" "fmt" - "net/mail" - "regexp" "strings" "time" @@ -18,53 +16,10 @@ import ( "code.gitea.io/gitea/modules/optional" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" "xorm.io/builder" ) -// ErrEmailNotActivated e-mail address has not been activated error -var ErrEmailNotActivated = util.NewInvalidArgumentErrorf("e-mail address has not been activated") - -// ErrEmailCharIsNotSupported e-mail address contains unsupported character -type ErrEmailCharIsNotSupported struct { - Email string -} - -// IsErrEmailCharIsNotSupported checks if an error is an ErrEmailCharIsNotSupported -func IsErrEmailCharIsNotSupported(err error) bool { - _, ok := err.(ErrEmailCharIsNotSupported) - return ok -} - -func (err ErrEmailCharIsNotSupported) Error() string { - return fmt.Sprintf("e-mail address contains unsupported character [email: %s]", err.Email) -} - -func (err ErrEmailCharIsNotSupported) Unwrap() error { - return util.ErrInvalidArgument -} - -// ErrEmailInvalid represents an error where the email address does not comply with RFC 5322 -// or has a leading '-' character -type ErrEmailInvalid struct { - Email string -} - -// IsErrEmailInvalid checks if an error is an ErrEmailInvalid -func IsErrEmailInvalid(err error) bool { - _, ok := err.(ErrEmailInvalid) - return ok -} - -func (err ErrEmailInvalid) Error() string { - return fmt.Sprintf("e-mail invalid [email: %s]", err.Email) -} - -func (err ErrEmailInvalid) Unwrap() error { - return util.ErrInvalidArgument -} - // ErrEmailAlreadyUsed represents a "EmailAlreadyUsed" kind of error. type ErrEmailAlreadyUsed struct { Email string @@ -156,22 +111,6 @@ func UpdateEmailAddress(ctx context.Context, email *EmailAddress) error { return err } -var emailRegexp = regexp.MustCompile("^[a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]*@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$") - -// ValidateEmail check if email is a valid & allowed address -func ValidateEmail(email string) error { - if err := validateEmailBasic(email); err != nil { - return err - } - return validateEmailDomain(email) -} - -// ValidateEmailForAdmin check if email is a valid address when admins manually add or edit users -func ValidateEmailForAdmin(email string) error { - return validateEmailBasic(email) - // In this case we do not need to check the email domain -} - func GetEmailAddressByEmail(ctx context.Context, email string) (*EmailAddress, error) { ea := &EmailAddress{} if has, err := db.GetEngine(ctx).Where("lower_email=?", strings.ToLower(email)).Get(ea); err != nil { @@ -462,41 +401,3 @@ func ActivateUserEmail(ctx context.Context, userID int64, email string, activate return committer.Commit() } - -// validateEmailBasic checks whether the email complies with the rules -func validateEmailBasic(email string) error { - if len(email) == 0 { - return ErrEmailInvalid{email} - } - - if !emailRegexp.MatchString(email) { - return ErrEmailCharIsNotSupported{email} - } - - if email[0] == '-' { - return ErrEmailInvalid{email} - } - - if _, err := mail.ParseAddress(email); err != nil { - return ErrEmailInvalid{email} - } - - return nil -} - -// validateEmailDomain checks whether the email domain is allowed or blocked -func validateEmailDomain(email string) error { - if !IsEmailDomainAllowed(email) { - return ErrEmailInvalid{email} - } - - return nil -} - -func IsEmailDomainAllowed(email string) bool { - if len(setting.Service.EmailDomainAllowList) == 0 { - return !validation.IsEmailDomainListed(setting.Service.EmailDomainBlockList, email) - } - - return validation.IsEmailDomainListed(setting.Service.EmailDomainAllowList, email) -} diff --git a/models/user/email_address_test.go b/models/user/email_address_test.go index b918f21018..b00b91c5f2 100644 --- a/models/user/email_address_test.go +++ b/models/user/email_address_test.go @@ -130,63 +130,6 @@ func TestListEmails(t *testing.T) { assert.Greater(t, count, int64(len(emails))) } -func TestEmailAddressValidate(t *testing.T) { - kases := map[string]error{ - "abc@gmail.com": nil, - "132@hotmail.com": nil, - "1-3-2@test.org": nil, - "1.3.2@test.org": nil, - "a_123@test.org.cn": nil, - `first.last@iana.org`: nil, - `first!last@iana.org`: nil, - `first#last@iana.org`: nil, - `first$last@iana.org`: nil, - `first%last@iana.org`: nil, - `first&last@iana.org`: nil, - `first'last@iana.org`: nil, - `first*last@iana.org`: nil, - `first+last@iana.org`: nil, - `first/last@iana.org`: nil, - `first=last@iana.org`: nil, - `first?last@iana.org`: nil, - `first^last@iana.org`: nil, - "first`last@iana.org": nil, - `first{last@iana.org`: nil, - `first|last@iana.org`: nil, - `first}last@iana.org`: nil, - `first~last@iana.org`: nil, - `first;last@iana.org`: user_model.ErrEmailCharIsNotSupported{`first;last@iana.org`}, - ".233@qq.com": user_model.ErrEmailInvalid{".233@qq.com"}, - "!233@qq.com": nil, - "#233@qq.com": nil, - "$233@qq.com": nil, - "%233@qq.com": nil, - "&233@qq.com": nil, - "'233@qq.com": nil, - "*233@qq.com": nil, - "+233@qq.com": nil, - "-233@qq.com": user_model.ErrEmailInvalid{"-233@qq.com"}, - "/233@qq.com": nil, - "=233@qq.com": nil, - "?233@qq.com": nil, - "^233@qq.com": nil, - "_233@qq.com": nil, - "`233@qq.com": nil, - "{233@qq.com": nil, - "|233@qq.com": nil, - "}233@qq.com": nil, - "~233@qq.com": nil, - ";233@qq.com": user_model.ErrEmailCharIsNotSupported{";233@qq.com"}, - "Foo ": user_model.ErrEmailCharIsNotSupported{"Foo "}, - string([]byte{0xE2, 0x84, 0xAA}): user_model.ErrEmailCharIsNotSupported{string([]byte{0xE2, 0x84, 0xAA})}, - } - for kase, err := range kases { - t.Run(kase, func(t *testing.T) { - assert.EqualValues(t, err, user_model.ValidateEmail(kase)) - }) - } -} - func TestGetActivatedEmailAddresses(t *testing.T) { require.NoError(t, unittest.PrepareTestDatabase()) diff --git a/models/user/user.go b/models/user/user.go index b1731021fd..07b314a331 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -711,11 +711,11 @@ func createUser(ctx context.Context, u *User, createdByAdmin bool, overwriteDefa } if createdByAdmin { - if err := ValidateEmailForAdmin(u.Email); err != nil { + if err := validation.ValidateEmailForAdmin(u.Email); err != nil { return err } } else { - if err := ValidateEmail(u.Email); err != nil { + if err := validation.ValidateEmail(u.Email); err != nil { return err } } @@ -879,7 +879,7 @@ func (u User) Validate() []string { if err := ValidateUser(&u); err != nil { result = append(result, err.Error()) } - if err := ValidateEmail(u.Email); err != nil { + if err := validation.ValidateEmail(u.Email); err != nil { result = append(result, err.Error()) } return result diff --git a/models/user/user_test.go b/models/user/user_test.go index 8f4350f776..082c21063c 100644 --- a/models/user/user_test.go +++ b/models/user/user_test.go @@ -22,6 +22,7 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/timeutil" + "code.gitea.io/gitea/modules/validation" "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" @@ -320,7 +321,7 @@ func TestCreateUserInvalidEmail(t *testing.T) { err := user_model.CreateUser(db.DefaultContext, user) require.Error(t, err) - assert.True(t, user_model.IsErrEmailCharIsNotSupported(err)) + assert.True(t, validation.IsErrEmailCharIsNotSupported(err)) } func TestCreateUserEmailAlreadyUsed(t *testing.T) { diff --git a/modules/structs/admin_user.go b/modules/structs/admin_user.go index 5b7df127b4..8a4d066d72 100644 --- a/modules/structs/admin_user.go +++ b/modules/structs/admin_user.go @@ -15,7 +15,7 @@ type CreateUserOption struct { FullName string `json:"full_name" binding:"MaxSize(100)"` // required: true // swagger:strfmt email - Email string `json:"email" binding:"Required;Email;MaxSize(254)"` + Email string `json:"email" binding:"Required;EmailForAdmin;MaxSize(254)"` Password string `json:"password" binding:"MaxSize(255)"` MustChangePassword *bool `json:"must_change_password"` SendNotify bool `json:"send_notify"` diff --git a/modules/structs/user_email.go b/modules/structs/user_email.go index 9319667e8f..485d0de1af 100644 --- a/modules/structs/user_email.go +++ b/modules/structs/user_email.go @@ -7,7 +7,7 @@ package structs // Email an email address belonging to a user type Email struct { // swagger:strfmt email - Email string `json:"email"` + Email string `json:"email" binding:"EmailWithAllowedDomain"` Verified bool `json:"verified"` Primary bool `json:"primary"` UserID int64 `json:"user_id"` diff --git a/modules/validation/binding.go b/modules/validation/binding.go index cb0a5063e5..fe434500d5 100644 --- a/modules/validation/binding.go +++ b/modules/validation/binding.go @@ -26,6 +26,8 @@ const ( ErrUsername = "UsernameError" // ErrInvalidGroupTeamMap is returned when a group team mapping is invalid ErrInvalidGroupTeamMap = "InvalidGroupTeamMap" + // ErrEmail is returned when an email address is invalid + ErrEmail = "Email" ) // AddBindingRules adds additional binding rules @@ -38,6 +40,7 @@ func AddBindingRules() { addGlobOrRegexPatternRule() addUsernamePatternRule() addValidGroupTeamMapRule() + addEmailBindingRules() } func addGitRefNameBindingRule() { @@ -185,6 +188,34 @@ func addValidGroupTeamMapRule() { }) } +func addEmailBindingRules() { + binding.AddRule(&binding.Rule{ + IsMatch: func(rule string) bool { + return strings.HasPrefix(rule, "EmailWithAllowedDomain") + }, + IsValid: func(errs binding.Errors, name string, val any) (bool, binding.Errors) { + if err := ValidateEmail(fmt.Sprintf("%v", val)); err != nil { + errs.Add([]string{name}, ErrEmail, err.Error()) + return false, errs + } + return true, errs + }, + }) + + binding.AddRule(&binding.Rule{ + IsMatch: func(rule string) bool { + return strings.HasPrefix(rule, "EmailForAdmin") + }, + IsValid: func(errs binding.Errors, name string, val any) (bool, binding.Errors) { + if err := ValidateEmailForAdmin(fmt.Sprintf("%v", val)); err != nil { + errs.Add([]string{name}, ErrEmail, err.Error()) + return false, errs + } + return true, errs + }, + }) +} + func portOnly(hostport string) string { colon := strings.IndexByte(hostport, ':') if colon == -1 { diff --git a/modules/validation/email.go b/modules/validation/email.go new file mode 100644 index 0000000000..bef816586f --- /dev/null +++ b/modules/validation/email.go @@ -0,0 +1,131 @@ +// Copyright 2016 The Gogs Authors. All rights reserved. +// Copyright 2020 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package validation + +import ( + "fmt" + "net/mail" + "regexp" + "strings" + + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" + + "github.com/gobwas/glob" +) + +// ErrEmailNotActivated e-mail address has not been activated error +var ErrEmailNotActivated = util.NewInvalidArgumentErrorf("e-mail address has not been activated") + +// ErrEmailCharIsNotSupported e-mail address contains unsupported character +type ErrEmailCharIsNotSupported struct { + Email string +} + +// IsErrEmailCharIsNotSupported checks if an error is an ErrEmailCharIsNotSupported +func IsErrEmailCharIsNotSupported(err error) bool { + _, ok := err.(ErrEmailCharIsNotSupported) + return ok +} + +func (err ErrEmailCharIsNotSupported) Error() string { + return fmt.Sprintf("e-mail address contains unsupported character [email: %s]", err.Email) +} + +// ErrEmailInvalid represents an error where the email address does not comply with RFC 5322 +// or has a leading '-' character +type ErrEmailInvalid struct { + Email string +} + +// IsErrEmailInvalid checks if an error is an ErrEmailInvalid +func IsErrEmailInvalid(err error) bool { + _, ok := err.(ErrEmailInvalid) + return ok +} + +func (err ErrEmailInvalid) Error() string { + return fmt.Sprintf("e-mail invalid [email: %s]", err.Email) +} + +func (err ErrEmailInvalid) Unwrap() error { + return util.ErrInvalidArgument +} + +var emailRegexp = regexp.MustCompile("^[a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]*@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$") + +// check if email is a valid address with allowed domain +func ValidateEmail(email string) error { + if err := validateEmailBasic(email); err != nil { + return err + } + return validateEmailDomain(email) +} + +// check if email is a valid address when admins manually add or edit users +func ValidateEmailForAdmin(email string) error { + return validateEmailBasic(email) + // In this case we do not need to check the email domain +} + +// validateEmailBasic checks whether the email complies with the rules +func validateEmailBasic(email string) error { + if len(email) == 0 { + return ErrEmailInvalid{email} + } + + if !emailRegexp.MatchString(email) { + return ErrEmailCharIsNotSupported{email} + } + + if email[0] == '-' { + return ErrEmailInvalid{email} + } + + if _, err := mail.ParseAddress(email); err != nil { + return ErrEmailInvalid{email} + } + + return nil +} + +func validateEmailDomain(email string) error { + if !IsEmailDomainAllowed(email) { + return ErrEmailInvalid{email} + } + + return nil +} + +func IsEmailDomainAllowed(email string) bool { + if len(setting.Service.EmailDomainAllowList) == 0 { + return !isEmailDomainListed(setting.Service.EmailDomainBlockList, email) + } + + return isEmailDomainListed(setting.Service.EmailDomainAllowList, email) +} + +// isEmailDomainListed checks whether the domain of an email address +// matches a list of domains +func isEmailDomainListed(globs []glob.Glob, email string) bool { + if len(globs) == 0 { + return false + } + + n := strings.LastIndex(email, "@") + if n <= 0 { + return false + } + + domain := strings.ToLower(email[n+1:]) + + for _, g := range globs { + if g.Match(domain) { + return true + } + } + + return false +} diff --git a/modules/validation/email_test.go b/modules/validation/email_test.go new file mode 100644 index 0000000000..e5125a9357 --- /dev/null +++ b/modules/validation/email_test.go @@ -0,0 +1,67 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package validation + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestEmailAddressValidate(t *testing.T) { + kases := map[string]error{ + "abc@gmail.com": nil, + "132@hotmail.com": nil, + "1-3-2@test.org": nil, + "1.3.2@test.org": nil, + "a_123@test.org.cn": nil, + `first.last@iana.org`: nil, + `first!last@iana.org`: nil, + `first#last@iana.org`: nil, + `first$last@iana.org`: nil, + `first%last@iana.org`: nil, + `first&last@iana.org`: nil, + `first'last@iana.org`: nil, + `first*last@iana.org`: nil, + `first+last@iana.org`: nil, + `first/last@iana.org`: nil, + `first=last@iana.org`: nil, + `first?last@iana.org`: nil, + `first^last@iana.org`: nil, + "first`last@iana.org": nil, + `first{last@iana.org`: nil, + `first|last@iana.org`: nil, + `first}last@iana.org`: nil, + `first~last@iana.org`: nil, + `first;last@iana.org`: ErrEmailCharIsNotSupported{`first;last@iana.org`}, + ".233@qq.com": ErrEmailInvalid{".233@qq.com"}, + "!233@qq.com": nil, + "#233@qq.com": nil, + "$233@qq.com": nil, + "%233@qq.com": nil, + "&233@qq.com": nil, + "'233@qq.com": nil, + "*233@qq.com": nil, + "+233@qq.com": nil, + "-233@qq.com": ErrEmailInvalid{"-233@qq.com"}, + "/233@qq.com": nil, + "=233@qq.com": nil, + "?233@qq.com": nil, + "^233@qq.com": nil, + "_233@qq.com": nil, + "`233@qq.com": nil, + "{233@qq.com": nil, + "|233@qq.com": nil, + "}233@qq.com": nil, + "~233@qq.com": nil, + ";233@qq.com": ErrEmailCharIsNotSupported{";233@qq.com"}, + "Foo ": ErrEmailCharIsNotSupported{"Foo "}, + string([]byte{0xE2, 0x84, 0xAA}): ErrEmailCharIsNotSupported{string([]byte{0xE2, 0x84, 0xAA})}, + } + for kase, err := range kases { + t.Run(kase, func(t *testing.T) { + assert.EqualValues(t, err, ValidateEmail(kase)) + }) + } +} diff --git a/modules/validation/helpers.go b/modules/validation/helpers.go index 567ad867fe..2f88fcbc60 100644 --- a/modules/validation/helpers.go +++ b/modules/validation/helpers.go @@ -10,8 +10,6 @@ import ( "strings" "code.gitea.io/gitea/modules/setting" - - "github.com/gobwas/glob" ) var externalTrackerRegex = regexp.MustCompile(`({?)(?:user|repo|index)+?(}?)`) @@ -50,29 +48,6 @@ func IsValidSiteURL(uri string) bool { return false } -// IsEmailDomainListed checks whether the domain of an email address -// matches a list of domains -func IsEmailDomainListed(globs []glob.Glob, email string) bool { - if len(globs) == 0 { - return false - } - - n := strings.LastIndex(email, "@") - if n <= 0 { - return false - } - - domain := strings.ToLower(email[n+1:]) - - for _, g := range globs { - if g.Match(domain) { - return true - } - } - - return false -} - // IsAPIURL checks if URL is current Gitea instance API URL func IsAPIURL(uri string) bool { return strings.HasPrefix(strings.ToLower(uri), strings.ToLower(setting.AppURL+"api")) diff --git a/modules/web/middleware/binding.go b/modules/web/middleware/binding.go index 8fa71a81bd..bc0735b2cd 100644 --- a/modules/web/middleware/binding.go +++ b/modules/web/middleware/binding.go @@ -143,6 +143,8 @@ func Validate(errs binding.Errors, data map[string]any, f any, l translation.Loc } case validation.ErrInvalidGroupTeamMap: data["ErrorMsg"] = trName + l.TrString("form.invalid_group_team_map_error", errs[0].Message) + case validation.ErrEmail: + data["ErrorMsg"] = trName + l.TrString("form.email_error") default: msg := errs[0].Classification if msg != "" && errs[0].Message != "" { diff --git a/routers/api/v1/activitypub/repository_test.go b/routers/api/v1/activitypub/repository_test.go index acd588d99b..1e5af6acac 100644 --- a/routers/api/v1/activitypub/repository_test.go +++ b/routers/api/v1/activitypub/repository_test.go @@ -6,22 +6,22 @@ package activitypub import ( "testing" - "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/validation" ) func Test_UserEmailValidate(t *testing.T) { sut := "ab@cd.ef" - if err := user.ValidateEmail(sut); err != nil { + if err := validation.ValidateEmail(sut); err != nil { t.Errorf("sut should be valid, %v, %v", sut, err) } sut = "83ce13c8-af0b-4112-8327-55a54e54e664@code.cartoon-aa.xyz" - if err := user.ValidateEmail(sut); err != nil { + if err := validation.ValidateEmail(sut); err != nil { t.Errorf("sut should be valid, %v, %v", sut, err) } sut = "1" - if err := user.ValidateEmail(sut); err == nil { + if err := validation.ValidateEmail(sut); err == nil { t.Errorf("sut should not be valid, %v", sut) } } diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index 9ea210ee4e..b17200381a 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -20,6 +20,7 @@ import ( "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/timeutil" + "code.gitea.io/gitea/modules/validation" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/routers/api/v1/user" "code.gitea.io/gitea/routers/api/v1/utils" @@ -138,8 +139,8 @@ func CreateUser(ctx *context.APIContext) { user_model.IsErrEmailAlreadyUsed(err) || db.IsErrNameReserved(err) || db.IsErrNameCharsNotAllowed(err) || - user_model.IsErrEmailCharIsNotSupported(err) || - user_model.IsErrEmailInvalid(err) || + validation.IsErrEmailCharIsNotSupported(err) || + validation.IsErrEmailInvalid(err) || db.IsErrNamePatternNotAllowed(err) { ctx.Error(http.StatusUnprocessableEntity, "", err) } else { @@ -148,7 +149,7 @@ func CreateUser(ctx *context.APIContext) { return } - if !user_model.IsEmailDomainAllowed(u.Email) { + if !validation.IsEmailDomainAllowed(u.Email) { ctx.Resp.Header().Add("X-Gitea-Warning", fmt.Sprintf("the domain of user email %s conflicts with EMAIL_DOMAIN_ALLOWLIST or EMAIL_DOMAIN_BLOCKLIST", u.Email)) } @@ -224,7 +225,7 @@ func EditUser(ctx *context.APIContext) { if form.Email != nil { if err := user_service.AdminAddOrSetPrimaryEmailAddress(ctx, ctx.ContextUser, *form.Email); err != nil { switch { - case user_model.IsErrEmailCharIsNotSupported(err), user_model.IsErrEmailInvalid(err): + case validation.IsErrEmailCharIsNotSupported(err), validation.IsErrEmailInvalid(err): ctx.Error(http.StatusBadRequest, "EmailInvalid", err) case user_model.IsErrEmailAlreadyUsed(err): ctx.Error(http.StatusBadRequest, "EmailUsed", err) @@ -234,7 +235,7 @@ func EditUser(ctx *context.APIContext) { return } - if !user_model.IsEmailDomainAllowed(*form.Email) { + if !validation.IsEmailDomainAllowed(*form.Email) { ctx.Resp.Header().Add("X-Gitea-Warning", fmt.Sprintf("the domain of user email %s conflicts with EMAIL_DOMAIN_ALLOWLIST or EMAIL_DOMAIN_BLOCKLIST", *form.Email)) } } diff --git a/routers/api/v1/user/email.go b/routers/api/v1/user/email.go index 33aa851a80..1e9d0984df 100644 --- a/routers/api/v1/user/email.go +++ b/routers/api/v1/user/email.go @@ -9,6 +9,7 @@ import ( user_model "code.gitea.io/gitea/models/user" api "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/modules/validation" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/services/context" "code.gitea.io/gitea/services/convert" @@ -66,12 +67,12 @@ func AddEmail(ctx *context.APIContext) { if err := user_service.AddEmailAddresses(ctx, ctx.Doer, form.Emails); err != nil { if user_model.IsErrEmailAlreadyUsed(err) { ctx.Error(http.StatusUnprocessableEntity, "", "Email address has been used: "+err.(user_model.ErrEmailAlreadyUsed).Email) - } else if user_model.IsErrEmailCharIsNotSupported(err) || user_model.IsErrEmailInvalid(err) { + } else if validation.IsErrEmailCharIsNotSupported(err) || validation.IsErrEmailInvalid(err) { email := "" - if typedError, ok := err.(user_model.ErrEmailInvalid); ok { + if typedError, ok := err.(validation.ErrEmailInvalid); ok { email = typedError.Email } - if typedError, ok := err.(user_model.ErrEmailCharIsNotSupported); ok { + if typedError, ok := err.(validation.ErrEmailCharIsNotSupported); ok { email = typedError.Email } diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index ddd7045eb7..2802ace778 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -23,6 +23,7 @@ import ( "code.gitea.io/gitea/modules/optional" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" + "code.gitea.io/gitea/modules/validation" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/routers/web/explore" user_setting "code.gitea.io/gitea/routers/web/user/setting" @@ -185,7 +186,7 @@ func NewUserPost(ctx *context.Context) { case user_model.IsErrEmailAlreadyUsed(err): ctx.Data["Err_Email"] = true ctx.RenderWithErr(ctx.Tr("form.email_been_used"), tplUserNew, &form) - case user_model.IsErrEmailInvalid(err), user_model.IsErrEmailCharIsNotSupported(err): + case validation.IsErrEmailInvalid(err), validation.IsErrEmailCharIsNotSupported(err): ctx.Data["Err_Email"] = true ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tplUserNew, &form) case db.IsErrNameReserved(err): @@ -203,7 +204,7 @@ func NewUserPost(ctx *context.Context) { return } - if !user_model.IsEmailDomainAllowed(u.Email) { + if !validation.IsEmailDomainAllowed(u.Email) { ctx.Flash.Warning(ctx.Tr("form.email_domain_is_not_allowed", u.Email)) } @@ -414,7 +415,7 @@ func EditUserPost(ctx *context.Context) { if form.Email != "" { if err := user_service.AdminAddOrSetPrimaryEmailAddress(ctx, u, form.Email); err != nil { switch { - case user_model.IsErrEmailCharIsNotSupported(err), user_model.IsErrEmailInvalid(err): + case validation.IsErrEmailCharIsNotSupported(err), validation.IsErrEmailInvalid(err): ctx.Data["Err_Email"] = true ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tplUserEdit, &form) case user_model.IsErrEmailAlreadyUsed(err): @@ -425,7 +426,7 @@ func EditUserPost(ctx *context.Context) { } return } - if !user_model.IsEmailDomainAllowed(form.Email) { + if !validation.IsEmailDomainAllowed(form.Email) { ctx.Flash.Warning(ctx.Tr("form.email_domain_is_not_allowed", form.Email)) } } diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go index 3f1ed54bda..878f34e983 100644 --- a/routers/web/auth/auth.go +++ b/routers/web/auth/auth.go @@ -25,6 +25,7 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" + "code.gitea.io/gitea/modules/validation" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/modules/web/middleware" auth_service "code.gitea.io/gitea/services/auth" @@ -575,10 +576,10 @@ func createUserInContext(ctx *context.Context, tpl base.TplName, form any, u *us case user_model.IsErrEmailAlreadyUsed(err): ctx.Data["Err_Email"] = true ctx.RenderWithErr(ctx.Tr("form.email_been_used"), tpl, form) - case user_model.IsErrEmailCharIsNotSupported(err): + case validation.IsErrEmailCharIsNotSupported(err): ctx.Data["Err_Email"] = true ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tpl, form) - case user_model.IsErrEmailInvalid(err): + case validation.IsErrEmailInvalid(err): ctx.Data["Err_Email"] = true ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tpl, form) case db.IsErrNameReserved(err): diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go index fd7486cacd..c9313d207a 100644 --- a/routers/web/org/teams.go +++ b/routers/web/org/teams.go @@ -22,6 +22,7 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/validation" "code.gitea.io/gitea/modules/web" shared_user "code.gitea.io/gitea/routers/web/shared/user" "code.gitea.io/gitea/services/context" @@ -131,7 +132,7 @@ func TeamsAction(ctx *context.Context) { u, err = user_model.GetUserByName(ctx, uname) if err != nil { if user_model.IsErrUserNotExist(err) { - if setting.MailService != nil && user_model.ValidateEmail(uname) == nil { + if setting.MailService != nil && validation.ValidateEmail(uname) == nil { if err := org_service.CreateTeamInvite(ctx, ctx.Doer, ctx.Org.Team, uname); err != nil { if org_model.IsErrTeamInviteAlreadyExist(err) { ctx.Flash.Error(ctx.Tr("form.duplicate_invite_to_team")) diff --git a/routers/web/user/setting/account.go b/routers/web/user/setting/account.go index d2d2d5bc4c..0f811cd2cd 100644 --- a/routers/web/user/setting/account.go +++ b/routers/web/user/setting/account.go @@ -17,6 +17,7 @@ import ( "code.gitea.io/gitea/modules/optional" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" + "code.gitea.io/gitea/modules/validation" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/services/auth" "code.gitea.io/gitea/services/auth/source/db" @@ -205,7 +206,7 @@ func EmailPost(ctx *context.Context) { loadAccountData(ctx) ctx.RenderWithErr(ctx.Tr("form.email_been_used"), tplSettingsAccount, &form) - } else if user_model.IsErrEmailCharIsNotSupported(err) || user_model.IsErrEmailInvalid(err) { + } else if validation.IsErrEmailCharIsNotSupported(err) || validation.IsErrEmailInvalid(err) { loadAccountData(ctx) ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tplSettingsAccount, &form) diff --git a/services/auth/source/pam/source_authenticate.go b/services/auth/source/pam/source_authenticate.go index addd1bd2c9..0df0b2bca1 100644 --- a/services/auth/source/pam/source_authenticate.go +++ b/services/auth/source/pam/source_authenticate.go @@ -13,6 +13,7 @@ import ( "code.gitea.io/gitea/modules/auth/pam" "code.gitea.io/gitea/modules/optional" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/validation" "github.com/google/uuid" ) @@ -39,13 +40,13 @@ func (source *Source) Authenticate(ctx context.Context, user *user_model.User, u if idx > -1 { username = pamLogin[:idx] } - if user_model.ValidateEmail(email) != nil { + if validation.ValidateEmail(email) != nil { if source.EmailDomain != "" { email = fmt.Sprintf("%s@%s", username, source.EmailDomain) } else { email = fmt.Sprintf("%s@%s", username, setting.Service.NoReplyAddress) } - if user_model.ValidateEmail(email) != nil { + if validation.ValidateEmail(email) != nil { email = uuid.New().String() + "@localhost" } } diff --git a/services/doctor/breaking.go b/services/doctor/breaking.go index 77e3d4e8ef..683ec97389 100644 --- a/services/doctor/breaking.go +++ b/services/doctor/breaking.go @@ -10,6 +10,7 @@ import ( "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/validation" "xorm.io/builder" ) @@ -31,7 +32,7 @@ func iterateUserAccounts(ctx context.Context, each func(*user.User) error) error func checkUserEmail(ctx context.Context, logger log.Logger, _ bool) error { // We could use quirky SQL to get all users that start without a [a-zA-Z0-9], but that would mean // DB provider-specific SQL and only works _now_. So instead we iterate through all user accounts - // and use the user.ValidateEmail function to be future-proof. + // and use the validation.ValidateEmail function to be future-proof. var invalidUserCount int64 if err := iterateUserAccounts(ctx, func(u *user.User) error { // Only check for users, skip @@ -39,7 +40,7 @@ func checkUserEmail(ctx context.Context, logger log.Logger, _ bool) error { return nil } - if err := user.ValidateEmail(u.Email); err != nil { + if err := validation.ValidateEmail(u.Email); err != nil { invalidUserCount++ logger.Warn("User[id=%d name=%q] have not a valid e-mail: %v", u.ID, u.Name, err) } diff --git a/services/forms/admin.go b/services/forms/admin.go index 7d46904440..d71fc076fc 100644 --- a/services/forms/admin.go +++ b/services/forms/admin.go @@ -18,7 +18,7 @@ type AdminCreateUserForm struct { LoginType string `binding:"Required"` LoginName string UserName string `binding:"Required;Username;MaxSize(40)"` - Email string `binding:"Required;Email;MaxSize(254)"` + Email string `binding:"Required;EmailForAdmin;MaxSize(254)"` Password string `binding:"MaxSize(255)"` SendNotify bool MustChangePassword bool @@ -37,7 +37,7 @@ type AdminEditUserForm struct { UserName string `binding:"Username;MaxSize(40)"` LoginName string FullName string `binding:"MaxSize(100)"` - Email string `binding:"Required;Email;MaxSize(254)"` + Email string `binding:"Required;EmailForAdmin;MaxSize(254)"` Password string `binding:"MaxSize(255)"` Website string `binding:"ValidUrl;MaxSize(255)"` Location string `binding:"MaxSize(50)"` diff --git a/services/forms/user_form.go b/services/forms/user_form.go index cc93b27e2a..67c8f00715 100644 --- a/services/forms/user_form.go +++ b/services/forms/user_form.go @@ -10,9 +10,9 @@ import ( "strings" auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/modules/validation" "code.gitea.io/gitea/modules/web/middleware" "code.gitea.io/gitea/services/context" @@ -110,7 +110,7 @@ func (f *RegisterForm) Validate(req *http.Request, errs binding.Errors) binding. // domains in the whitelist or if it doesn't match any of // domains in the blocklist, if any such list is not empty. func (f *RegisterForm) IsEmailDomainAllowed() bool { - return user_model.IsEmailDomainAllowed(f.Email) + return validation.IsEmailDomainAllowed(f.Email) } // MustChangePasswordForm form for updating your password after account creation @@ -258,7 +258,7 @@ const ( type AvatarForm struct { Source string Avatar *multipart.FileHeader - Gravatar string `binding:"OmitEmpty;Email;MaxSize(254)"` + Gravatar string `binding:"OmitEmpty;EmailWithAllowedDomain;MaxSize(254)"` Federavatar bool } @@ -270,7 +270,7 @@ func (f *AvatarForm) Validate(req *http.Request, errs binding.Errors) binding.Er // AddEmailForm form for adding new email type AddEmailForm struct { - Email string `binding:"Required;Email;MaxSize(254)"` + Email string `binding:"Required;EmailWithAllowedDomain;MaxSize(254)"` } // Validate validates the fields diff --git a/services/forms/user_form_auth_openid.go b/services/forms/user_form_auth_openid.go index ca1c77e320..595bfecad9 100644 --- a/services/forms/user_form_auth_openid.go +++ b/services/forms/user_form_auth_openid.go @@ -27,7 +27,7 @@ func (f *SignInOpenIDForm) Validate(req *http.Request, errs binding.Errors) bind // SignUpOpenIDForm form for signin up with OpenID type SignUpOpenIDForm struct { UserName string `binding:"Required;Username;MaxSize(40)"` - Email string `binding:"Required;Email;MaxSize(254)"` + Email string `binding:"Required;EmailWithAllowedDomain;MaxSize(254)"` } // Validate validates the fields diff --git a/services/user/email.go b/services/user/email.go index e8725267f4..31404aadaa 100644 --- a/services/user/email.go +++ b/services/user/email.go @@ -12,6 +12,7 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" + "code.gitea.io/gitea/modules/validation" "code.gitea.io/gitea/services/mailer" ) @@ -21,7 +22,7 @@ func AdminAddOrSetPrimaryEmailAddress(ctx context.Context, u *user_model.User, e return nil } - if err := user_model.ValidateEmailForAdmin(emailStr); err != nil { + if err := validation.ValidateEmailForAdmin(emailStr); err != nil { return err } @@ -74,7 +75,7 @@ func ReplacePrimaryEmailAddress(ctx context.Context, u *user_model.User, emailSt return nil } - if err := user_model.ValidateEmail(emailStr); err != nil { + if err := validation.ValidateEmail(emailStr); err != nil { return err } @@ -119,7 +120,7 @@ func ReplacePrimaryEmailAddress(ctx context.Context, u *user_model.User, emailSt func AddEmailAddresses(ctx context.Context, u *user_model.User, emails []string) error { for _, emailStr := range emails { - if err := user_model.ValidateEmail(emailStr); err != nil { + if err := validation.ValidateEmail(emailStr); err != nil { return err } From e4134f0a81ea67c9f6776ba1e6eb021213fd4f68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Fri, 6 Sep 2024 11:54:14 +0000 Subject: [PATCH 002/443] Makefile: support gotestsum gotestsum [1] is a tool that brings sanity to human-powered analysis of test results, supporting handy summaries of results and more. This implementation allows for the use of `USE_GOTESTSUM=yes` to switch the implementation from raw `go test` to `gotestsum`. It also gives general flexibility in choice of go tests runner. The PREFIX-SUFFIX play is needed for compiled tests and may be subject to modification depending on the outcome of #5248 [1] https://pkg.go.dev/gotest.tools/gotestsum --- Makefile | 84 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 37 deletions(-) diff --git a/Makefile b/Makefile index 455bf16bce..1dcfbd7083 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,16 @@ HAS_GO := $(shell hash $(GO) > /dev/null 2>&1 && echo yes) COMMA := , DIFF ?= diff --unified +ifeq ($(USE_GOTESTSUM), yes) + GOTEST ?= gotestsum -- + GOTESTCOMPILEDRUNPREFIX ?= gotestsum --raw-command -- go tool test2json -t + GOTESTCOMPILEDRUNSUFFIX ?= -test.v=test2json +else + GOTEST ?= $(GO) test + GOTESTCOMPILEDRUNPREFIX ?= + GOTESTCOMPILEDRUNSUFFIX ?= +endif + XGO_VERSION := go-1.21.x AIR_PACKAGE ?= github.com/air-verse/air@v1 # renovate: datasource=go @@ -534,12 +544,12 @@ test: test-frontend test-backend .PHONY: test-backend test-backend: @echo "Running go test with $(GOTESTFLAGS) -tags '$(TEST_TAGS)'..." - @$(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' $(GO_TEST_PACKAGES) + @$(GOTEST) $(GOTESTFLAGS) -tags='$(TEST_TAGS)' $(GO_TEST_PACKAGES) .PHONY: test-remote-cacher test-remote-cacher: @echo "Running go test with $(GOTESTFLAGS) -tags '$(TEST_TAGS)'..." - @$(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' $(GO_TEST_REMOTE_CACHER_PACKAGES) + @$(GOTEST) $(GOTESTFLAGS) -tags='$(TEST_TAGS)' $(GO_TEST_REMOTE_CACHER_PACKAGES) .PHONY: test-frontend test-frontend: node_modules @@ -564,7 +574,7 @@ test-check: .PHONY: test\#% test\#%: @echo "Running go test with -tags '$(TEST_TAGS)'..." - @$(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' -run $(subst .,/,$*) $(GO_TEST_PACKAGES) + @$(GOTEST) $(GOTESTFLAGS) -tags='$(TEST_TAGS)' -run $(subst .,/,$*) $(GO_TEST_PACKAGES) .PHONY: coverage coverage: @@ -575,7 +585,7 @@ coverage: .PHONY: unit-test-coverage unit-test-coverage: @echo "Running unit-test-coverage $(GOTESTFLAGS) -tags '$(TEST_TAGS)'..." - @$(GO) test $(GOTESTFLAGS) -timeout=20m -tags='$(TEST_TAGS)' -cover -coverprofile coverage.out $(GO_TEST_PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1 + @$(GOTEST) $(GOTESTFLAGS) -timeout=20m -tags='$(TEST_TAGS)' -cover -coverprofile coverage.out $(GO_TEST_PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1 .PHONY: tidy tidy: @@ -608,11 +618,11 @@ generate-ini-sqlite: .PHONY: test-sqlite test-sqlite: integrations.sqlite.test generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./integrations.sqlite.test + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTESTCOMPILEDRUNPREFIX) ./integrations.sqlite.test $(GOTESTCOMPILEDRUNSUFFIX) .PHONY: test-sqlite\#% test-sqlite\#%: integrations.sqlite.test generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./integrations.sqlite.test -test.run $(subst .,/,$*) + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTESTCOMPILEDRUNPREFIX) ./integrations.sqlite.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run $(subst .,/,$*) .PHONY: test-sqlite-migration test-sqlite-migration: migrations.sqlite.test migrations.individual.sqlite.test @@ -629,11 +639,11 @@ generate-ini-mysql: .PHONY: test-mysql test-mysql: integrations.mysql.test generate-ini-mysql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini ./integrations.mysql.test + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GOTESTCOMPILEDRUNPREFIX) ./integrations.mysql.test $(GOTESTCOMPILEDRUNSUFFIX) .PHONY: test-mysql\#% test-mysql\#%: integrations.mysql.test generate-ini-mysql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini ./integrations.mysql.test -test.run $(subst .,/,$*) + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GOTESTCOMPILEDRUNPREFIX) ./integrations.mysql.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run $(subst .,/,$*) .PHONY: test-mysql-migration test-mysql-migration: migrations.mysql.test migrations.individual.mysql.test @@ -651,11 +661,11 @@ generate-ini-pgsql: .PHONY: test-pgsql test-pgsql: integrations.pgsql.test generate-ini-pgsql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini ./integrations.pgsql.test + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTESTCOMPILEDRUNPREFIX) ./integrations.pgsql.test $(GOTESTCOMPILEDRUNSUFFIX) .PHONY: test-pgsql\#% test-pgsql\#%: integrations.pgsql.test generate-ini-pgsql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini ./integrations.pgsql.test -test.run $(subst .,/,$*) + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTESTCOMPILEDRUNPREFIX) ./integrations.pgsql.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run $(subst .,/,$*) .PHONY: test-pgsql-migration test-pgsql-migration: migrations.pgsql.test migrations.individual.pgsql.test @@ -674,31 +684,31 @@ test-e2e: test-e2e-sqlite .PHONY: test-e2e-sqlite test-e2e-sqlite: playwright e2e.sqlite.test generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./e2e.sqlite.test -test.run TestE2e + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTESTCOMPILEDRUNPREFIX) ./e2e.sqlite.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run TestE2e .PHONY: test-e2e-sqlite\#% test-e2e-sqlite\#%: playwright e2e.sqlite.test generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./e2e.sqlite.test -test.run TestE2e/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTESTCOMPILEDRUNPREFIX) ./e2e.sqlite.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run TestE2e/$* .PHONY: test-e2e-sqlite-firefox\#% test-e2e-sqlite-firefox\#%: playwright e2e.sqlite.test generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini PLAYWRIGHT_PROJECT=firefox ./e2e.sqlite.test -test.run TestE2e/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini PLAYWRIGHT_PROJECT=firefox $(GOTESTCOMPILEDRUNPREFIX) ./e2e.sqlite.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run TestE2e/$* .PHONY: test-e2e-mysql test-e2e-mysql: playwright e2e.mysql.test generate-ini-mysql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini ./e2e.mysql.test -test.run TestE2e + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GOTESTCOMPILEDRUNPREFIX) ./e2e.mysql.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run TestE2e .PHONY: test-e2e-mysql\#% test-e2e-mysql\#%: playwright e2e.mysql.test generate-ini-mysql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini ./e2e.mysql.test -test.run TestE2e/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GOTESTCOMPILEDRUNPREFIX) ./e2e.mysql.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run TestE2e/$* .PHONY: test-e2e-pgsql test-e2e-pgsql: playwright e2e.pgsql.test generate-ini-pgsql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini ./e2e.pgsql.test -test.run TestE2e + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTESTCOMPILEDRUNPREFIX) ./e2e.pgsql.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run TestE2e .PHONY: test-e2e-pgsql\#% test-e2e-pgsql\#%: playwright e2e.pgsql.test generate-ini-pgsql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini ./e2e.pgsql.test -test.run TestE2e/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTESTCOMPILEDRUNPREFIX) ./e2e.pgsql.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run TestE2e/$* .PHONY: test-e2e-debugserver test-e2e-debugserver: e2e.sqlite.test generate-ini-sqlite @@ -726,73 +736,73 @@ integration-test-coverage-sqlite: integrations.cover.sqlite.test generate-ini-sq GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./integrations.cover.sqlite.test -test.coverprofile=integration.coverage.out integrations.mysql.test: git-check $(GO_SOURCES) - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.mysql.test + $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.mysql.test integrations.pgsql.test: git-check $(GO_SOURCES) - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.pgsql.test + $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.pgsql.test integrations.sqlite.test: git-check $(GO_SOURCES) - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.sqlite.test -tags '$(TEST_TAGS)' + $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.sqlite.test -tags '$(TEST_TAGS)' integrations.cover.test: git-check $(GO_SOURCES) - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.test + $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.test integrations.cover.sqlite.test: git-check $(GO_SOURCES) - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.sqlite.test -tags '$(TEST_TAGS)' + $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.sqlite.test -tags '$(TEST_TAGS)' .PHONY: migrations.mysql.test migrations.mysql.test: $(GO_SOURCES) generate-ini-mysql - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.mysql.test - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini ./migrations.mysql.test + $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.mysql.test + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GOTESTCOMPILEDRUNPREFIX) ./migrations.mysql.test $(GOTESTCOMPILEDRUNSUFFIX) .PHONY: migrations.pgsql.test migrations.pgsql.test: $(GO_SOURCES) generate-ini-pgsql - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.pgsql.test - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini ./migrations.pgsql.test + $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.pgsql.test + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTESTCOMPILEDRUNPREFIX) ./migrations.pgsql.test $(GOTESTCOMPILEDRUNSUFFIX) .PHONY: migrations.sqlite.test migrations.sqlite.test: $(GO_SOURCES) generate-ini-sqlite - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.sqlite.test -tags '$(TEST_TAGS)' - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./migrations.sqlite.test + $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.sqlite.test -tags '$(TEST_TAGS)' + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTESTCOMPILEDRUNPREFIX) ./migrations.sqlite.test $(GOTESTCOMPILEDRUNSUFFIX) .PHONY: migrations.individual.mysql.test migrations.individual.mysql.test: $(GO_SOURCES) for pkg in $(MIGRATION_PACKAGES); do \ - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg || exit 1; \ + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg || exit 1; \ done .PHONY: migrations.individual.sqlite.test\#% migrations.individual.sqlite.test\#%: $(GO_SOURCES) generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* .PHONY: migrations.individual.pgsql.test migrations.individual.pgsql.test: $(GO_SOURCES) for pkg in $(MIGRATION_PACKAGES); do \ - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg || exit 1;\ + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg || exit 1;\ done .PHONY: migrations.individual.pgsql.test\#% migrations.individual.pgsql.test\#%: $(GO_SOURCES) generate-ini-pgsql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* .PHONY: migrations.individual.sqlite.test migrations.individual.sqlite.test: $(GO_SOURCES) generate-ini-sqlite for pkg in $(MIGRATION_PACKAGES); do \ - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg || exit 1; \ + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg || exit 1; \ done .PHONY: migrations.individual.sqlite.test\#% migrations.individual.sqlite.test\#%: $(GO_SOURCES) generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* e2e.mysql.test: $(GO_SOURCES) - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.mysql.test + $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.mysql.test e2e.pgsql.test: $(GO_SOURCES) - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.pgsql.test + $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.pgsql.test e2e.sqlite.test: $(GO_SOURCES) - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.sqlite.test -tags '$(TEST_TAGS)' + $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.sqlite.test -tags '$(TEST_TAGS)' .PHONY: check check: test From 5bf0af1aaf0e8ffc521b0992bb6560da6739c658 Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Wed, 11 Sep 2024 20:45:14 +0200 Subject: [PATCH 003/443] tests(e2e): Refactor branch protection test - ensuring the afterEach hook runs should reduce flakiness and allow retries - the hook cleans up a rule if it exists or does nothing if not --- tests/e2e/repo-settings.test.e2e.js | 45 +++++++++++++++++------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/tests/e2e/repo-settings.test.e2e.js b/tests/e2e/repo-settings.test.e2e.js index b7b0884b26..3ec57a8a3c 100644 --- a/tests/e2e/repo-settings.test.e2e.js +++ b/tests/e2e/repo-settings.test.e2e.js @@ -25,24 +25,33 @@ test('repo webhook settings', async ({browser}, workerInfo) => { await expect(page.locator('.hide-unless-checked')).toBeHidden(); }); -test('repo branch protection settings', async ({browser}, workerInfo) => { - test.skip(workerInfo.project.name === 'Mobile Safari', 'Cannot get it to work - as usual'); - const page = await login({browser}, workerInfo); - const response = await page.goto('/user2/repo1/settings/branches/edit'); - await expect(response?.status()).toBe(200); +test.describe('repo branch protection settings', () => { + test('form', async ({browser}, workerInfo) => { + test.skip(workerInfo.project.name === 'Mobile Safari', 'Cannot get it to work - as usual'); + const page = await login({browser}, workerInfo); + const response = await page.goto('/user2/repo1/settings/branches/edit'); + await expect(response?.status()).toBe(200); - await validate_form({page}, 'fieldset'); + await validate_form({page}, 'fieldset'); - // verify header is new - await expect(page.locator('h4')).toContainText('new'); - await page.locator('input[name="rule_name"]').fill('testrule'); - await page.getByText('Save rule').click(); - // verify header is in edit mode - await page.waitForLoadState('networkidle'); - await page.getByText('Edit').click(); - await expect(page.locator('h4')).toContainText('Protection rules for branch'); - // delete the rule for the next test - await page.goBack(); - await page.getByText('Delete rule').click(); - await page.getByText('Yes').click(); + // verify header is new + await expect(page.locator('h4')).toContainText('new'); + await page.locator('input[name="rule_name"]').fill('testrule'); + await page.getByText('Save rule').click(); + // verify header is in edit mode + await page.waitForLoadState('domcontentloaded'); + await page.getByText('Edit').click(); + await expect(page.locator('h4')).toContainText('Protection rules for branch'); + }); + + test.afterEach(async ({browser}, workerInfo) => { + const page = await login({browser}, workerInfo); + // delete the rule for the next test + await page.goto('/user2/repo1/settings/branches/'); + await page.waitForLoadState('domcontentloaded'); + test.skip(await page.getByText('Delete rule').isHidden(), 'Nothing to delete at this time'); + await page.getByText('Delete rule').click(); + await page.getByText('Yes').click(); + await page.waitForLoadState('load'); + }); }); From 6d6116857ca4d8167d2d4e34f65d96bc23cf6bc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Mon, 12 Aug 2024 20:57:42 +0200 Subject: [PATCH 004/443] git-grep: support regexp --- modules/git/grep.go | 19 +++++++++++-- modules/git/grep_test.go | 31 +++++++++++++++++++++ routers/web/repo/search.go | 57 ++++++++++++++++++++++++++++++++++---- services/wiki/wiki.go | 2 +- 4 files changed, 99 insertions(+), 10 deletions(-) diff --git a/modules/git/grep.go b/modules/git/grep.go index 5572bd994f..1e34f0275c 100644 --- a/modules/git/grep.go +++ b/modules/git/grep.go @@ -27,12 +27,20 @@ type GrepResult struct { HighlightedRanges [][3]int } +type grepMode int + +const ( + FixedGrepMode grepMode = iota + FixedAnyGrepMode + RegExpGrepMode +) + type GrepOptions struct { RefName string MaxResultLimit int MatchesPerFile int ContextLineNumber int - IsFuzzy bool + Mode grepMode PathSpec []setting.Glob } @@ -75,11 +83,16 @@ func GrepSearch(ctx context.Context, repo *Repository, search string, opts GrepO // -I skips binary files cmd := NewCommand(ctx, "grep", "-I", "--null", "--break", "--heading", "--column", - "--fixed-strings", "--line-number", "--ignore-case", "--full-name") + "--line-number", "--ignore-case", "--full-name") + if opts.Mode == RegExpGrepMode { + cmd.AddArguments("--perl-regexp") + } else { + cmd.AddArguments("--fixed-strings") + } cmd.AddOptionValues("--context", fmt.Sprint(opts.ContextLineNumber)) cmd.AddOptionValues("--max-count", fmt.Sprint(opts.MatchesPerFile)) words := []string{search} - if opts.IsFuzzy { + if opts.Mode == FixedAnyGrepMode { words = strings.Fields(search) } for _, word := range words { diff --git a/modules/git/grep_test.go b/modules/git/grep_test.go index 3ba7a6efcb..835f441b19 100644 --- a/modules/git/grep_test.go +++ b/modules/git/grep_test.go @@ -201,3 +201,34 @@ func TestGrepRefs(t *testing.T) { assert.Len(t, res, 1) assert.Equal(t, "A", res[0].LineCodes[0]) } + +func TestGrepCanHazRegexOnDemand(t *testing.T) { + tmpDir := t.TempDir() + + err := InitRepository(DefaultContext, tmpDir, false, Sha1ObjectFormat.Name()) + require.NoError(t, err) + + gitRepo, err := openRepositoryWithDefaultContext(tmpDir) + require.NoError(t, err) + defer gitRepo.Close() + + require.NoError(t, os.WriteFile(path.Join(tmpDir, "matching"), []byte("It's a match!"), 0o666)) + require.NoError(t, os.WriteFile(path.Join(tmpDir, "not-matching"), []byte("Orisitamatch?"), 0o666)) + + err = AddChanges(tmpDir, true) + require.NoError(t, err) + + err = CommitChanges(tmpDir, CommitChangesOptions{Message: "Add fixtures for regexp test"}) + require.NoError(t, err) + + // should find nothing by default... + res, err := GrepSearch(context.Background(), gitRepo, "\\bmatch\\b", GrepOptions{}) + require.NoError(t, err) + assert.Empty(t, res) + + // ... unless configured explicitly + res, err = GrepSearch(context.Background(), gitRepo, "\\bmatch\\b", GrepOptions{Mode: RegExpGrepMode}) + require.NoError(t, err) + assert.Len(t, res, 1) + assert.Equal(t, "matching", res[0].Filename) +} diff --git a/routers/web/repo/search.go b/routers/web/repo/search.go index c4f9f9afd1..9a033c0f1b 100644 --- a/routers/web/repo/search.go +++ b/routers/web/repo/search.go @@ -17,16 +17,55 @@ import ( const tplSearch base.TplName = "repo/search" +type searchMode int + +const ( + ExactSearchMode searchMode = iota + FuzzySearchMode + RegExpSearchMode +) + +func searchModeFromString(s string) searchMode { + switch s { + case "fuzzy": + return FuzzySearchMode + case "regexp": + return RegExpSearchMode + default: + return ExactSearchMode + } +} + +func (m searchMode) String() string { + switch m { + case ExactSearchMode: + return "exact" + case FuzzySearchMode: + return "fuzzy" + case RegExpSearchMode: + return "regexp" + default: + panic("cannot happen") + } +} + // Search render repository search page func Search(ctx *context.Context) { language := ctx.FormTrim("l") keyword := ctx.FormTrim("q") - isFuzzy := ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) + mode := ExactSearchMode + if modeStr := ctx.FormString("mode"); len(modeStr) > 0 { + mode = searchModeFromString(modeStr) + } else if ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) { // for backward compatibility in links + mode = FuzzySearchMode + } ctx.Data["Keyword"] = keyword ctx.Data["Language"] = language - ctx.Data["IsFuzzy"] = isFuzzy + ctx.Data["IsFuzzy"] = mode == FuzzySearchMode + ctx.Data["IsRegExp"] = mode == RegExpSearchMode + ctx.Data["SearchMode"] = mode.String() ctx.Data["PageIsViewCode"] = true if keyword == "" { @@ -47,7 +86,7 @@ func Search(ctx *context.Context) { total, searchResults, searchResultLanguages, err = code_indexer.PerformSearch(ctx, &code_indexer.SearchOptions{ RepoIDs: []int64{ctx.Repo.Repository.ID}, Keyword: keyword, - IsKeywordFuzzy: isFuzzy, + IsKeywordFuzzy: mode == FuzzySearchMode, Language: language, Paginator: &db.ListOptions{ Page: page, @@ -64,11 +103,17 @@ func Search(ctx *context.Context) { ctx.Data["CodeIndexerUnavailable"] = !code_indexer.IsAvailable(ctx) } } else { - res, err := git.GrepSearch(ctx, ctx.Repo.GitRepo, keyword, git.GrepOptions{ + grepOpt := git.GrepOptions{ ContextLineNumber: 1, - IsFuzzy: isFuzzy, RefName: ctx.Repo.RefName, - }) + } + switch mode { + case FuzzySearchMode: + grepOpt.Mode = git.FixedAnyGrepMode + case RegExpSearchMode: + grepOpt.Mode = git.RegExpGrepMode + } + res, err := git.GrepSearch(ctx, ctx.Repo.GitRepo, keyword, grepOpt) if err != nil { ctx.ServerError("GrepSearch", err) return diff --git a/services/wiki/wiki.go b/services/wiki/wiki.go index 24779d41e0..e1b37d1e7f 100644 --- a/services/wiki/wiki.go +++ b/services/wiki/wiki.go @@ -417,7 +417,7 @@ func SearchWikiContents(ctx context.Context, repo *repo_model.Repository, keywor return git.GrepSearch(ctx, gitRepo, keyword, git.GrepOptions{ ContextLineNumber: 0, - IsFuzzy: true, + Mode: git.FixedAnyGrepMode, RefName: repo.GetWikiBranchName(), MaxResultLimit: 10, MatchesPerFile: 3, From 663e957d3d83a760e03d14c12d53c3aefa97d20e Mon Sep 17 00:00:00 2001 From: Shiny Nematoda Date: Fri, 16 Aug 2024 13:23:25 +0000 Subject: [PATCH 005/443] ui(git-grep): expose regexp mode in dropdown --- modules/git/grep.go | 4 ++-- options/locale/locale_en-US.ini | 2 ++ routers/web/explore/code.go | 13 ++++++++++++- routers/web/repo/search.go | 7 +++++-- routers/web/user/code.go | 13 ++++++++++++- templates/shared/search/code/search.tmpl | 7 ++++--- templates/shared/search/combo_multi.tmpl | 24 ++++++++++++++++++++++++ templates/shared/search/fuzzy.tmpl | 16 +++++----------- 8 files changed, 66 insertions(+), 20 deletions(-) create mode 100644 templates/shared/search/combo_multi.tmpl diff --git a/modules/git/grep.go b/modules/git/grep.go index 1e34f0275c..3aa1442d29 100644 --- a/modules/git/grep.go +++ b/modules/git/grep.go @@ -82,12 +82,12 @@ func GrepSearch(ctx context.Context, repo *Repository, search string, opts GrepO var results []*GrepResult // -I skips binary files cmd := NewCommand(ctx, "grep", - "-I", "--null", "--break", "--heading", "--column", + "-I", "--null", "--break", "--heading", "--line-number", "--ignore-case", "--full-name") if opts.Mode == RegExpGrepMode { cmd.AddArguments("--perl-regexp") } else { - cmd.AddArguments("--fixed-strings") + cmd.AddArguments("--fixed-strings", "--column") } cmd.AddOptionValues("--context", fmt.Sprint(opts.ContextLineNumber)) cmd.AddOptionValues("--max-count", fmt.Sprint(opts.MatchesPerFile)) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 1631c90ba2..625f85fac3 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -173,6 +173,8 @@ union = Union union_tooltip = Include results that match any of the whitespace seperated keywords exact = Exact exact_tooltip = Include only results that match the exact search term +regexp = RegExp +regexp_tooltip = Include results that match the regular expression repo_kind = Search repos... user_kind = Search users... org_kind = Search orgs... diff --git a/routers/web/explore/code.go b/routers/web/explore/code.go index f61b832572..4db41fd726 100644 --- a/routers/web/explore/code.go +++ b/routers/web/explore/code.go @@ -35,11 +35,22 @@ func Code(ctx *context.Context) { language := ctx.FormTrim("l") keyword := ctx.FormTrim("q") - isFuzzy := ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) + isFuzzy := true + if mode := ctx.FormTrim("mode"); len(mode) > 0 { + isFuzzy = mode == "fuzzy" + } else { + isFuzzy = ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) + } ctx.Data["Keyword"] = keyword ctx.Data["Language"] = language + ctx.Data["CodeSearchOptions"] = []string{"exact", "fuzzy"} ctx.Data["IsFuzzy"] = isFuzzy + if isFuzzy { + ctx.Data["CodeSearchMode"] = "fuzzy" + } else { + ctx.Data["CodeSearchMode"] = "exact" + } ctx.Data["PageIsViewCode"] = true if keyword == "" { diff --git a/routers/web/repo/search.go b/routers/web/repo/search.go index 9a033c0f1b..724bb82612 100644 --- a/routers/web/repo/search.go +++ b/routers/web/repo/search.go @@ -27,7 +27,7 @@ const ( func searchModeFromString(s string) searchMode { switch s { - case "fuzzy": + case "fuzzy", "union": return FuzzySearchMode case "regexp": return RegExpSearchMode @@ -65,7 +65,7 @@ func Search(ctx *context.Context) { ctx.Data["Language"] = language ctx.Data["IsFuzzy"] = mode == FuzzySearchMode ctx.Data["IsRegExp"] = mode == RegExpSearchMode - ctx.Data["SearchMode"] = mode.String() + ctx.Data["CodeSearchMode"] = mode.String() ctx.Data["PageIsViewCode"] = true if keyword == "" { @@ -102,6 +102,7 @@ func Search(ctx *context.Context) { } else { ctx.Data["CodeIndexerUnavailable"] = !code_indexer.IsAvailable(ctx) } + ctx.Data["CodeSearchOptions"] = []string{"exact", "fuzzy"} } else { grepOpt := git.GrepOptions{ ContextLineNumber: 1, @@ -110,6 +111,7 @@ func Search(ctx *context.Context) { switch mode { case FuzzySearchMode: grepOpt.Mode = git.FixedAnyGrepMode + ctx.Data["CodeSearchMode"] = "union" case RegExpSearchMode: grepOpt.Mode = git.RegExpGrepMode } @@ -133,6 +135,7 @@ func Search(ctx *context.Context) { Lines: code_indexer.HighlightSearchResultCode(r.Filename, r.LineNumbers, r.HighlightedRanges, strings.Join(r.LineCodes, "\n")), }) } + ctx.Data["CodeSearchOptions"] = []string{"exact", "union", "regexp"} } ctx.Data["CodeIndexerDisabled"] = !setting.Indexer.RepoIndexerEnabled diff --git a/routers/web/user/code.go b/routers/web/user/code.go index e2e8f25661..9e8614cb04 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -40,11 +40,22 @@ func CodeSearch(ctx *context.Context) { language := ctx.FormTrim("l") keyword := ctx.FormTrim("q") - isFuzzy := ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) + isFuzzy := true + if mode := ctx.FormTrim("mode"); len(mode) > 0 { + isFuzzy = mode == "fuzzy" + } else { + isFuzzy = ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) + } ctx.Data["Keyword"] = keyword ctx.Data["Language"] = language + ctx.Data["CodeSearchOptions"] = []string{"exact", "fuzzy"} ctx.Data["IsFuzzy"] = isFuzzy + if isFuzzy { + ctx.Data["CodeSearchMode"] = "fuzzy" + } else { + ctx.Data["CodeSearchMode"] = "exact" + } ctx.Data["IsCodePage"] = true if keyword == "" { diff --git a/templates/shared/search/code/search.tmpl b/templates/shared/search/code/search.tmpl index 6a52bb9462..b81c6c8f36 100644 --- a/templates/shared/search/code/search.tmpl +++ b/templates/shared/search/code/search.tmpl @@ -1,11 +1,12 @@
- {{template "shared/search/combo_fuzzy" + {{template "shared/search/combo_multi" dict "Value" .Keyword "Disabled" .CodeIndexerUnavailable - "IsFuzzy" .IsFuzzy "Placeholder" (ctx.Locale.Tr "search.code_kind") - "CodeIndexerDisabled" $.CodeIndexerDisabled}} + "CodeIndexerDisabled" $.CodeIndexerDisabled + "Selected" $.CodeSearchMode + "Options" $.CodeSearchOptions}}
diff --git a/templates/shared/search/combo_multi.tmpl b/templates/shared/search/combo_multi.tmpl new file mode 100644 index 0000000000..23c4b4d406 --- /dev/null +++ b/templates/shared/search/combo_multi.tmpl @@ -0,0 +1,24 @@ +{{/* Value - value of the search field (for search results page) */}} +{{/* Disabled (optional) - if search field/button has to be disabled */}} +{{/* Placeholder (optional) - placeholder text to be used */}} +{{/* Selected - the currently selected option */}} +{{/* Options - options available to choose from */}} +{{/* Tooltip (optional) - a tooltip to be displayed on button hover */}} +
+ {{template "shared/search/input" dict "Value" .Value "Disabled" .Disabled "Placeholder" .Placeholder}} +
+
+ {{ctx.Locale.Tr (printf "search.%s" .Selected)}} +
+
+ {{range $opt := .Options}} + {{$isActive := eq $.Selected $opt}} + + {{end}} +
+
+ {{template "shared/search/button" dict "Disabled" .Disabled "Tooltip" .Tooltip}} +
diff --git a/templates/shared/search/fuzzy.tmpl b/templates/shared/search/fuzzy.tmpl index 25cfc5762c..f0344c32b7 100644 --- a/templates/shared/search/fuzzy.tmpl +++ b/templates/shared/search/fuzzy.tmpl @@ -1,21 +1,15 @@ {{/* Disabled (optional) - if dropdown has to be disabled */}} {{/* IsFuzzy - state of the fuzzy search toggle */}} -
- {{$fuzzyType := "fuzzy"}} - {{if .CodeIndexerDisabled}} - {{$fuzzyType = "union"}} - {{end}} +
{{svg "octicon-triangle-down" 14 "dropdown icon"}} -
{{/* - if code indexer is disabled display fuzzy as union - */}}{{if .IsFuzzy}}{{/* - */}}{{ctx.Locale.Tr (printf "search.%s" $fuzzyType)}}{{/* +
{{if .IsFuzzy}}{{/* + */}}{{ctx.Locale.Tr "search.fuzzy"}}{{/* */}}{{else}}{{/* */}}{{ctx.Locale.Tr "search.exact"}}{{/* */}}{{end}}
-
{{/* - */}}{{ctx.Locale.Tr (printf "search.%s" $fuzzyType)}}
+
{{/* + */}}{{ctx.Locale.Tr "search.fuzzy"}}
{{ctx.Locale.Tr "search.exact"}}
From 30d07c3ba3f4a1dd83502c50185142dcf5a953ab Mon Sep 17 00:00:00 2001 From: Shiny Nematoda Date: Fri, 16 Aug 2024 13:45:54 +0000 Subject: [PATCH 006/443] test(code-search): add for options dropdown --- tests/integration/repo_search_test.go | 46 +++++++++++++-------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/tests/integration/repo_search_test.go b/tests/integration/repo_search_test.go index c7a31f473b..3b4bb81fbd 100644 --- a/tests/integration/repo_search_test.go +++ b/tests/integration/repo_search_test.go @@ -79,25 +79,25 @@ func testSearchRepo(t *testing.T, indexer bool) { } testSearch(t, "/user2/glob/search?q=loren&page=1", []string{"a.txt"}, indexer) - testSearch(t, "/user2/glob/search?q=loren&page=1&fuzzy=false", []string{"a.txt"}, indexer) + testSearch(t, "/user2/glob/search?q=loren&page=1&mode=exact", []string{"a.txt"}, indexer) if indexer { // fuzzy search: matches both file3 (x/b.txt) and file1 (a.txt) // when indexer is enabled - testSearch(t, "/user2/glob/search?q=file3&page=1", []string{"x/b.txt", "a.txt"}, indexer) - testSearch(t, "/user2/glob/search?q=file4&page=1", []string{"x/b.txt", "a.txt"}, indexer) - testSearch(t, "/user2/glob/search?q=file5&page=1", []string{"x/b.txt", "a.txt"}, indexer) + testSearch(t, "/user2/glob/search?q=file3&mode=fuzzy&page=1", []string{"x/b.txt", "a.txt"}, indexer) + testSearch(t, "/user2/glob/search?q=file4&mode=fuzzy&page=1", []string{"x/b.txt", "a.txt"}, indexer) + testSearch(t, "/user2/glob/search?q=file5&mode=fuzzy&page=1", []string{"x/b.txt", "a.txt"}, indexer) } else { // fuzzy search: Union/OR of all the keywords // when indexer is disabled - testSearch(t, "/user2/glob/search?q=file3+file1&page=1", []string{"a.txt", "x/b.txt"}, indexer) - testSearch(t, "/user2/glob/search?q=file4&page=1", []string{}, indexer) - testSearch(t, "/user2/glob/search?q=file5&page=1", []string{}, indexer) + testSearch(t, "/user2/glob/search?q=file3+file1&mode=union&page=1", []string{"a.txt", "x/b.txt"}, indexer) + testSearch(t, "/user2/glob/search?q=file4&mode=union&page=1", []string{}, indexer) + testSearch(t, "/user2/glob/search?q=file5&mode=union&page=1", []string{}, indexer) } - testSearch(t, "/user2/glob/search?q=file3&page=1&fuzzy=false", []string{"x/b.txt"}, indexer) - testSearch(t, "/user2/glob/search?q=file4&page=1&fuzzy=false", []string{}, indexer) - testSearch(t, "/user2/glob/search?q=file5&page=1&fuzzy=false", []string{}, indexer) + testSearch(t, "/user2/glob/search?q=file3&page=1&mode=fuzzy", []string{"x/b.txt"}, indexer) + testSearch(t, "/user2/glob/search?q=file4&page=1&mode=fuzzy", []string{}, indexer) + testSearch(t, "/user2/glob/search?q=file5&page=1&mode=fuzzy", []string{}, indexer) } func testSearch(t *testing.T, url string, expected []string, indexer bool) { @@ -113,21 +113,19 @@ func testSearch(t *testing.T, url string, expected []string, indexer bool) { branchDropdown := container.Find(".js-branch-tag-selector") assert.EqualValues(t, indexer, len(branchDropdown.Nodes) == 0) - // if indexer is disabled "fuzzy" should be displayed as "union" - expectedFuzzy := "Fuzzy" - if !indexer { - expectedFuzzy = "Union" - } + dropdownOptions := container. + Find(".menu[data-test-tag=fuzzy-dropdown]"). + Find("input[type=radio][name=mode]"). + Map(func(_ int, sel *goquery.Selection) string { + attr, exists := sel.Attr("value") + assert.True(t, exists) + return attr + }) - fuzzyDropdown := container.Find(".ui.dropdown[data-test-tag=fuzzy-dropdown]") - actualFuzzyText := fuzzyDropdown.Find(".menu .item[data-value=true]").First().Text() - assert.EqualValues(t, expectedFuzzy, actualFuzzyText) - - if fuzzyDropdown. - Find("input[name=fuzzy][value=true]"). - Length() != 0 { - actualFuzzyText = fuzzyDropdown.Find("div.text").First().Text() - assert.EqualValues(t, expectedFuzzy, actualFuzzyText) + if indexer { + assert.EqualValues(t, []string{"exact", "fuzzy"}, dropdownOptions) + } else { + assert.EqualValues(t, []string{"exact", "union", "regexp"}, dropdownOptions) } filenames := resultFilenames(t, doc) From 7068456d2039506b31809b69a2b81d144a406d05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Tue, 27 Aug 2024 14:15:43 +0200 Subject: [PATCH 007/443] noop(ui): remove some unused CodeIndexerDisabled --- templates/shared/search/code/search.tmpl | 1 - templates/shared/search/combo_fuzzy.tmpl | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/templates/shared/search/code/search.tmpl b/templates/shared/search/code/search.tmpl index b81c6c8f36..7f1fda8822 100644 --- a/templates/shared/search/code/search.tmpl +++ b/templates/shared/search/code/search.tmpl @@ -4,7 +4,6 @@ "Value" .Keyword "Disabled" .CodeIndexerUnavailable "Placeholder" (ctx.Locale.Tr "search.code_kind") - "CodeIndexerDisabled" $.CodeIndexerDisabled "Selected" $.CodeSearchMode "Options" $.CodeSearchOptions}} diff --git a/templates/shared/search/combo_fuzzy.tmpl b/templates/shared/search/combo_fuzzy.tmpl index 38189b0518..6dfec4c288 100644 --- a/templates/shared/search/combo_fuzzy.tmpl +++ b/templates/shared/search/combo_fuzzy.tmpl @@ -2,14 +2,12 @@ {{/* Disabled (optional) - if search field/button has to be disabled */}} {{/* Placeholder (optional) - placeholder text to be used */}} {{/* IsFuzzy - state of the fuzzy/union search toggle */}} -{{/* CodeIndexerDisabled (optional) - if the performed search is done using git-grep */}} {{/* Tooltip (optional) - a tooltip to be displayed on button hover */}}
{{template "shared/search/input" dict "Value" .Value "Disabled" .Disabled "Placeholder" .Placeholder}} {{template "shared/search/fuzzy" dict "Disabled" .Disabled - "IsFuzzy" .IsFuzzy - "CodeIndexerDisabled" .CodeIndexerDisabled}} + "IsFuzzy" .IsFuzzy}} {{template "shared/search/button" dict "Disabled" .Disabled "Tooltip" .Tooltip}}
From d2efdda9119d22e919b65d52c7ac2c35a0b9eee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Tue, 27 Aug 2024 17:11:48 +0200 Subject: [PATCH 008/443] ui(code-search): fix to use CodeSearchMode Drop unused IsFuzzy and IsRegExp --- routers/web/explore/code.go | 1 - routers/web/repo/search.go | 2 -- routers/web/user/code.go | 1 - templates/repo/search.tmpl | 2 +- templates/shared/search/code/results.tmpl | 2 +- 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/routers/web/explore/code.go b/routers/web/explore/code.go index 4db41fd726..7a3f6a5a86 100644 --- a/routers/web/explore/code.go +++ b/routers/web/explore/code.go @@ -45,7 +45,6 @@ func Code(ctx *context.Context) { ctx.Data["Keyword"] = keyword ctx.Data["Language"] = language ctx.Data["CodeSearchOptions"] = []string{"exact", "fuzzy"} - ctx.Data["IsFuzzy"] = isFuzzy if isFuzzy { ctx.Data["CodeSearchMode"] = "fuzzy" } else { diff --git a/routers/web/repo/search.go b/routers/web/repo/search.go index 724bb82612..863a279af0 100644 --- a/routers/web/repo/search.go +++ b/routers/web/repo/search.go @@ -63,8 +63,6 @@ func Search(ctx *context.Context) { ctx.Data["Keyword"] = keyword ctx.Data["Language"] = language - ctx.Data["IsFuzzy"] = mode == FuzzySearchMode - ctx.Data["IsRegExp"] = mode == RegExpSearchMode ctx.Data["CodeSearchMode"] = mode.String() ctx.Data["PageIsViewCode"] = true diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 9e8614cb04..bf4cbb8920 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -50,7 +50,6 @@ func CodeSearch(ctx *context.Context) { ctx.Data["Keyword"] = keyword ctx.Data["Language"] = language ctx.Data["CodeSearchOptions"] = []string{"exact", "fuzzy"} - ctx.Data["IsFuzzy"] = isFuzzy if isFuzzy { ctx.Data["CodeSearchMode"] = "fuzzy" } else { diff --git a/templates/repo/search.tmpl b/templates/repo/search.tmpl index 6d114c81e4..34707bc8da 100644 --- a/templates/repo/search.tmpl +++ b/templates/repo/search.tmpl @@ -5,7 +5,7 @@ {{if $.CodeIndexerDisabled}} {{$branchURLPrefix := printf "%s/search/branch/" $.RepoLink}} {{$tagURLPrefix := printf "%s/search/tag/" $.RepoLink}} - {{$suffix := printf "?q=%s&fuzzy=%t" (.Keyword|QueryEscape) .IsFuzzy}} + {{$suffix := printf "?q=%s&mode=%s" (.Keyword|QueryEscape) .CodeSearchMode}} {{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "tw-mb-3" "branchURLPrefix" $branchURLPrefix "branchURLSuffix" $suffix "tagURLPrefix" $tagURLPrefix "tagURLSuffix" $suffix}} {{end}} {{template "shared/search/code/search" .}} diff --git a/templates/shared/search/code/results.tmpl b/templates/shared/search/code/results.tmpl index fe375579bd..98c5430502 100644 --- a/templates/shared/search/code/results.tmpl +++ b/templates/shared/search/code/results.tmpl @@ -1,7 +1,7 @@
{{range $term := .SearchResultLanguages}} + href="?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}&mode={{$.CodeSearchMode}}"> {{$term.Language}}
{{$term.Count}}
From a98cf0e68ed0da866688580ef26557f9211d1c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Tue, 27 Aug 2024 17:23:02 +0200 Subject: [PATCH 009/443] code-search: make linters happy again --- routers/web/explore/code.go | 4 +--- routers/web/user/code.go | 4 +--- templates/shared/search/combo_multi.tmpl | 26 ++++++++++++------------ 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/routers/web/explore/code.go b/routers/web/explore/code.go index 7a3f6a5a86..437282cbb1 100644 --- a/routers/web/explore/code.go +++ b/routers/web/explore/code.go @@ -35,11 +35,9 @@ func Code(ctx *context.Context) { language := ctx.FormTrim("l") keyword := ctx.FormTrim("q") - isFuzzy := true + isFuzzy := ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) if mode := ctx.FormTrim("mode"); len(mode) > 0 { isFuzzy = mode == "fuzzy" - } else { - isFuzzy = ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) } ctx.Data["Keyword"] = keyword diff --git a/routers/web/user/code.go b/routers/web/user/code.go index bf4cbb8920..26e48d1ea6 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -40,11 +40,9 @@ func CodeSearch(ctx *context.Context) { language := ctx.FormTrim("l") keyword := ctx.FormTrim("q") - isFuzzy := true + isFuzzy := ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) if mode := ctx.FormTrim("mode"); len(mode) > 0 { isFuzzy = mode == "fuzzy" - } else { - isFuzzy = ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) } ctx.Data["Keyword"] = keyword diff --git a/templates/shared/search/combo_multi.tmpl b/templates/shared/search/combo_multi.tmpl index 23c4b4d406..89dc20b530 100644 --- a/templates/shared/search/combo_multi.tmpl +++ b/templates/shared/search/combo_multi.tmpl @@ -7,18 +7,18 @@
{{template "shared/search/input" dict "Value" .Value "Disabled" .Disabled "Placeholder" .Placeholder}}
-
- {{ctx.Locale.Tr (printf "search.%s" .Selected)}} -
-
- {{range $opt := .Options}} - {{$isActive := eq $.Selected $opt}} - - {{end}} -
-
+
+ {{ctx.Locale.Tr (printf "search.%s" .Selected)}} +
+
+ {{range $opt := .Options}} + {{$isActive := eq $.Selected $opt}} + + {{end}} +
+
{{template "shared/search/button" dict "Disabled" .Disabled "Tooltip" .Tooltip}}
From 9c70c7a8ea8680356adee5dc7c08f5286070e427 Mon Sep 17 00:00:00 2001 From: Shiny Nematoda Date: Wed, 28 Aug 2024 11:09:37 +0200 Subject: [PATCH 010/443] test(code-search): fix oops --- tests/integration/repo_search_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/integration/repo_search_test.go b/tests/integration/repo_search_test.go index 3b4bb81fbd..259ba36d08 100644 --- a/tests/integration/repo_search_test.go +++ b/tests/integration/repo_search_test.go @@ -95,9 +95,9 @@ func testSearchRepo(t *testing.T, indexer bool) { testSearch(t, "/user2/glob/search?q=file5&mode=union&page=1", []string{}, indexer) } - testSearch(t, "/user2/glob/search?q=file3&page=1&mode=fuzzy", []string{"x/b.txt"}, indexer) - testSearch(t, "/user2/glob/search?q=file4&page=1&mode=fuzzy", []string{}, indexer) - testSearch(t, "/user2/glob/search?q=file5&page=1&mode=fuzzy", []string{}, indexer) + testSearch(t, "/user2/glob/search?q=file3&page=1&mode=exact", []string{"x/b.txt"}, indexer) + testSearch(t, "/user2/glob/search?q=file4&page=1&mode=exact", []string{}, indexer) + testSearch(t, "/user2/glob/search?q=file5&page=1&mode=exact", []string{}, indexer) } func testSearch(t *testing.T, url string, expected []string, indexer bool) { From cd62d0f5e899df61dc2772fc4f5513acb64df8d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Mon, 16 Sep 2024 14:23:15 +0200 Subject: [PATCH 011/443] git-grep: add comments on highlighting support --- modules/git/grep.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/git/grep.go b/modules/git/grep.go index 3aa1442d29..8a896bc5aa 100644 --- a/modules/git/grep.go +++ b/modules/git/grep.go @@ -85,6 +85,9 @@ func GrepSearch(ctx context.Context, repo *Repository, search string, opts GrepO "-I", "--null", "--break", "--heading", "--line-number", "--ignore-case", "--full-name") if opts.Mode == RegExpGrepMode { + // No `--column` -- regexp mode does not support highlighting in the + // current implementation as the length of the match is unknown from + // `grep` but required for highlighting. cmd.AddArguments("--perl-regexp") } else { cmd.AddArguments("--fixed-strings", "--column") @@ -161,6 +164,7 @@ func GrepSearch(ctx context.Context, repo *Repository, search string, opts GrepO if lineNum, lineCode, ok := strings.Cut(line, "\x00"); ok { lineNumInt, _ := strconv.Atoi(lineNum) res.LineNumbers = append(res.LineNumbers, lineNumInt) + // We support highlighting only when `--column` parameter is used. if lineCol, lineCode2, ok := strings.Cut(lineCode, "\x00"); ok { lineColInt, _ := strconv.Atoi(lineCol) start := lineColInt - 1 From d7aa109dc6a6620e711a8b406833f383154df3a2 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Thu, 19 Sep 2024 20:29:34 +0500 Subject: [PATCH 012/443] chore: remove some Windows-specific files --- go.mod | 1 - go.sum | 5 - modules/graceful/manager_windows.go | 190 ---------------------------- modules/graceful/net_windows.go | 19 --- modules/process/manager_windows.go | 15 --- modules/util/file_windows.go | 15 --- routers/private/manager_windows.go | 27 ---- services/auth/sspiauth_windows.go | 19 --- 8 files changed, 291 deletions(-) delete mode 100644 modules/graceful/manager_windows.go delete mode 100644 modules/graceful/net_windows.go delete mode 100644 modules/process/manager_windows.go delete mode 100644 modules/util/file_windows.go delete mode 100644 routers/private/manager_windows.go delete mode 100644 services/auth/sspiauth_windows.go diff --git a/go.mod b/go.mod index f8f62b0ca8..a5aa483563 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,6 @@ require ( github.com/opencontainers/image-spec v1.1.0 github.com/pquerna/otp v1.4.0 github.com/prometheus/client_golang v1.18.0 - github.com/quasoft/websspi v1.1.2 github.com/redis/go-redis/v9 v9.6.1 github.com/robfig/cron/v3 v3.0.1 github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 diff --git a/go.sum b/go.sum index dd7370ab28..a093c8a9e1 100644 --- a/go.sum +++ b/go.sum @@ -379,10 +379,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/pat v0.0.0-20180118222023-199c85a7f6d1 h1:LqbZZ9sNMWVjeXS4NN5oVvhMjDyLhmA1LG86oSo+IqY= github.com/gorilla/pat v0.0.0-20180118222023-199c85a7f6d1/go.mod h1:YeAe0gNeiNT5hoiZRI4yiOky6jVdNvfO2N6Kav/HmxY= -github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA= github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo= -github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/gorilla/sessions v1.2.2 h1:lqzMYz6bOfvn2WriPUjNByzeXIlVzURcPmgMczkmTjY= github.com/gorilla/sessions v1.2.2/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ= github.com/h2non/gock v1.2.0 h1:K6ol8rfrRkUOefooBC8elXoaNGYkpp7y2qcxGG6BzUE= @@ -581,8 +579,6 @@ github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqSc github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= -github.com/quasoft/websspi v1.1.2 h1:/mA4w0LxWlE3novvsoEL6BBA1WnjJATbjkh1kFrTidw= -github.com/quasoft/websspi v1.1.2/go.mod h1:HmVdl939dQ0WIXZhyik+ARdI03M6bQzaSEKcgpFmewk= github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4= github.com/redis/go-redis/v9 v9.6.1/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk= @@ -779,7 +775,6 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/modules/graceful/manager_windows.go b/modules/graceful/manager_windows.go deleted file mode 100644 index bee44381db..0000000000 --- a/modules/graceful/manager_windows.go +++ /dev/null @@ -1,190 +0,0 @@ -// Copyright 2019 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT -// This code is heavily inspired by the archived gofacebook/gracenet/net.go handler - -//go:build windows - -package graceful - -import ( - "os" - "runtime/pprof" - "strconv" - "time" - - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - - "golang.org/x/sys/windows/svc" - "golang.org/x/sys/windows/svc/debug" -) - -// WindowsServiceName is the name of the Windows service -var WindowsServiceName = "gitea" - -const ( - hammerCode = 128 - hammerCmd = svc.Cmd(hammerCode) - acceptHammerCode = svc.Accepted(hammerCode) -) - -func (g *Manager) start() { - // Now label this and all goroutines created by this goroutine with the gracefulLifecycle manager - pprof.SetGoroutineLabels(g.managerCtx) - defer pprof.SetGoroutineLabels(g.ctx) - - if skip, _ := strconv.ParseBool(os.Getenv("SKIP_MINWINSVC")); skip { - log.Trace("Skipping SVC check as SKIP_MINWINSVC is set") - return - } - - // Make SVC process - run := svc.Run - - //lint:ignore SA1019 We use IsAnInteractiveSession because IsWindowsService has a different permissions profile - isAnInteractiveSession, err := svc.IsAnInteractiveSession() //nolint:staticcheck - if err != nil { - log.Error("Unable to ascertain if running as an Windows Service: %v", err) - return - } - if isAnInteractiveSession { - log.Trace("Not running a service ... using the debug SVC manager") - run = debug.Run - } - go func() { - _ = run(WindowsServiceName, g) - }() -} - -// Execute makes Manager implement svc.Handler -func (g *Manager) Execute(args []string, changes <-chan svc.ChangeRequest, status chan<- svc.Status) (svcSpecificEC bool, exitCode uint32) { - if setting.StartupTimeout > 0 { - status <- svc.Status{State: svc.StartPending, WaitHint: uint32(setting.StartupTimeout / time.Millisecond)} - } else { - status <- svc.Status{State: svc.StartPending} - } - - log.Trace("Awaiting server start-up") - // Now need to wait for everything to start... - if !g.awaitServer(setting.StartupTimeout) { - log.Trace("... start-up failed ... Stopped") - return false, 1 - } - - log.Trace("Sending Running state to SVC") - - // We need to implement some way of svc.AcceptParamChange/svc.ParamChange - status <- svc.Status{ - State: svc.Running, - Accepts: svc.AcceptStop | svc.AcceptShutdown | acceptHammerCode, - } - - log.Trace("Started") - - waitTime := 30 * time.Second - -loop: - for { - select { - case <-g.ctx.Done(): - log.Trace("Shutting down") - g.DoGracefulShutdown() - waitTime += setting.GracefulHammerTime - break loop - case <-g.shutdownRequested: - log.Trace("Shutting down") - waitTime += setting.GracefulHammerTime - break loop - case change := <-changes: - switch change.Cmd { - case svc.Interrogate: - log.Trace("SVC sent interrogate") - status <- change.CurrentStatus - case svc.Stop, svc.Shutdown: - log.Trace("SVC requested shutdown - shutting down") - g.DoGracefulShutdown() - waitTime += setting.GracefulHammerTime - break loop - case hammerCode: - log.Trace("SVC requested hammer - shutting down and hammering immediately") - g.DoGracefulShutdown() - g.DoImmediateHammer() - break loop - default: - log.Debug("Unexpected control request: %v", change.Cmd) - } - } - } - - log.Trace("Sending StopPending state to SVC") - status <- svc.Status{ - State: svc.StopPending, - WaitHint: uint32(waitTime / time.Millisecond), - } - -hammerLoop: - for { - select { - case change := <-changes: - switch change.Cmd { - case svc.Interrogate: - log.Trace("SVC sent interrogate") - status <- change.CurrentStatus - case svc.Stop, svc.Shutdown, hammerCmd: - log.Trace("SVC requested hammer - hammering immediately") - g.DoImmediateHammer() - break hammerLoop - default: - log.Debug("Unexpected control request: %v", change.Cmd) - } - case <-g.hammerCtx.Done(): - break hammerLoop - } - } - - log.Trace("Stopped") - return false, 0 -} - -func (g *Manager) awaitServer(limit time.Duration) bool { - c := make(chan struct{}) - go func() { - g.createServerCond.L.Lock() - for { - if g.createdServer >= numberOfServersToCreate { - g.createServerCond.L.Unlock() - close(c) - return - } - select { - case <-g.IsShutdown(): - g.createServerCond.L.Unlock() - return - default: - } - g.createServerCond.Wait() - } - }() - - var tc <-chan time.Time - if limit > 0 { - tc = time.After(limit) - } - select { - case <-c: - return true // completed normally - case <-tc: - return false // timed out - case <-g.IsShutdown(): - g.createServerCond.Signal() - return false - } -} - -func (g *Manager) notify(msg systemdNotifyMsg) { - // Windows doesn't use systemd to notify -} - -func KillParent() { - // Windows doesn't need to "kill parent" because there is no graceful restart -} diff --git a/modules/graceful/net_windows.go b/modules/graceful/net_windows.go deleted file mode 100644 index 9667bd4d13..0000000000 --- a/modules/graceful/net_windows.go +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2019 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -// This code is heavily inspired by the archived gofacebook/gracenet/net.go handler - -//go:build windows - -package graceful - -import "net" - -// DefaultGetListener obtains a listener for the local network address. -// On windows this is basically just a shim around net.Listen. -func DefaultGetListener(network, address string) (net.Listener, error) { - // Add a deferral to say that we've tried to grab a listener - defer GetManager().InformCleanup() - - return net.Listen(network, address) -} diff --git a/modules/process/manager_windows.go b/modules/process/manager_windows.go deleted file mode 100644 index 44a84f2203..0000000000 --- a/modules/process/manager_windows.go +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2022 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -//go:build windows - -package process - -import ( - "os/exec" -) - -// SetSysProcAttribute sets the common SysProcAttrs for commands -func SetSysProcAttribute(cmd *exec.Cmd) { - // Do nothing -} diff --git a/modules/util/file_windows.go b/modules/util/file_windows.go deleted file mode 100644 index 77a33d3c49..0000000000 --- a/modules/util/file_windows.go +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2022 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -//go:build windows - -package util - -import ( - "os" -) - -func ApplyUmask(f string, newMode os.FileMode) error { - // do nothing for Windows, because Windows doesn't use umask - return nil -} diff --git a/routers/private/manager_windows.go b/routers/private/manager_windows.go deleted file mode 100644 index f1b9365f52..0000000000 --- a/routers/private/manager_windows.go +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2020 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -//go:build windows - -package private - -import ( - "net/http" - - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/services/context" -) - -// Restart is not implemented for Windows based servers as they can't fork -func Restart(ctx *context.PrivateContext) { - ctx.JSON(http.StatusNotImplemented, private.Response{ - UserMsg: "windows servers cannot be gracefully restarted - shutdown and restart manually", - }) -} - -// Shutdown causes the server to perform a graceful shutdown -func Shutdown(ctx *context.PrivateContext) { - graceful.GetManager().DoGracefulShutdown() - ctx.PlainText(http.StatusOK, "success") -} diff --git a/services/auth/sspiauth_windows.go b/services/auth/sspiauth_windows.go deleted file mode 100644 index 093caaed33..0000000000 --- a/services/auth/sspiauth_windows.go +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2023 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -//go:build windows - -package auth - -import ( - "github.com/quasoft/websspi" -) - -type SSPIUserInfo = websspi.UserInfo - -func sspiAuthInit() error { - var err error - config := websspi.NewConfig() - sspiAuth, err = websspi.New(config) - return err -} From 961766744bb5b7bf138cb508c8f9afe69622d514 Mon Sep 17 00:00:00 2001 From: Zettat123 Date: Sun, 15 Sep 2024 00:40:36 +0800 Subject: [PATCH 013/443] Check if the `due_date` is nil when editing issues (#32035) (cherry picked from commit 3a51c37672d2fbad1f222922e75ce704d5a1ac71) --- routers/api/v1/repo/issue.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index afcfbc00e3..22779e38d2 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -839,10 +839,16 @@ func EditIssue(ctx *context.APIContext) { if (form.Deadline != nil || form.RemoveDeadline != nil) && canWrite { var deadlineUnix timeutil.TimeStamp - if (form.RemoveDeadline == nil || !*form.RemoveDeadline) && !form.Deadline.IsZero() { - deadline := time.Date(form.Deadline.Year(), form.Deadline.Month(), form.Deadline.Day(), - 23, 59, 59, 0, form.Deadline.Location()) - deadlineUnix = timeutil.TimeStamp(deadline.Unix()) + if form.RemoveDeadline == nil || !*form.RemoveDeadline { + if form.Deadline == nil { + ctx.Error(http.StatusBadRequest, "", "The due_date cannot be empty") + return + } + if !form.Deadline.IsZero() { + deadline := time.Date(form.Deadline.Year(), form.Deadline.Month(), form.Deadline.Day(), + 23, 59, 59, 0, form.Deadline.Location()) + deadlineUnix = timeutil.TimeStamp(deadline.Unix()) + } } if err := issues_model.UpdateIssueDeadline(ctx, issue, deadlineUnix, ctx.Doer); err != nil { From 0cafec4c7a2faf810953e9d522faf5dc019e1522 Mon Sep 17 00:00:00 2001 From: KN4CK3R Date: Mon, 16 Sep 2024 23:10:33 +0200 Subject: [PATCH 014/443] Do not escape relative path in RPM primary index (#32038) Fixes #32021 Do not escape the relative path. (cherry picked from commit f528df944bb9436afcb9272add2ee0cccefbdb55) --- services/packages/rpm/repository.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/packages/rpm/repository.go b/services/packages/rpm/repository.go index 8a2db8670f..2cea04212a 100644 --- a/services/packages/rpm/repository.go +++ b/services/packages/rpm/repository.go @@ -13,7 +13,6 @@ import ( "errors" "fmt" "io" - "net/url" "strings" "time" @@ -440,7 +439,7 @@ func buildPrimary(ctx context.Context, pv *packages_model.PackageVersion, pfs [] Archive: pd.FileMetadata.ArchiveSize, }, Location: Location{ - Href: fmt.Sprintf("package/%s/%s/%s/%s", url.PathEscape(pd.Package.Name), url.PathEscape(packageVersion), url.PathEscape(pd.FileMetadata.Architecture), url.PathEscape(fmt.Sprintf("%s-%s.%s.rpm", pd.Package.Name, packageVersion, pd.FileMetadata.Architecture))), + Href: fmt.Sprintf("package/%s/%s/%s/%s-%s.%s.rpm", pd.Package.Name, packageVersion, pd.FileMetadata.Architecture, pd.Package.Name, packageVersion, pd.FileMetadata.Architecture), }, Format: Format{ License: pd.VersionMetadata.License, From 9d5f409a5a0ac784523cc94a6011f8c8a41d5a95 Mon Sep 17 00:00:00 2001 From: hiifong Date: Wed, 18 Sep 2024 03:02:48 +0800 Subject: [PATCH 015/443] Lazy load avatar images (#32051) (cherry picked from commit f38e1014483b84f4541ffb354cd5dfdd7e000e2c) --- modules/templates/util_avatar.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/templates/util_avatar.go b/modules/templates/util_avatar.go index 85832cf264..afc1091516 100644 --- a/modules/templates/util_avatar.go +++ b/modules/templates/util_avatar.go @@ -34,7 +34,7 @@ func AvatarHTML(src string, size int, class, name string) template.HTML { name = "avatar" } - return template.HTML(``) + return template.HTML(``) } // Avatar renders user avatars. args: user, size (int), class (string) From ed6fef98445528a10bd63acc6f8b6fde847d67c9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 23 Sep 2024 00:04:43 +0000 Subject: [PATCH 016/443] Update dependency monaco-editor to v0.51.0 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f2aea12a85..c3ee2f3f09 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,7 @@ "mermaid": "11.2.0", "mini-css-extract-plugin": "2.9.1", "minimatch": "10.0.1", - "monaco-editor": "0.50.0", + "monaco-editor": "0.51.0", "monaco-editor-webpack-plugin": "7.1.0", "pdfobject": "2.3.0", "postcss": "8.4.47", @@ -12238,9 +12238,9 @@ } }, "node_modules/monaco-editor": { - "version": "0.50.0", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.50.0.tgz", - "integrity": "sha512-8CclLCmrRRh+sul7C08BmPBP3P8wVWfBHomsTcndxg5NRCEPfu/mc2AGU8k37ajjDVXcXFc12ORAMUkmk+lkFA==", + "version": "0.51.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.51.0.tgz", + "integrity": "sha512-xaGwVV1fq343cM7aOYB6lVE4Ugf0UyimdD/x5PWcWBMKENwectaEu77FAN7c5sFiyumqeJdX1RPTh1ocioyDjw==", "license": "MIT" }, "node_modules/monaco-editor-webpack-plugin": { diff --git a/package.json b/package.json index 7a7ed6687c..da7b9cad3c 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "mermaid": "11.2.0", "mini-css-extract-plugin": "2.9.1", "minimatch": "10.0.1", - "monaco-editor": "0.50.0", + "monaco-editor": "0.51.0", "monaco-editor-webpack-plugin": "7.1.0", "pdfobject": "2.3.0", "postcss": "8.4.47", From 4a74113dee37ac3de2df27cef5c15e800b4f649d Mon Sep 17 00:00:00 2001 From: Bram Hagens Date: Wed, 17 Jul 2024 01:37:20 +0200 Subject: [PATCH 017/443] feat(ui): add more emoji and code block rendering in issues --- modules/markup/html.go | 49 ++++++ modules/templates/helper.go | 11 +- modules/templates/util_render.go | 11 ++ modules/templates/util_render_test.go | 40 ++++- templates/repo/issue/card.tmpl | 2 +- .../repo/issue/view_content/comments.tmpl | 14 +- .../view_content/sidebar/dependencies.tmpl | 13 +- templates/repo/issue/view_title.tmpl | 3 +- templates/repo/pulse.tmpl | 12 +- .../user/notification/notification_div.tmpl | 2 +- tests/integration/repo_issue_title_test.go | 162 ++++++++++++++++++ vitest.config.js | 4 + web_src/js/features/repo-issue.js | 9 +- web_src/js/features/repo-issue.test.js | 24 +++ 14 files changed, 322 insertions(+), 34 deletions(-) create mode 100644 tests/integration/repo_issue_title_test.go create mode 100644 web_src/js/features/repo-issue.test.js diff --git a/modules/markup/html.go b/modules/markup/html.go index 9280a67d62..2e65827bf7 100644 --- a/modules/markup/html.go +++ b/modules/markup/html.go @@ -73,6 +73,8 @@ var ( // EmojiShortCodeRegex find emoji by alias like :smile: EmojiShortCodeRegex = regexp.MustCompile(`:[-+\w]+:`) + + InlineCodeBlockRegex = regexp.MustCompile("`[^`]+`") ) // CSS class for action keywords (e.g. "closes: #1") @@ -243,6 +245,7 @@ func RenderIssueTitle( title string, ) (string, error) { return renderProcessString(ctx, []processor{ + inlineCodeBlockProcessor, issueIndexPatternProcessor, commitCrossReferencePatternProcessor, hashCurrentPatternProcessor, @@ -251,6 +254,19 @@ func RenderIssueTitle( }, title) } +// RenderRefIssueTitle to process title on places where an issue is referenced +func RenderRefIssueTitle( + ctx *RenderContext, + title string, +) (string, error) { + return renderProcessString(ctx, []processor{ + inlineCodeBlockProcessor, + issueIndexPatternProcessor, + emojiShortCodeProcessor, + emojiProcessor, + }, title) +} + func renderProcessString(ctx *RenderContext, procs []processor, content string) (string, error) { var buf strings.Builder if err := postProcess(ctx, procs, strings.NewReader(content), &buf); err != nil { @@ -438,6 +454,24 @@ func createKeyword(content string) *html.Node { return span } +func createInlineCode(content string) *html.Node { + code := &html.Node{ + Type: html.ElementNode, + Data: atom.Code.String(), + Attr: []html.Attribute{}, + } + + code.Attr = append(code.Attr, html.Attribute{Key: "class", Val: "inline-code-block"}) + + text := &html.Node{ + Type: html.TextNode, + Data: content, + } + + code.AppendChild(text) + return code +} + func createEmoji(content, class, name string) *html.Node { span := &html.Node{ Type: html.ElementNode, @@ -1070,6 +1104,21 @@ func filePreviewPatternProcessor(ctx *RenderContext, node *html.Node) { } } +func inlineCodeBlockProcessor(ctx *RenderContext, node *html.Node) { + start := 0 + next := node.NextSibling + for node != nil && node != next && start < len(node.Data) { + m := InlineCodeBlockRegex.FindStringSubmatchIndex(node.Data[start:]) + if m == nil { + return + } + + code := node.Data[m[0]+1 : m[1]-1] + replaceContent(node, m[0], m[1], createInlineCode(code)) + node = node.NextSibling.NextSibling + } +} + // emojiShortCodeProcessor for rendering text like :smile: into emoji func emojiShortCodeProcessor(ctx *RenderContext, node *html.Node) { start := 0 diff --git a/modules/templates/helper.go b/modules/templates/helper.go index f1ae1c8bb1..aeae8204ad 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -172,11 +172,12 @@ func NewFuncMap() template.FuncMap { "RenderCommitMessage": RenderCommitMessage, "RenderCommitMessageLinkSubject": RenderCommitMessageLinkSubject, - "RenderCommitBody": RenderCommitBody, - "RenderCodeBlock": RenderCodeBlock, - "RenderIssueTitle": RenderIssueTitle, - "RenderEmoji": RenderEmoji, - "ReactionToEmoji": ReactionToEmoji, + "RenderCommitBody": RenderCommitBody, + "RenderCodeBlock": RenderCodeBlock, + "RenderIssueTitle": RenderIssueTitle, + "RenderRefIssueTitle": RenderRefIssueTitle, + "RenderEmoji": RenderEmoji, + "ReactionToEmoji": ReactionToEmoji, "RenderMarkdownToHtml": RenderMarkdownToHtml, "RenderLabel": RenderLabel, diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go index 76790b63d5..c53bdd876f 100644 --- a/modules/templates/util_render.go +++ b/modules/templates/util_render.go @@ -130,6 +130,17 @@ func RenderIssueTitle(ctx context.Context, text string, metas map[string]string) return template.HTML(renderedText) } +// RenderRefIssueTitle renders referenced issue/pull title with defined post processors +func RenderRefIssueTitle(ctx context.Context, text string) template.HTML { + renderedText, err := markup.RenderRefIssueTitle(&markup.RenderContext{Ctx: ctx}, template.HTMLEscapeString(text)) + if err != nil { + log.Error("RenderRefIssueTitle: %v", err) + return "" + } + + return template.HTML(renderedText) +} + // RenderLabel renders a label // locale is needed due to an import cycle with our context providing the `Tr` function func RenderLabel(ctx context.Context, locale translation.Locale, label *issues_model.Label) template.HTML { diff --git a/modules/templates/util_render_test.go b/modules/templates/util_render_test.go index ea01612ac3..da74298ef7 100644 --- a/modules/templates/util_render_test.go +++ b/modules/templates/util_render_test.go @@ -35,8 +35,8 @@ com 88fc37a3c0a4dda553bdcfc80c178a58247f42fb mit mail@domain.com @mention-user test #123 - space -` + space +` + "`code :+1: #123 code`\n" var testMetas = map[string]string{ "user": "user13", @@ -115,8 +115,8 @@ com 88fc37a3c0a4dda553bdcfc80c178a58247f42fb mit mail@domain.com @mention-user test #123 - space` - + space +` + "`code 👍 #123 code`" assert.EqualValues(t, expected, RenderCommitBody(context.Background(), testInput, testMetas)) } @@ -152,11 +152,38 @@ com 88fc37a3c0a4dda553bdcfc80c178a58247f42fb mit mail@domain.com @mention-user test #123 - space + space +code :+1: #123 code ` assert.EqualValues(t, expected, RenderIssueTitle(context.Background(), testInput, testMetas)) } +func TestRenderRefIssueTitle(t *testing.T) { + expected := ` space @mention-user +/just/a/path.bin +https://example.com/file.bin +[local link](file.bin) +[remote link](https://example.com) +[[local link|file.bin]] +[[remote link|https://example.com]] +![local image](image.jpg) +![remote image](https://example.com/image.jpg) +[[local image|image.jpg]] +[[remote link|https://example.com/image.jpg]] +https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash +com 88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb pare +https://example.com/user/repo/commit/88fc37a3c0a4dda553bdcfc80c178a58247f42fb +com 88fc37a3c0a4dda553bdcfc80c178a58247f42fb mit +👍 +mail@domain.com +@mention-user test +#123 + space +code :+1: #123 code +` + assert.EqualValues(t, expected, RenderRefIssueTitle(context.Background(), testInput)) +} + func TestRenderMarkdownToHtml(t *testing.T) { expected := `

space @mention-user
/just/a/path.bin @@ -177,7 +204,8 @@ com 88fc37a3c0a4dda553bdcfc80c178a58247f42fb mit mail@domain.com @mention-user test #123 -space

+space +code :+1: #123 code

` assert.EqualValues(t, expected, RenderMarkdownToHtml(context.Background(), testInput)) } diff --git a/templates/repo/issue/card.tmpl b/templates/repo/issue/card.tmpl index 4c22c28329..0b255d6705 100644 --- a/templates/repo/issue/card.tmpl +++ b/templates/repo/issue/card.tmpl @@ -14,7 +14,7 @@
{{template "shared/issueicon" .}}
- {{.Title | RenderEmoji ctx | RenderCodeBlock}} + {{RenderRefIssueTitle $.Context .Title}} {{if and $.isPinnedIssueCard $.Page.IsRepoAdmin}} {{svg "octicon-x" 16}} diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 019638bfb0..08c83c07d7 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -149,7 +149,7 @@ {{if eq .RefAction 3}}{{end}}
- {{.RefIssueTitle ctx}} {{.RefIssueIdent ctx}} + {{.RefIssueTitle ctx | RenderEmoji $.Context | RenderCodeBlock}} {{.RefIssueIdent ctx}}
{{else if eq .Type 4}} @@ -226,7 +226,7 @@ {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{ctx.Locale.Tr "repo.issues.change_title_at" (.OldTitle|RenderEmoji $.Context) (.NewTitle|RenderEmoji $.Context) $createdStr}} + {{ctx.Locale.Tr "repo.issues.change_title_at" (RenderRefIssueTitle $.Context .OldTitle) (RenderRefIssueTitle $.Context .NewTitle) $createdStr}}
{{else if eq .Type 11}} @@ -339,10 +339,11 @@ {{svg "octicon-plus"}} + {{$strTitle := RenderRefIssueTitle $.Context .DependentIssue.Title}} {{if eq .DependentIssue.RepoID .Issue.RepoID}} - #{{.DependentIssue.Index}} {{.DependentIssue.Title}} + #{{.DependentIssue.Index}} {{$strTitle}} {{else}} - {{.DependentIssue.Repo.FullName}}#{{.DependentIssue.Index}} - {{.DependentIssue.Title}} + {{.DependentIssue.Repo.FullName}}#{{.DependentIssue.Index}} - {{$strTitle}} {{end}} @@ -362,10 +363,11 @@ {{svg "octicon-trash"}} + {{$strTitle := RenderRefIssueTitle $.Context .DependentIssue.Title}} {{if eq .DependentIssue.RepoID .Issue.RepoID}} - #{{.DependentIssue.Index}} {{.DependentIssue.Title}} + #{{.DependentIssue.Index}} {{$strTitle}} {{else}} - {{.DependentIssue.Repo.FullName}}#{{.DependentIssue.Index}} - {{.DependentIssue.Title}} + {{.DependentIssue.Repo.FullName}}#{{.DependentIssue.Index}} - {{$strTitle}} {{end}} diff --git a/templates/repo/issue/view_content/sidebar/dependencies.tmpl b/templates/repo/issue/view_content/sidebar/dependencies.tmpl index 791bd5c4a1..6a9b651e7d 100644 --- a/templates/repo/issue/view_content/sidebar/dependencies.tmpl +++ b/templates/repo/issue/view_content/sidebar/dependencies.tmpl @@ -19,8 +19,8 @@ {{range .BlockingDependencies}}
- - #{{.Issue.Index}} {{.Issue.Title | RenderEmoji $.Context}} + + #{{.Issue.Index}} {{RenderRefIssueTitle $.Context .Issue.Title}}}
{{.Repository.OwnerName}}/{{.Repository.Name}} @@ -51,8 +51,9 @@ {{range .BlockedByDependencies}}
- - #{{.Issue.Index}} {{.Issue.Title | RenderEmoji $.Context}} + {{$title := RenderRefIssueTitle $.Context .Issue.Title}} + + #{{.Issue.Index}} {{RenderRefIssueTitle $.Context .Issue.Title}}
{{.Repository.OwnerName}}/{{.Repository.Name}} @@ -73,8 +74,8 @@
{{svg "octicon-lock" 16}} - - #{{.Issue.Index}} {{.Issue.Title | RenderEmoji $.Context}} + + #{{.Issue.Index}} {{RenderRefIssueTitle $.Context .DependentIssue.Title}}
diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index db21adae2c..f60d958a1c 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -7,8 +7,7 @@ {{$canEditIssueTitle := and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}

- {{RenderIssueTitle $.Context .Issue.Title ($.Repository.ComposeMetas ctx) | RenderCodeBlock}} - #{{.Issue.Index}} + {{RenderIssueTitle $.Context .Issue.Title ($.Repository.ComposeMetas ctx)}} #{{.Issue.Index}}

{{if $canEditIssueTitle}} diff --git a/templates/repo/pulse.tmpl b/templates/repo/pulse.tmpl index 0494883a85..3554cf6a19 100644 --- a/templates/repo/pulse.tmpl +++ b/templates/repo/pulse.tmpl @@ -153,7 +153,7 @@ {{range .Activity.MergedPRs}}

{{ctx.Locale.Tr "repo.activity.merged_prs_label"}} - #{{.Index}} {{.Issue.Title | RenderEmoji $.Context | RenderCodeBlock}} + #{{.Index}} {{RenderRefIssueTitle $.Context .Issue.Title}} {{TimeSinceUnix .MergedUnix ctx.Locale}}

{{end}} @@ -172,7 +172,7 @@ {{range .Activity.OpenedPRs}}

{{ctx.Locale.Tr "repo.activity.opened_prs_label"}} - #{{.Index}} {{.Issue.Title | RenderEmoji $.Context | RenderCodeBlock}} + #{{.Index}} {{RenderRefIssueTitle $.Context .Issue.Title}} {{TimeSinceUnix .Issue.CreatedUnix ctx.Locale}}

{{end}} @@ -191,7 +191,7 @@ {{range .Activity.ClosedIssues}}

{{ctx.Locale.Tr "repo.activity.closed_issue_label"}} - #{{.Index}} {{.Title | RenderEmoji $.Context | RenderCodeBlock}} + #{{.Index}} {{RenderRefIssueTitle $.Context .Title}} {{TimeSinceUnix .ClosedUnix ctx.Locale}}

{{end}} @@ -210,7 +210,7 @@ {{range .Activity.OpenedIssues}}

{{ctx.Locale.Tr "repo.activity.new_issue_label"}} - #{{.Index}} {{.Title | RenderEmoji $.Context | RenderCodeBlock}} + #{{.Index}} {{RenderRefIssueTitle $.Context .Title}} {{TimeSinceUnix .CreatedUnix ctx.Locale}}

{{end}} @@ -228,9 +228,9 @@ {{ctx.Locale.Tr "repo.activity.unresolved_conv_label"}} #{{.Index}} {{if .IsPull}} - {{.Title | RenderEmoji $.Context | RenderCodeBlock}} + {{RenderRefIssueTitle $.Context .Title}} {{else}} - {{.Title | RenderEmoji $.Context | RenderCodeBlock}} + {{RenderRefIssueTitle $.Context .Title}} {{end}} {{TimeSinceUnix .UpdatedUnix ctx.Locale}}

diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index 4329ffdb7a..5c27ba8b41 100644 --- a/templates/user/notification/notification_div.tmpl +++ b/templates/user/notification/notification_div.tmpl @@ -58,7 +58,7 @@
{{if .Issue}} - {{.Issue.Title | RenderEmoji $.Context | RenderCodeBlock}} + {{RenderRefIssueTitle $.Context .Issue.Title}} {{else}} {{.Repository.FullName}} {{end}} diff --git a/tests/integration/repo_issue_title_test.go b/tests/integration/repo_issue_title_test.go new file mode 100644 index 0000000000..5199be91bc --- /dev/null +++ b/tests/integration/repo_issue_title_test.go @@ -0,0 +1,162 @@ +// Copyright 2024 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: GPL-3.0-or-later + +package integration + +import ( + "net/http" + "net/url" + "strings" + "testing" + "time" + + "code.gitea.io/gitea/models/db" + issues_model "code.gitea.io/gitea/models/issues" + repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/models/unittest" + user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/git" + issue_service "code.gitea.io/gitea/services/issue" + pull_service "code.gitea.io/gitea/services/pull" + files_service "code.gitea.io/gitea/services/repository/files" + "code.gitea.io/gitea/tests" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestIssueTitles(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) + repo, _, f := tests.CreateDeclarativeRepo(t, user, "issue-titles", nil, nil, nil) + defer f() + + session := loginUser(t, user.LoginName) + + title := "Title :+1: `code`" + issue1 := createIssue(t, user, repo, title, "Test issue") + issue2 := createIssue(t, user, repo, title, "Ref #1") + + titleHTML := []string{ + "Title", + `👍`, + `code`, + } + + t.Run("Main issue title", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + html := extractHTML(t, session, issue1, "div.issue-title-header > * > h1") + assertContainsAll(t, titleHTML, html) + }) + + t.Run("Referenced issue comment", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + html := extractHTML(t, session, issue1, "div.timeline > div.timeline-item:nth-child(3) > div.detail > * > a") + assertContainsAll(t, titleHTML, html) + }) + + t.Run("Dependent issue comment", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + err := issues_model.CreateIssueDependency(db.DefaultContext, user, issue1, issue2) + require.NoError(t, err) + + html := extractHTML(t, session, issue1, "div.timeline > div:nth-child(3) > div.detail > * > a") + assertContainsAll(t, titleHTML, html) + }) + + t.Run("Dependent issue sidebar", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + html := extractHTML(t, session, issue1, "div.item.dependency > * > a.title") + assertContainsAll(t, titleHTML, html) + }) + + t.Run("Referenced pull comment", func(t *testing.T) { + _, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, user, &files_service.ChangeRepoFilesOptions{ + Files: []*files_service.ChangeRepoFile{ + { + Operation: "update", + TreePath: "README.md", + ContentReader: strings.NewReader("Update README"), + }, + }, + Message: "Update README", + OldBranch: "main", + NewBranch: "branch", + Author: &files_service.IdentityOptions{ + Name: user.Name, + Email: user.Email, + }, + Committer: &files_service.IdentityOptions{ + Name: user.Name, + Email: user.Email, + }, + Dates: &files_service.CommitDateOptions{ + Author: time.Now(), + Committer: time.Now(), + }, + }) + + require.NoError(t, err) + + pullIssue := &issues_model.Issue{ + RepoID: repo.ID, + Title: title, + Content: "Closes #1", + PosterID: user.ID, + Poster: user, + IsPull: true, + } + + pullRequest := &issues_model.PullRequest{ + HeadRepoID: repo.ID, + BaseRepoID: repo.ID, + HeadBranch: "branch", + BaseBranch: "main", + HeadRepo: repo, + BaseRepo: repo, + Type: issues_model.PullRequestGitea, + } + + err = pull_service.NewPullRequest(git.DefaultContext, repo, pullIssue, nil, nil, pullRequest, nil) + require.NoError(t, err) + + html := extractHTML(t, session, issue1, "div.timeline > div:nth-child(4) > div.detail > * > a") + assertContainsAll(t, titleHTML, html) + }) + }) +} + +func createIssue(t *testing.T, user *user_model.User, repo *repo_model.Repository, title, content string) *issues_model.Issue { + issue := &issues_model.Issue{ + RepoID: repo.ID, + Title: title, + Content: content, + PosterID: user.ID, + Poster: user, + } + + err := issue_service.NewIssue(db.DefaultContext, repo, issue, nil, nil, nil) + require.NoError(t, err) + + return issue +} + +func extractHTML(t *testing.T, session *TestSession, issue *issues_model.Issue, query string) string { + req := NewRequest(t, "GET", issue.HTMLURL()) + resp := session.MakeRequest(t, req, http.StatusOK) + doc := NewHTMLParser(t, resp.Body) + res, err := doc.doc.Find(query).Html() + require.NoError(t, err) + + return res +} + +func assertContainsAll(t *testing.T, expected []string, actual string) { + for i := range expected { + assert.Contains(t, actual, expected[i]) + } +} diff --git a/vitest.config.js b/vitest.config.js index ea0fafeee8..776247c5ee 100644 --- a/vitest.config.js +++ b/vitest.config.js @@ -1,6 +1,7 @@ import {defineConfig} from 'vitest/config'; import vuePlugin from '@vitejs/plugin-vue'; import {stringPlugin} from 'vite-string-plugin'; +import {resolve} from 'node:path'; export default defineConfig({ test: { @@ -13,6 +14,9 @@ export default defineConfig({ passWithNoTests: true, globals: true, watch: false, + alias: { + 'monaco-editor': resolve(import.meta.dirname, '/node_modules/monaco-editor/esm/vs/editor/editor.api'), + }, }, plugins: [ stringPlugin(), diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index ff8faa94f6..feba449c16 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -8,6 +8,7 @@ import {toAbsoluteUrl} from '../utils.js'; import {initDropzone} from './common-global.js'; import {POST, GET} from '../modules/fetch.js'; import {showErrorToast} from '../modules/toast.js'; +import {emojiHTML} from './emoji.js'; const {appSubUrl} = window.config; @@ -124,7 +125,7 @@ export function initRepoIssueSidebarList() { return; } filteredResponse.results.push({ - name: `#${issue.number} ${htmlEscape(issue.title) + name: `#${issue.number} ${issueTitleHTML(htmlEscape(issue.title)) }
${htmlEscape(issue.repository.full_name)}
`, value: issue.id, }); @@ -731,3 +732,9 @@ export function initArchivedLabelHandler() { toggleElem(label, label.classList.contains('checked')); } } + +// Render the issue's title. It converts emojis and code blocks syntax into their respective HTML equivalent. +export function issueTitleHTML(title) { + return title.replaceAll(/:[-+\w]+:/g, (emoji) => emojiHTML(emoji.substring(1, emoji.length - 1))) + .replaceAll(/`[^`]+`/g, (code) => `${code.substring(1, code.length - 1)}`); +} diff --git a/web_src/js/features/repo-issue.test.js b/web_src/js/features/repo-issue.test.js new file mode 100644 index 0000000000..8c9734b0c6 --- /dev/null +++ b/web_src/js/features/repo-issue.test.js @@ -0,0 +1,24 @@ +import {vi} from 'vitest'; + +import {issueTitleHTML} from './repo-issue.js'; + +// monaco-editor does not have any exports fields, which trips up vitest +vi.mock('./comp/ComboMarkdownEditor.js', () => ({})); +// jQuery is missing +vi.mock('./common-global.js', () => ({})); + +test('Convert issue title to html', () => { + expect(issueTitleHTML('')).toEqual(''); + expect(issueTitleHTML('issue title')).toEqual('issue title'); + + const expected_thumbs_up = `👍`; + expect(issueTitleHTML(':+1:')).toEqual(expected_thumbs_up); + expect(issueTitleHTML(':invalid emoji:')).toEqual(':invalid emoji:'); + + const expected_code_block = `code`; + expect(issueTitleHTML('`code`')).toEqual(expected_code_block); + expect(issueTitleHTML('`invalid code')).toEqual('`invalid code'); + expect(issueTitleHTML('invalid code`')).toEqual('invalid code`'); + + expect(issueTitleHTML('issue title :+1: `code`')).toEqual(`issue title ${expected_thumbs_up} ${expected_code_block}`); +}); From dc9a268d3c23d19e42fabd936c9846828f94a6e4 Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Sun, 22 Sep 2024 21:21:54 +0200 Subject: [PATCH 018/443] i18n: UX improvements: Team permissions and issue closing Change word order for issue comment actions - An attempt to address https://codeberg.org/forgejo/forgejo/issues/2650 Org team permissions improvements - consistency: added missing dot - clarity: explain what external units mean - use dedicated keys to explain the permissions. - split in read/write permissions - use explicit labels for accessibility - ext_wiki.desc and ext_issues.desc are no longer in use. --- models/unit/unit.go | 11 +++++++++++ options/locale/locale_en-US.ini | 32 +++++++++++++++++++++++++------- templates/org/team/new.tmpl | 17 +++++++++-------- tests/e2e/shared/forms.js | 14 ++++++++++++++ 4 files changed, 59 insertions(+), 15 deletions(-) diff --git a/models/unit/unit.go b/models/unit/unit.go index 3beee6a572..5a8b9114f2 100644 --- a/models/unit/unit.go +++ b/models/unit/unit.go @@ -245,6 +245,7 @@ func (u *Type) CanBeDefault() bool { // Unit is a section of one repository type Unit struct { Type Type + Name string NameKey string URI string DescKey string @@ -272,6 +273,7 @@ func (u Unit) MaxPerm() perm.AccessMode { var ( UnitCode = Unit{ TypeCode, + "code", "repo.code", "/", "repo.code.desc", @@ -281,6 +283,7 @@ var ( UnitIssues = Unit{ TypeIssues, + "issues", "repo.issues", "/issues", "repo.issues.desc", @@ -290,6 +293,7 @@ var ( UnitExternalTracker = Unit{ TypeExternalTracker, + "ext_issues", "repo.ext_issues", "/issues", "repo.ext_issues.desc", @@ -299,6 +303,7 @@ var ( UnitPullRequests = Unit{ TypePullRequests, + "pulls", "repo.pulls", "/pulls", "repo.pulls.desc", @@ -308,6 +313,7 @@ var ( UnitReleases = Unit{ TypeReleases, + "releases", "repo.releases", "/releases", "repo.releases.desc", @@ -317,6 +323,7 @@ var ( UnitWiki = Unit{ TypeWiki, + "wiki", "repo.wiki", "/wiki", "repo.wiki.desc", @@ -326,6 +333,7 @@ var ( UnitExternalWiki = Unit{ TypeExternalWiki, + "ext_wiki", "repo.ext_wiki", "/wiki", "repo.ext_wiki.desc", @@ -335,6 +343,7 @@ var ( UnitProjects = Unit{ TypeProjects, + "projects", "repo.projects", "/projects", "repo.projects.desc", @@ -344,6 +353,7 @@ var ( UnitPackages = Unit{ TypePackages, + "packages", "repo.packages", "/packages", "packages.desc", @@ -353,6 +363,7 @@ var ( UnitActions = Unit{ TypeActions, + "actions", "repo.actions", "/actions", "actions.unit.desc", diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 1631c90ba2..6b732fb121 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1441,8 +1441,7 @@ commitstatus.failure = Failure commitstatus.pending = Pending commitstatus.success = Success -ext_issues = Access to external issues -ext_issues.desc = Link to an external issue tracker. +ext_issues = External issues projects = Projects projects.desc = Manage issues and pulls in project boards. @@ -1619,9 +1618,9 @@ issues.no_content = No description provided. issues.close = Close issue issues.comment_pull_merged_at = merged commit %[1]s into %[2]s %[3]s issues.comment_manually_pull_merged_at = manually merged commit %[1]s into %[2]s %[3]s -issues.close_comment_issue = Comment and close +issues.close_comment_issue = Close with comment issues.reopen_issue = Reopen -issues.reopen_comment_issue = Comment and reopen +issues.reopen_comment_issue = Reopen with comment issues.create_comment = Comment issues.closed_at = `closed this issue %[2]s` issues.reopened_at = `reopened this issue %[2]s` @@ -2025,8 +2024,7 @@ signing.wont_sign.commitssigned = The merge will not be signed as all the associ signing.wont_sign.approved = The merge will not be signed as the PR is not approved. signing.wont_sign.not_signed_in = You are not signed in. -ext_wiki = Access to external Wiki -ext_wiki.desc = Link to an external wiki. +ext_wiki = External Wiki wiki = Wiki wiki.welcome = Welcome to the Wiki. @@ -2766,6 +2764,26 @@ error.csv.unexpected = Can't render this file because it contains an unexpected error.csv.invalid_field_count = Can't render this file because it has a wrong number of fields in line %d. error.broken_git_hook = Git hooks of this repository seem to be broken. Please follow the documentation to fix them, then push some commits to refresh the status. +[repo.permissions] +code.read = Read: Access and clone the code of the repository. +code.write = Write: Push to the repository, create branches and tags. +issues.read = Read: Read and create issues and comments. +issues.write = Write: Close issues and manage metadata like labels, milestones, assignees, due dates and dependencies. +pulls.read = Read: Reading and create pull requests. +pulls.write = Write: Close pull requests and manage metadata like labels, milestones, assignees, due dates and dependencies. +releases.read = Read: View and download releases. +releases.write = Write: Publish, edit and delete releases and their assets. +wiki.read = Read: Read the integrated wiki and it's history. +wiki.write = Write: Create, update and delete pages in the integrated wiki. +projects.read = Read: Access repository project boards. +projects.write = Write: Create projects and columns and edit them. +packages.read = Read: View and download packages assigned to the repository. +packages.write = Write: Publish and delete packages assigned to the repository. +actions.read = Read: View integrated CI/CD pipelines and their logs. +actions.write = Write: Manually trigger, restart, cancel or approve pending CI/CD pipelines. +ext_issues = Access the link to an external issue tracker. The permissions are managed externally. +ext_wiki = Access the link to an external wiki. The permissions are managed externally. + [graphs] component_loading = Loading %s... component_loading_failed = Could not load %s @@ -3733,7 +3751,7 @@ management = Manage secrets [actions] actions = Actions -unit.desc = Manage integrated CI/CD pipelines with Forgejo Actions +unit.desc = Manage integrated CI/CD pipelines with Forgejo Actions. status.unknown = Unknown status.waiting = Waiting diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 1776f5e3ae..ed9cb9893a 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -65,8 +65,8 @@ {{ctx.Locale.Tr "units.unit"}} {{ctx.Locale.Tr "org.teams.none_access"}} - {{ctx.Locale.Tr "org.teams.read_access"}} - {{ctx.Locale.Tr "org.teams.write_access"}} + {{ctx.Locale.Tr "org.teams.read_access"}} + {{ctx.Locale.Tr "org.teams.write_access"}} @@ -75,25 +75,26 @@ @@ -108,7 +109,7 @@ {{end}} {{end}} diff --git a/tests/e2e/shared/forms.js b/tests/e2e/shared/forms.js index 586dd0ca38..7340dc60ff 100644 --- a/tests/e2e/shared/forms.js +++ b/tests/e2e/shared/forms.js @@ -21,10 +21,24 @@ export async function validate_form({page}, scope) { await expect(b).toHaveCSS('margin-top', '0px'); await expect(b).toHaveCSS('vertical-align', 'baseline'); } + // assert no (trailing) colon is used in labels // might be necessary to adjust in case colons are strictly necessary in help text for (const l of await page.locator('label').all()) { const str = await l.textContent(); await expect(str.split('\n')[0]).not.toContain(':'); } + + // check that multiple help text are correctly aligned to each other + // used for example to separate read/write permissions in team permission matrix + for (const l of await page.locator('label:has(.help + .help)').all()) { + const helpLabels = await l.locator('.help').all(); + const boxes = await Promise.all(helpLabels.map((help) => help.boundingBox())); + for (let i = 1; i < boxes.length; i++) { + // help texts vertically aligned on top of each other + await expect(boxes[i].x).toBe(boxes[0].x); + // help texts don't horizontally intersect each other + await expect(boxes[i].y + boxes[i].height).toBeGreaterThanOrEqual(boxes[i - 1].y + boxes[i - 1].height); + } + } } From c54ebb8bc74e459ad1454da9866bbbaec4f4fde5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 24 Sep 2024 22:02:34 +0000 Subject: [PATCH 019/443] Replace dependency eslint-plugin-vitest with @vitest/eslint-plugin 1.0.0 --- package-lock.json | 51 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index f2aea12a85..876e6bef7f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -68,6 +68,7 @@ "@stylistic/stylelint-plugin": "3.0.1", "@vitejs/plugin-vue": "5.1.3", "@vitest/coverage-v8": "2.1.1", + "@vitest/eslint-plugin": "1.0.0", "@vue/test-utils": "2.4.6", "eslint": "8.57.1", "eslint-plugin-array-func": "4.0.0", @@ -79,7 +80,6 @@ "eslint-plugin-regexp": "2.6.0", "eslint-plugin-sonarjs": "2.0.2", "eslint-plugin-unicorn": "55.0.0", - "eslint-plugin-vitest": "0.5.4", "eslint-plugin-vitest-globals": "1.5.0", "eslint-plugin-vue": "9.28.0", "eslint-plugin-vue-scoped-css": "2.8.1", @@ -5149,6 +5149,30 @@ "@jridgewell/sourcemap-codec": "^1.5.0" } }, + "node_modules/@vitest/eslint-plugin": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@vitest/eslint-plugin/-/eslint-plugin-1.0.0.tgz", + "integrity": "sha512-YQSFGYrD+eAa2QqdL8v4WAG3yYhcfW3LGlPdNRcjbF1etX0xUfI4isE+U+tYjQuVVzHG4KccRg1F8UuveFVdfg==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "@typescript-eslint/utils": ">= 7.8 || 8.0.0", + "eslint": ">= 8.57.0", + "typescript": ">= 5.0.0", + "vitest": "*" + }, + "peerDependenciesMeta": { + "@typescript-eslint/utils": { + "optional": true + }, + "typescript": { + "optional": true + }, + "vitest": { + "optional": true + } + } + }, "node_modules/@vitest/expect": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.1.tgz", @@ -9311,31 +9335,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint-plugin-vitest": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/eslint-plugin-vitest/-/eslint-plugin-vitest-0.5.4.tgz", - "integrity": "sha512-um+odCkccAHU53WdKAw39MY61+1x990uXjSPguUCq3VcEHdqJrOb8OTMrbYlY6f9jAKx7x98kLVlIe3RJeJqoQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/utils": "^7.7.1" - }, - "engines": { - "node": "^18.0.0 || >= 20.0.0" - }, - "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0", - "vitest": "*" - }, - "peerDependenciesMeta": { - "@typescript-eslint/eslint-plugin": { - "optional": true - }, - "vitest": { - "optional": true - } - } - }, "node_modules/eslint-plugin-vitest-globals": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/eslint-plugin-vitest-globals/-/eslint-plugin-vitest-globals-1.5.0.tgz", diff --git a/package.json b/package.json index 7a7ed6687c..99e014f057 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "eslint-plugin-regexp": "2.6.0", "eslint-plugin-sonarjs": "2.0.2", "eslint-plugin-unicorn": "55.0.0", - "eslint-plugin-vitest": "0.5.4", + "@vitest/eslint-plugin": "1.0.0", "eslint-plugin-vitest-globals": "1.5.0", "eslint-plugin-vue": "9.28.0", "eslint-plugin-vue-scoped-css": "2.8.1", From a8f141f6d13546f716b9eded84f76c2a89bdd09c Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Wed, 25 Sep 2024 08:34:57 +0200 Subject: [PATCH 020/443] chore: migrate eslint config --- .eslintrc.yaml | 100 ++++++++++++++++++++++++------------------------- package.json | 2 +- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/.eslintrc.yaml b/.eslintrc.yaml index 6600ae189b..db85b143dd 100644 --- a/.eslintrc.yaml +++ b/.eslintrc.yaml @@ -13,6 +13,7 @@ parserOptions: plugins: - "@eslint-community/eslint-plugin-eslint-comments" - "@stylistic/eslint-plugin-js" + - "@vitest" - eslint-plugin-array-func - eslint-plugin-github - eslint-plugin-i @@ -21,7 +22,6 @@ plugins: - eslint-plugin-regexp - eslint-plugin-sonarjs - eslint-plugin-unicorn - - eslint-plugin-vitest - eslint-plugin-vitest-globals - eslint-plugin-wc @@ -50,55 +50,55 @@ overrides: env: vitest-globals/env: true rules: - vitest/consistent-test-filename: [0] - vitest/consistent-test-it: [0] - vitest/expect-expect: [0] - vitest/max-expects: [0] - vitest/max-nested-describe: [0] - vitest/no-alias-methods: [0] - vitest/no-commented-out-tests: [0] - vitest/no-conditional-expect: [0] - vitest/no-conditional-in-test: [0] - vitest/no-conditional-tests: [0] - vitest/no-disabled-tests: [0] - vitest/no-done-callback: [0] - vitest/no-duplicate-hooks: [0] - vitest/no-focused-tests: [0] - vitest/no-hooks: [0] - vitest/no-identical-title: [2] - vitest/no-interpolation-in-snapshots: [0] - vitest/no-large-snapshots: [0] - vitest/no-mocks-import: [0] - vitest/no-restricted-matchers: [0] - vitest/no-restricted-vi-methods: [0] - vitest/no-standalone-expect: [0] - vitest/no-test-prefixes: [0] - vitest/no-test-return-statement: [0] - vitest/prefer-called-with: [0] - vitest/prefer-comparison-matcher: [0] - vitest/prefer-each: [0] - vitest/prefer-equality-matcher: [0] - vitest/prefer-expect-resolves: [0] - vitest/prefer-hooks-in-order: [0] - vitest/prefer-hooks-on-top: [2] - vitest/prefer-lowercase-title: [0] - vitest/prefer-mock-promise-shorthand: [0] - vitest/prefer-snapshot-hint: [0] - vitest/prefer-spy-on: [0] - vitest/prefer-strict-equal: [0] - vitest/prefer-to-be: [0] - vitest/prefer-to-be-falsy: [0] - vitest/prefer-to-be-object: [0] - vitest/prefer-to-be-truthy: [0] - vitest/prefer-to-contain: [0] - vitest/prefer-to-have-length: [0] - vitest/prefer-todo: [0] - vitest/require-hook: [0] - vitest/require-to-throw-message: [0] - vitest/require-top-level-describe: [0] - vitest/valid-describe-callback: [2] - vitest/valid-expect: [2] - vitest/valid-title: [2] + "@vitest/consistent-test-filename": [0] + "@vitest/consistent-test-it": [0] + "@vitest/expect-expect": [0] + "@vitest/max-expects": [0] + "@vitest/max-nested-describe": [0] + "@vitest/no-alias-methods": [0] + "@vitest/no-commented-out-tests": [0] + "@vitest/no-conditional-expect": [0] + "@vitest/no-conditional-in-test": [0] + "@vitest/no-conditional-tests": [0] + "@vitest/no-disabled-tests": [0] + "@vitest/no-done-callback": [0] + "@vitest/no-duplicate-hooks": [0] + "@vitest/no-focused-tests": [0] + "@vitest/no-hooks": [0] + "@vitest/no-identical-title": [2] + "@vitest/no-interpolation-in-snapshots": [0] + "@vitest/no-large-snapshots": [0] + "@vitest/no-mocks-import": [0] + "@vitest/no-restricted-matchers": [0] + "@vitest/no-restricted-vi-methods": [0] + "@vitest/no-standalone-expect": [0] + "@vitest/no-test-prefixes": [0] + "@vitest/no-test-return-statement": [0] + "@vitest/prefer-called-with": [0] + "@vitest/prefer-comparison-matcher": [0] + "@vitest/prefer-each": [0] + "@vitest/prefer-equality-matcher": [0] + "@vitest/prefer-expect-resolves": [0] + "@vitest/prefer-hooks-in-order": [0] + "@vitest/prefer-hooks-on-top": [2] + "@vitest/prefer-lowercase-title": [0] + "@vitest/prefer-mock-promise-shorthand": [0] + "@vitest/prefer-snapshot-hint": [0] + "@vitest/prefer-spy-on": [0] + "@vitest/prefer-strict-equal": [0] + "@vitest/prefer-to-be": [0] + "@vitest/prefer-to-be-falsy": [0] + "@vitest/prefer-to-be-object": [0] + "@vitest/prefer-to-be-truthy": [0] + "@vitest/prefer-to-contain": [0] + "@vitest/prefer-to-have-length": [0] + "@vitest/prefer-todo": [0] + "@vitest/require-hook": [0] + "@vitest/require-to-throw-message": [0] + "@vitest/require-top-level-describe": [0] + "@vitest/valid-describe-callback": [2] + "@vitest/valid-expect": [2] + "@vitest/valid-title": [2] - files: ["web_src/js/modules/fetch.js", "web_src/js/standalone/**/*"] rules: no-restricted-syntax: [2, WithStatement, ForInStatement, LabeledStatement, SequenceExpression] diff --git a/package.json b/package.json index 99e014f057..c22a9af1e2 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ "@stylistic/stylelint-plugin": "3.0.1", "@vitejs/plugin-vue": "5.1.3", "@vitest/coverage-v8": "2.1.1", + "@vitest/eslint-plugin": "1.0.0", "@vue/test-utils": "2.4.6", "eslint": "8.57.1", "eslint-plugin-array-func": "4.0.0", @@ -78,7 +79,6 @@ "eslint-plugin-regexp": "2.6.0", "eslint-plugin-sonarjs": "2.0.2", "eslint-plugin-unicorn": "55.0.0", - "@vitest/eslint-plugin": "1.0.0", "eslint-plugin-vitest-globals": "1.5.0", "eslint-plugin-vue": "9.28.0", "eslint-plugin-vue-scoped-css": "2.8.1", From 9f64769b6da33565f0039ca5677420b5942350b8 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 25 Sep 2024 09:35:53 +0200 Subject: [PATCH 021/443] docs: add link to the v9.0.0 release notes --- RELEASE-NOTES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index f86e10c21a..e05288335f 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -6,6 +6,10 @@ A [patch or minor release](https://semver.org/spec/v2.0.0.html) (e.g. upgrading The release notes of each release [are available in the corresponding milestone](https://codeberg.org/forgejo/forgejo/milestones), starting with [Forgejo 7.0.7](https://codeberg.org/forgejo/forgejo/milestone/7683) and [Forgejo 8.0.1](https://codeberg.org/forgejo/forgejo/milestone/7682). +## 9.0.0 + +The Forgejo v9.0.0 release notes are [available in the v9.0.0 milestone](https://codeberg.org/forgejo/forgejo/milestone/7235). + ## 8.0.3 The Forgejo v8.0.3 release notes are [available in the v8.0.3 milestone](https://codeberg.org/forgejo/forgejo/milestone/8231). From c2797ecfc1d9d2e97b03b29b1ce6550e04d1812c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 25 Sep 2024 08:03:04 +0000 Subject: [PATCH 022/443] Update dependency vue to v3.5.8 --- package-lock.json | 108 +++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/package-lock.json b/package-lock.json index 876e6bef7f..d00f0044e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51,7 +51,7 @@ "tributejs": "5.1.3", "uint8-to-base64": "0.2.0", "vanilla-colorful": "0.7.2", - "vue": "3.5.6", + "vue": "3.5.8", "vue-chartjs": "5.3.1", "vue-loader": "17.4.2", "vue3-calendar-heatmap": "2.0.5", @@ -5325,39 +5325,39 @@ } }, "node_modules/@vue/compiler-core": { - "version": "3.5.6", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.6.tgz", - "integrity": "sha512-r+gNu6K4lrvaQLQGmf+1gc41p3FO2OUJyWmNqaIITaJU6YFiV5PtQSFZt8jfztYyARwqhoCayjprC7KMvT3nRA==", + "version": "3.5.8", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.8.tgz", + "integrity": "sha512-Uzlxp91EPjfbpeO5KtC0KnXPkuTfGsNDeaKQJxQN718uz+RqDYarEf7UhQJGK+ZYloD2taUbHTI2J4WrUaZQNA==", "license": "MIT", "dependencies": { "@babel/parser": "^7.25.3", - "@vue/shared": "3.5.6", + "@vue/shared": "3.5.8", "entities": "^4.5.0", "estree-walker": "^2.0.2", "source-map-js": "^1.2.0" } }, "node_modules/@vue/compiler-dom": { - "version": "3.5.6", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.6.tgz", - "integrity": "sha512-xRXqxDrIqK8v8sSScpistyYH0qYqxakpsIvqMD2e5sV/PXQ1mTwtXp4k42yHK06KXxKSmitop9e45Ui/3BrTEw==", + "version": "3.5.8", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.8.tgz", + "integrity": "sha512-GUNHWvoDSbSa5ZSHT9SnV5WkStWfzJwwTd6NMGzilOE/HM5j+9EB9zGXdtu/fCNEmctBqMs6C9SvVPpVPuk1Eg==", "license": "MIT", "dependencies": { - "@vue/compiler-core": "3.5.6", - "@vue/shared": "3.5.6" + "@vue/compiler-core": "3.5.8", + "@vue/shared": "3.5.8" } }, "node_modules/@vue/compiler-sfc": { - "version": "3.5.6", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.6.tgz", - "integrity": "sha512-pjWJ8Kj9TDHlbF5LywjVso+BIxCY5wVOLhkEXRhuCHDxPFIeX1zaFefKs8RYoHvkSMqRWt93a0f2gNJVJixHwg==", + "version": "3.5.8", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.8.tgz", + "integrity": "sha512-taYpngQtSysrvO9GULaOSwcG5q821zCoIQBtQQSx7Uf7DxpR6CIHR90toPr9QfDD2mqHQPCSgoWBvJu0yV9zjg==", "license": "MIT", "dependencies": { "@babel/parser": "^7.25.3", - "@vue/compiler-core": "3.5.6", - "@vue/compiler-dom": "3.5.6", - "@vue/compiler-ssr": "3.5.6", - "@vue/shared": "3.5.6", + "@vue/compiler-core": "3.5.8", + "@vue/compiler-dom": "3.5.8", + "@vue/compiler-ssr": "3.5.8", + "@vue/shared": "3.5.8", "estree-walker": "^2.0.2", "magic-string": "^0.30.11", "postcss": "^8.4.47", @@ -5374,63 +5374,63 @@ } }, "node_modules/@vue/compiler-ssr": { - "version": "3.5.6", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.6.tgz", - "integrity": "sha512-VpWbaZrEOCqnmqjE83xdwegtr5qO/2OPUC6veWgvNqTJ3bYysz6vY3VqMuOijubuUYPRpG3OOKIh9TD0Stxb9A==", + "version": "3.5.8", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.8.tgz", + "integrity": "sha512-W96PtryNsNG9u0ZnN5Q5j27Z/feGrFV6zy9q5tzJVyJaLiwYxvC0ek4IXClZygyhjm+XKM7WD9pdKi/wIRVC/Q==", "license": "MIT", "dependencies": { - "@vue/compiler-dom": "3.5.6", - "@vue/shared": "3.5.6" + "@vue/compiler-dom": "3.5.8", + "@vue/shared": "3.5.8" } }, "node_modules/@vue/reactivity": { - "version": "3.5.6", - "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.6.tgz", - "integrity": "sha512-shZ+KtBoHna5GyUxWfoFVBCVd7k56m6lGhk5e+J9AKjheHF6yob5eukssHRI+rzvHBiU1sWs/1ZhNbLExc5oYQ==", + "version": "3.5.8", + "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.8.tgz", + "integrity": "sha512-mlgUyFHLCUZcAYkqvzYnlBRCh0t5ZQfLYit7nukn1GR96gc48Bp4B7OIcSfVSvlG1k3BPfD+p22gi1t2n9tsXg==", "license": "MIT", "dependencies": { - "@vue/shared": "3.5.6" + "@vue/shared": "3.5.8" } }, "node_modules/@vue/runtime-core": { - "version": "3.5.6", - "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.6.tgz", - "integrity": "sha512-FpFULR6+c2lI+m1fIGONLDqPQO34jxV8g6A4wBOgne8eSRHP6PQL27+kWFIx5wNhhjkO7B4rgtsHAmWv7qKvbg==", + "version": "3.5.8", + "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.8.tgz", + "integrity": "sha512-fJuPelh64agZ8vKkZgp5iCkPaEqFJsYzxLk9vSC0X3G8ppknclNDr61gDc45yBGTaN5Xqc1qZWU3/NoaBMHcjQ==", "license": "MIT", "dependencies": { - "@vue/reactivity": "3.5.6", - "@vue/shared": "3.5.6" + "@vue/reactivity": "3.5.8", + "@vue/shared": "3.5.8" } }, "node_modules/@vue/runtime-dom": { - "version": "3.5.6", - "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.6.tgz", - "integrity": "sha512-SDPseWre45G38ENH2zXRAHL1dw/rr5qp91lS4lt/nHvMr0MhsbCbihGAWLXNB/6VfFOJe2O+RBRkXU+CJF7/sw==", + "version": "3.5.8", + "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.8.tgz", + "integrity": "sha512-DpAUz+PKjTZPUOB6zJgkxVI3GuYc2iWZiNeeHQUw53kdrparSTG6HeXUrYDjaam8dVsCdvQxDz6ZWxnyjccUjQ==", "license": "MIT", "dependencies": { - "@vue/reactivity": "3.5.6", - "@vue/runtime-core": "3.5.6", - "@vue/shared": "3.5.6", + "@vue/reactivity": "3.5.8", + "@vue/runtime-core": "3.5.8", + "@vue/shared": "3.5.8", "csstype": "^3.1.3" } }, "node_modules/@vue/server-renderer": { - "version": "3.5.6", - "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.6.tgz", - "integrity": "sha512-zivnxQnOnwEXVaT9CstJ64rZFXMS5ZkKxCjDQKiMSvUhXRzFLWZVbaBiNF4HGDqGNNsTgmjcCSmU6TB/0OOxLA==", + "version": "3.5.8", + "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.8.tgz", + "integrity": "sha512-7AmC9/mEeV9mmXNVyUIm1a1AjUhyeeGNbkLh39J00E7iPeGks8OGRB5blJiMmvqSh8SkaS7jkLWSpXtxUCeagA==", "license": "MIT", "dependencies": { - "@vue/compiler-ssr": "3.5.6", - "@vue/shared": "3.5.6" + "@vue/compiler-ssr": "3.5.8", + "@vue/shared": "3.5.8" }, "peerDependencies": { - "vue": "3.5.6" + "vue": "3.5.8" } }, "node_modules/@vue/shared": { - "version": "3.5.6", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.6.tgz", - "integrity": "sha512-eidH0HInnL39z6wAt6SFIwBrvGOpDWsDxlw3rCgo1B+CQ1781WzQUSU3YjxgdkcJo9Q8S6LmXTkvI+cLHGkQfA==", + "version": "3.5.8", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.8.tgz", + "integrity": "sha512-mJleSWbAGySd2RJdX1RBtcrUBX6snyOc0qHpgk3lGi4l9/P/3ny3ELqFWqYdkXIwwNN/kdm8nD9ky8o6l/Lx2A==", "license": "MIT" }, "node_modules/@vue/test-utils": { @@ -16343,16 +16343,16 @@ "license": "MIT" }, "node_modules/vue": { - "version": "3.5.6", - "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.6.tgz", - "integrity": "sha512-zv+20E2VIYbcJOzJPUWp03NOGFhMmpCKOfSxVTmCYyYFFko48H9tmuQFzYj7tu4qX1AeXlp9DmhIP89/sSxxhw==", + "version": "3.5.8", + "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.8.tgz", + "integrity": "sha512-hvuvuCy51nP/1fSRvrrIqTLSvrSyz2Pq+KQ8S8SXCxTWVE0nMaOnSDnSOxV1eYmGfvK7mqiwvd1C59CEEz7dAQ==", "license": "MIT", "dependencies": { - "@vue/compiler-dom": "3.5.6", - "@vue/compiler-sfc": "3.5.6", - "@vue/runtime-dom": "3.5.6", - "@vue/server-renderer": "3.5.6", - "@vue/shared": "3.5.6" + "@vue/compiler-dom": "3.5.8", + "@vue/compiler-sfc": "3.5.8", + "@vue/runtime-dom": "3.5.8", + "@vue/server-renderer": "3.5.8", + "@vue/shared": "3.5.8" }, "peerDependencies": { "typescript": "*" diff --git a/package.json b/package.json index c22a9af1e2..fd083ea6f4 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "tributejs": "5.1.3", "uint8-to-base64": "0.2.0", "vanilla-colorful": "0.7.2", - "vue": "3.5.6", + "vue": "3.5.8", "vue-chartjs": "5.3.1", "vue-loader": "17.4.2", "vue3-calendar-heatmap": "2.0.5", From 69b01eb911b18002d78332125aca2ac3f9d5bea7 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 16 Sep 2024 02:03:29 +0000 Subject: [PATCH 023/443] Lock file maintenance --- package-lock.json | 1614 +++++++++++++--------------- poetry.lock | 191 ++-- web_src/fomantic/package-lock.json | 73 +- 3 files changed, 881 insertions(+), 997 deletions(-) diff --git a/package-lock.json b/package-lock.json index 876e6bef7f..e3d759c01f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -275,13 +275,13 @@ } }, "node_modules/@babel/generator": { - "version": "7.25.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.5.tgz", - "integrity": "sha512-abd43wyLfbWoxC6ahM8xTkqLpGB2iWBVyuKC9/srhFunCd1SDNrV1s72bBpK4hLj8KLzHBBcOblvLQZBNw9r3w==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz", + "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.25.4", + "@babel/types": "^7.25.6", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^2.5.1" @@ -290,19 +290,6 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/generator/node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true, - "license": "MIT", - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/@babel/helper-annotate-as-pure": { "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz", @@ -347,16 +334,6 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^3.0.2" - } - }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -622,14 +599,14 @@ } }, "node_modules/@babel/helpers": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.0.tgz", - "integrity": "sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz", + "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==", "dev": true, "license": "MIT", "dependencies": { "@babel/template": "^7.25.0", - "@babel/types": "^7.25.0" + "@babel/types": "^7.25.6" }, "engines": { "node": ">=6.9.0" @@ -709,12 +686,6 @@ "node": ">=4" } }, - "node_modules/@babel/highlight/node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "license": "MIT" - }, "node_modules/@babel/highlight/node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -728,12 +699,12 @@ } }, "node_modules/@babel/parser": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.4.tgz", - "integrity": "sha512-nq+eWrOgdtu3jG5Os4TQP3x3cLA8hR8TvJNjD8vnPa20WGycimcparWnLK4jJhElTK6SDyuJo1weMKO/5LpmLA==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz", + "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==", "license": "MIT", "dependencies": { - "@babel/types": "^7.25.4" + "@babel/types": "^7.25.6" }, "bin": { "parser": "bin/babel-parser.js" @@ -925,13 +896,13 @@ } }, "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz", - "integrity": "sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.6.tgz", + "integrity": "sha512-aABl0jHw9bZ2karQ/uUD6XP4u0SG22SJrOHFoL6XB1R7dTovOP4TzTlsxOYC5yQ1pdscVK2JTUnF6QL3ARoAiQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -941,13 +912,13 @@ } }, "node_modules/@babel/plugin-syntax-import-attributes": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz", - "integrity": "sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.6.tgz", + "integrity": "sha512-sXaDXaJN9SNLymBdlWFA+bjzBhFD617ZaFiY13dGt7TVslVvVgA6fkZOP7Ki3IGElC45lwHdOTrCtKZGVAWeLQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -2205,9 +2176,9 @@ "license": "MIT" }, "node_modules/@babel/runtime": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.0.tgz", - "integrity": "sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz", + "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==", "license": "MIT", "dependencies": { "regenerator-runtime": "^0.14.0" @@ -2232,17 +2203,17 @@ } }, "node_modules/@babel/traverse": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.4.tgz", - "integrity": "sha512-VJ4XsrD+nOvlXyLzmLzUs/0qjFS4sK30te5yEFlvbbUNEgKaVb2BHZUpAL+ttLPQAHNrsI3zZisbfha5Cvr8vg==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz", + "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.25.4", - "@babel/parser": "^7.25.4", + "@babel/generator": "^7.25.6", + "@babel/parser": "^7.25.6", "@babel/template": "^7.25.0", - "@babel/types": "^7.25.4", + "@babel/types": "^7.25.6", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -2261,9 +2232,9 @@ } }, "node_modules/@babel/types": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.4.tgz", - "integrity": "sha512-zQ1ijeeCXVEh+aNL0RlmkPkG8HUiDcU2pzQQFjtbntgAczRASFzj4H+6+bV+dy1ntKR14I/DypeuRG1uma98iQ==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz", + "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==", "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.24.8", @@ -3263,9 +3234,9 @@ } }, "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "license": "MIT", "engines": { "node": ">=12" @@ -3690,9 +3661,9 @@ "license": "MIT" }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.0.tgz", - "integrity": "sha512-WTWD8PfoSAJ+qL87lE7votj3syLavxunWhzCnx3XFxFiI/BA/r3X7MUM8dVrH8rb2r4AiO8jJsr3ZjdaftmnfA==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.3.tgz", + "integrity": "sha512-MmKSfaB9GX+zXl6E8z4koOr/xU63AMVleLEa64v7R0QF/ZloMs5vcD1sHgM64GXXS1csaJutG+ddtzcueI/BLg==", "cpu": [ "arm" ], @@ -3704,9 +3675,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.0.tgz", - "integrity": "sha512-a1sR2zSK1B4eYkiZu17ZUZhmUQcKjk2/j9Me2IDjk1GHW7LB5Z35LEzj9iJch6gtUfsnvZs1ZNyDW2oZSThrkA==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.3.tgz", + "integrity": "sha512-zrt8ecH07PE3sB4jPOggweBjJMzI1JG5xI2DIsUbkA+7K+Gkjys6eV7i9pOenNSDJH3eOr/jLb/PzqtmdwDq5g==", "cpu": [ "arm64" ], @@ -3718,9 +3689,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.0.tgz", - "integrity": "sha512-zOnKWLgDld/svhKO5PD9ozmL6roy5OQ5T4ThvdYZLpiOhEGY+dp2NwUmxK0Ld91LrbjrvtNAE0ERBwjqhZTRAA==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.3.tgz", + "integrity": "sha512-P0UxIOrKNBFTQaXTxOH4RxuEBVCgEA5UTNV6Yz7z9QHnUJ7eLX9reOd/NYMO3+XZO2cco19mXTxDMXxit4R/eQ==", "cpu": [ "arm64" ], @@ -3732,9 +3703,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.0.tgz", - "integrity": "sha512-7doS8br0xAkg48SKE2QNtMSFPFUlRdw9+votl27MvT46vo44ATBmdZdGysOevNELmZlfd+NEa0UYOA8f01WSrg==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.3.tgz", + "integrity": "sha512-L1M0vKGO5ASKntqtsFEjTq/fD91vAqnzeaF6sfNAy55aD+Hi2pBI5DKwCO+UNDQHWsDViJLqshxOahXyLSh3EA==", "cpu": [ "x64" ], @@ -3746,9 +3717,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.0.tgz", - "integrity": "sha512-pWJsfQjNWNGsoCq53KjMtwdJDmh/6NubwQcz52aEwLEuvx08bzcy6tOUuawAOncPnxz/3siRtd8hiQ32G1y8VA==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.3.tgz", + "integrity": "sha512-btVgIsCjuYFKUjopPoWiDqmoUXQDiW2A4C3Mtmp5vACm7/GnyuprqIDPNczeyR5W8rTXEbkmrJux7cJmD99D2g==", "cpu": [ "arm" ], @@ -3760,9 +3731,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.0.tgz", - "integrity": "sha512-efRIANsz3UHZrnZXuEvxS9LoCOWMGD1rweciD6uJQIx2myN3a8Im1FafZBzh7zk1RJ6oKcR16dU3UPldaKd83w==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.3.tgz", + "integrity": "sha512-zmjbSphplZlau6ZTkxd3+NMtE4UKVy7U4aVFMmHcgO5CUbw17ZP6QCgyxhzGaU/wFFdTfiojjbLG3/0p9HhAqA==", "cpu": [ "arm" ], @@ -3774,9 +3745,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.0.tgz", - "integrity": "sha512-ZrPhydkTVhyeGTW94WJ8pnl1uroqVHM3j3hjdquwAcWnmivjAwOYjTEAuEDeJvGX7xv3Z9GAvrBkEzCgHq9U1w==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.3.tgz", + "integrity": "sha512-nSZfcZtAnQPRZmUkUQwZq2OjQciR6tEoJaZVFvLHsj0MF6QhNMg0fQ6mUOsiCUpTqxTx0/O6gX0V/nYc7LrgPw==", "cpu": [ "arm64" ], @@ -3788,9 +3759,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.0.tgz", - "integrity": "sha512-cfaupqd+UEFeURmqNP2eEvXqgbSox/LHOyN9/d2pSdV8xTrjdg3NgOFJCtc1vQ/jEke1qD0IejbBfxleBPHnPw==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.3.tgz", + "integrity": "sha512-MnvSPGO8KJXIMGlQDYfvYS3IosFN2rKsvxRpPO2l2cum+Z3exiExLwVU+GExL96pn8IP+GdH8Tz70EpBhO0sIQ==", "cpu": [ "arm64" ], @@ -3802,9 +3773,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.0.tgz", - "integrity": "sha512-ZKPan1/RvAhrUylwBXC9t7B2hXdpb/ufeu22pG2psV7RN8roOfGurEghw1ySmX/CmDDHNTDDjY3lo9hRlgtaHg==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.3.tgz", + "integrity": "sha512-+W+p/9QNDr2vE2AXU0qIy0qQE75E8RTwTwgqS2G5CRQ11vzq0tbnfBd6brWhS9bCRjAjepJe2fvvkvS3dno+iw==", "cpu": [ "ppc64" ], @@ -3816,9 +3787,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.0.tgz", - "integrity": "sha512-H1eRaCwd5E8eS8leiS+o/NqMdljkcb1d6r2h4fKSsCXQilLKArq6WS7XBLDu80Yz+nMqHVFDquwcVrQmGr28rg==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.3.tgz", + "integrity": "sha512-yXH6K6KfqGXaxHrtr+Uoy+JpNlUlI46BKVyonGiaD74ravdnF9BUNC+vV+SIuB96hUMGShhKV693rF9QDfO6nQ==", "cpu": [ "riscv64" ], @@ -3830,9 +3801,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.0.tgz", - "integrity": "sha512-zJ4hA+3b5tu8u7L58CCSI0A9N1vkfwPhWd/puGXwtZlsB5bTkwDNW/+JCU84+3QYmKpLi+XvHdmrlwUwDA6kqw==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.3.tgz", + "integrity": "sha512-R8cwY9wcnApN/KDYWTH4gV/ypvy9yZUHlbJvfaiXSB48JO3KpwSpjOGqO4jnGkLDSk1hgjYkTbTt6Q7uvPf8eg==", "cpu": [ "s390x" ], @@ -3844,9 +3815,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.0.tgz", - "integrity": "sha512-e2hrvElFIh6kW/UNBQK/kzqMNY5mO+67YtEh9OA65RM5IJXYTWiXjX6fjIiPaqOkBthYF1EqgiZ6OXKcQsM0hg==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.3.tgz", + "integrity": "sha512-kZPbX/NOPh0vhS5sI+dR8L1bU2cSO9FgxwM8r7wHzGydzfSjLRCFAT87GR5U9scj2rhzN3JPYVC7NoBbl4FZ0g==", "cpu": [ "x64" ], @@ -3858,9 +3829,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.0.tgz", - "integrity": "sha512-1vvmgDdUSebVGXWX2lIcgRebqfQSff0hMEkLJyakQ9JQUbLDkEaMsPTLOmyccyC6IJ/l3FZuJbmrBw/u0A0uCQ==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.3.tgz", + "integrity": "sha512-S0Yq+xA1VEH66uiMNhijsWAafffydd2X5b77eLHfRmfLsRSpbiAWiRHV6DEpz6aOToPsgid7TI9rGd6zB1rhbg==", "cpu": [ "x64" ], @@ -3872,9 +3843,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.0.tgz", - "integrity": "sha512-s5oFkZ/hFcrlAyBTONFY1TWndfyre1wOMwU+6KCpm/iatybvrRgmZVM+vCFwxmC5ZhdlgfE0N4XorsDpi7/4XQ==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.3.tgz", + "integrity": "sha512-9isNzeL34yquCPyerog+IMCNxKR8XYmGd0tHSV+OVx0TmE0aJOo9uw4fZfUuk2qxobP5sug6vNdZR6u7Mw7Q+Q==", "cpu": [ "arm64" ], @@ -3886,9 +3857,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.0.tgz", - "integrity": "sha512-G9+TEqRnAA6nbpqyUqgTiopmnfgnMkR3kMukFBDsiyy23LZvUCpiUwjTRx6ezYCjJODXrh52rBR9oXvm+Fp5wg==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.3.tgz", + "integrity": "sha512-nMIdKnfZfzn1Vsk+RuOvl43ONTZXoAPUUxgcU0tXooqg4YrAqzfKzVenqqk2g5efWh46/D28cKFrOzDSW28gTA==", "cpu": [ "ia32" ], @@ -3900,9 +3871,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.0.tgz", - "integrity": "sha512-2jsCDZwtQvRhejHLfZ1JY6w6kEuEtfF9nzYsZxzSlNVKDX+DpsDJ+Rbjkm74nvg2rdx0gwBS+IMdvwJuq3S9pQ==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.3.tgz", + "integrity": "sha512-fOvu7PCQjAj4eWDEuD8Xz5gpzFqXzGlxHZozHP4b9Jxv9APtdxL6STqztDzMLuRXEc4UpXGGhx029Xgm91QBeA==", "cpu": [ "x64" ], @@ -3913,6 +3884,13 @@ "win32" ] }, + "node_modules/@rtsao/scc": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz", + "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==", + "dev": true, + "license": "MIT" + }, "node_modules/@stoplight/better-ajv-errors": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@stoplight/better-ajv-errors/-/better-ajv-errors-1.0.3.tgz", @@ -3931,9 +3909,9 @@ } }, "node_modules/@stoplight/json": { - "version": "3.21.6", - "resolved": "https://registry.npmjs.org/@stoplight/json/-/json-3.21.6.tgz", - "integrity": "sha512-KGisXfNigoYdWIj1jA4p3IAAIW5YFpU9BdoECdjyDLBbhWGGHzs77e0STSCBmXQ/K3ApxfED2R7mQ79ymjzlvQ==", + "version": "3.21.7", + "resolved": "https://registry.npmjs.org/@stoplight/json/-/json-3.21.7.tgz", + "integrity": "sha512-xcJXgKFqv/uCEgtGlPxy3tPA+4I+ZI4vAuMJ885+ThkTHFVkC+0Fm58lA9NlsyjnkpxFh4YiQWpH+KefHdbA0A==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -4076,9 +4054,9 @@ } }, "node_modules/@stoplight/spectral-core": { - "version": "1.18.3", - "resolved": "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.18.3.tgz", - "integrity": "sha512-YY8x7X2SWJIhGTLPol+eFiQpWPz0D0mJdkK2i4A0QJG68KkNhypP6+JBC7/Kz3XWjqr0L/RqAd+N5cQLPOKZGQ==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.19.1.tgz", + "integrity": "sha512-YiWhXdjyjn4vCl3102ywzwCEJzncxapFcj4dxcj1YP/bZ62DFeGJ8cEaMP164vSw2kI3rX7EMMzI/c8XOUnTfQ==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -4086,12 +4064,12 @@ "@stoplight/json": "~3.21.0", "@stoplight/path": "1.3.2", "@stoplight/spectral-parsers": "^1.0.0", - "@stoplight/spectral-ref-resolver": "^1.0.0", + "@stoplight/spectral-ref-resolver": "^1.0.4", "@stoplight/spectral-runtime": "^1.0.0", "@stoplight/types": "~13.6.0", "@types/es-aggregate-error": "^1.0.2", "@types/json-schema": "^7.0.11", - "ajv": "^8.6.0", + "ajv": "^8.17.1", "ajv-errors": "~3.0.0", "ajv-formats": "~2.1.0", "es-aggregate-error": "^1.0.7", @@ -4163,9 +4141,9 @@ } }, "node_modules/@stoplight/spectral-formatters": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@stoplight/spectral-formatters/-/spectral-formatters-1.3.0.tgz", - "integrity": "sha512-ryuMwlzbPUuyn7ybSEbFYsljYmvTaTyD51wyCQs4ROzgfm3Yo5QDD0IsiJUzUpKK/Ml61ZX8ebgiPiRFEJtBpg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@stoplight/spectral-formatters/-/spectral-formatters-1.4.0.tgz", + "integrity": "sha512-nxYQldDzVg32pxQ4cMX27eMtB1A39ea+GSf0wIJ20mqkSBfIgLnRZ+GKkBxhgF9JzSolc4YtweydsubGQGd7ag==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -4173,9 +4151,11 @@ "@stoplight/spectral-core": "^1.15.1", "@stoplight/spectral-runtime": "^1.1.0", "@stoplight/types": "^13.15.0", + "@types/markdown-escape": "^1.1.3", "chalk": "4.1.2", "cliui": "7.0.4", "lodash": "^4.17.21", + "markdown-escape": "^2.0.0", "node-sarif-builder": "^2.0.3", "strip-ansi": "6.0", "text-table": "^0.2.0", @@ -4186,18 +4166,18 @@ } }, "node_modules/@stoplight/spectral-functions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@stoplight/spectral-functions/-/spectral-functions-1.8.0.tgz", - "integrity": "sha512-ZrAkYA/ZGbuQ6EyG1gisF4yQ5nWP/+glcqVoGmS6kH6ekaynz2Yp6FL0oIamWj3rWedFUN7ppwTRUdo+9f/uCw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@stoplight/spectral-functions/-/spectral-functions-1.9.0.tgz", + "integrity": "sha512-T+xl93ji8bpus4wUsTq8Qr2DSu2X9PO727rbxW61tTCG0s17CbsXOLYI+Ezjg5P6aaQlgXszGX8khtc57xk8Yw==", "dev": true, "license": "Apache-2.0", "dependencies": { "@stoplight/better-ajv-errors": "1.0.3", "@stoplight/json": "^3.17.1", "@stoplight/spectral-core": "^1.7.0", - "@stoplight/spectral-formats": "^1.0.0", + "@stoplight/spectral-formats": "^1.7.0", "@stoplight/spectral-runtime": "^1.1.0", - "ajv": "^8.6.3", + "ajv": "^8.17.1", "ajv-draft-04": "~1.0.0", "ajv-errors": "~3.0.0", "ajv-formats": "~2.1.0", @@ -4333,9 +4313,9 @@ "license": "Apache-2.0" }, "node_modules/@stoplight/spectral-rulesets": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.19.1.tgz", - "integrity": "sha512-rfGK87Y1JJCEeLC8MVdLkjUkRH+Y6VnSF388D+UWihfU9xuq2eNB9phWpTFkG+AG4HLRyGx963BmO6PyM9dBag==", + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.20.1.tgz", + "integrity": "sha512-LrJ9lm/Jy9uUrPyBVO03zOkRVRVB2EfzrbtMegTiGs6ju02YGH/0mPu0DKJy+749aKGiSjpXTiLZgsbDJniEew==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -4343,12 +4323,12 @@ "@stoplight/better-ajv-errors": "1.0.3", "@stoplight/json": "^3.17.0", "@stoplight/spectral-core": "^1.8.1", - "@stoplight/spectral-formats": "^1.5.0", + "@stoplight/spectral-formats": "^1.7.0", "@stoplight/spectral-functions": "^1.5.1", "@stoplight/spectral-runtime": "^1.1.1", "@stoplight/types": "^13.6.0", "@types/json-schema": "^7.0.7", - "ajv": "^8.12.0", + "ajv": "^8.17.1", "ajv-formats": "~2.1.0", "json-schema-traverse": "^1.0.0", "leven": "3.1.0", @@ -4518,19 +4498,6 @@ "@types/node": "*" } }, - "node_modules/@types/eslint": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", - "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, "node_modules/@types/estree": { "version": "0.0.39", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", @@ -4550,6 +4517,13 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/markdown-escape": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@types/markdown-escape/-/markdown-escape-1.1.3.tgz", + "integrity": "sha512-JIc1+s3y5ujKnt/+N+wq6s/QdL2qZ11fP79MijrVXsAAnzSxCbT2j/3prHRouJdZ2yFLN3vkP0HytfnoCczjOw==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/marked": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.3.2.tgz", @@ -4557,9 +4531,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.4.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.4.0.tgz", - "integrity": "sha512-49AbMDwYUz7EXxKU/r7mXOsxwFr4BYbvB7tWYxVuLdb2ibd30ijjXINSMAHiEEZk5PCRBmW1gUeisn2VMKt3cQ==", + "version": "22.5.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.5.tgz", + "integrity": "sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==", "license": "MIT", "dependencies": { "undici-types": "~6.19.2" @@ -4596,32 +4570,32 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.16.1.tgz", - "integrity": "sha512-SxdPak/5bO0EnGktV05+Hq8oatjAYVY3Zh2bye9pGZy6+jwyR3LG3YKkV4YatlsgqXP28BTeVm9pqwJM96vf2A==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.5.0.tgz", + "integrity": "sha512-lHS5hvz33iUFQKuPFGheAB84LwcJ60G8vKnEhnfcK1l8kGVLro2SFYW6K0/tj8FUhRJ0VHyg1oAfg50QGbPPHw==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "7.16.1", - "@typescript-eslint/type-utils": "7.16.1", - "@typescript-eslint/utils": "7.16.1", - "@typescript-eslint/visitor-keys": "7.16.1", + "@typescript-eslint/scope-manager": "8.5.0", + "@typescript-eslint/type-utils": "8.5.0", + "@typescript-eslint/utils": "8.5.0", + "@typescript-eslint/visitor-keys": "8.5.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", "ts-api-utils": "^1.3.0" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^7.0.0", - "eslint": "^8.56.0" + "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", + "eslint": "^8.57.0 || ^9.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -4629,92 +4603,28 @@ } } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.16.1.tgz", - "integrity": "sha512-nYpyv6ALte18gbMz323RM+vpFpTjfNdyakbf3nsLvF43uF9KeNC289SUEW3QLZ1xPtyINJ1dIsZOuWuSRIWygw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "7.16.1", - "@typescript-eslint/visitor-keys": "7.16.1" - }, - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.16.1.tgz", - "integrity": "sha512-AQn9XqCzUXd4bAVEsAXM/Izk11Wx2u4H3BAfQVhSfzfDOm/wAON9nP7J5rpkCxts7E5TELmN845xTUCQrD1xIQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.16.1.tgz", - "integrity": "sha512-Qlzzx4sE4u3FsHTPQAAQFJFNOuqtuY0LFrZHwQ8IHK705XxBiWOFkfKRWu6niB7hwfgnwIpO4jTC75ozW1PHWg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "7.16.1", - "eslint-visitor-keys": "^3.4.3" - }, - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/@typescript-eslint/parser": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz", - "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.5.0.tgz", + "integrity": "sha512-gF77eNv0Xz2UJg/NbpWJ0kqAm35UMsvZf1GHj8D9MRFTj/V3tAciIWXfmPLsAAF/vUlpWPvUDyH1jjsr0cMVWw==", "dev": true, "license": "BSD-2-Clause", - "peer": true, "dependencies": { - "@typescript-eslint/scope-manager": "7.18.0", - "@typescript-eslint/types": "7.18.0", - "@typescript-eslint/typescript-estree": "7.18.0", - "@typescript-eslint/visitor-keys": "7.18.0", + "@typescript-eslint/scope-manager": "8.5.0", + "@typescript-eslint/types": "8.5.0", + "@typescript-eslint/typescript-estree": "8.5.0", + "@typescript-eslint/visitor-keys": "8.5.0", "debug": "^4.3.4" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^8.56.0" + "eslint": "^8.57.0 || ^9.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -4723,18 +4633,17 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz", - "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.5.0.tgz", + "integrity": "sha512-06JOQ9Qgj33yvBEx6tpC8ecP9o860rsR22hWMEd12WcTRrfaFgHr2RB/CA/B+7BMhHkXT4chg2MyboGdFGawYg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "@typescript-eslint/types": "7.18.0", - "@typescript-eslint/visitor-keys": "7.18.0" + "@typescript-eslint/types": "8.5.0", + "@typescript-eslint/visitor-keys": "8.5.0" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -4742,65 +4651,19 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.16.1.tgz", - "integrity": "sha512-rbu/H2MWXN4SkjIIyWcmYBjlp55VT+1G3duFOIukTNFxr9PI35pLc2ydwAfejCEitCv4uztA07q0QWanOHC7dA==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.5.0.tgz", + "integrity": "sha512-N1K8Ix+lUM+cIDhL2uekVn/ZD7TZW+9/rwz8DclQpcQ9rk4sIL5CAlBC0CugWKREmDjBzI/kQqU4wkg46jWLYA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "7.16.1", - "@typescript-eslint/utils": "7.16.1", + "@typescript-eslint/typescript-estree": "8.5.0", + "@typescript-eslint/utils": "8.5.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.56.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.16.1.tgz", - "integrity": "sha512-AQn9XqCzUXd4bAVEsAXM/Izk11Wx2u4H3BAfQVhSfzfDOm/wAON9nP7J5rpkCxts7E5TELmN845xTUCQrD1xIQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.16.1.tgz", - "integrity": "sha512-0vFPk8tMjj6apaAZ1HlwM8w7jbghC8jc1aRNJG5vN8Ym5miyhTQGMqU++kuBFDNKe9NcPeZ6x0zfSzV8xC1UlQ==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "@typescript-eslint/types": "7.16.1", - "@typescript-eslint/visitor-keys": "7.16.1", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "minimatch": "^9.0.4", - "semver": "^7.6.0", - "ts-api-utils": "^1.3.0" - }, - "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -4812,62 +4675,14 @@ } } }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.16.1.tgz", - "integrity": "sha512-Qlzzx4sE4u3FsHTPQAAQFJFNOuqtuY0LFrZHwQ8IHK705XxBiWOFkfKRWu6niB7hwfgnwIpO4jTC75ozW1PHWg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "7.16.1", - "eslint-visitor-keys": "^3.4.3" - }, - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/@typescript-eslint/types": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz", - "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.5.0.tgz", + "integrity": "sha512-qjkormnQS5wF9pjSi6q60bKUHH44j2APxfh9TQRXK8wbYVeDYYdYJGIROL87LGZZ2gz3Rbmjc736qyL8deVtdw==", "dev": true, "license": "MIT", - "peer": true, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -4875,24 +4690,23 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz", - "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.5.0.tgz", + "integrity": "sha512-vEG2Sf9P8BPQ+d0pxdfndw3xIXaoSjliG0/Ejk7UggByZPKXmJmw3GW5jV2gHNQNawBUyfahoSiCFVov0Ruf7Q==", "dev": true, "license": "BSD-2-Clause", - "peer": true, "dependencies": { - "@typescript-eslint/types": "7.18.0", - "@typescript-eslint/visitor-keys": "7.18.0", + "@typescript-eslint/types": "8.5.0", + "@typescript-eslint/visitor-keys": "8.5.0", "debug": "^4.3.4", - "globby": "^11.1.0", + "fast-glob": "^3.3.2", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", "ts-api-utils": "^1.3.0" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -4910,7 +4724,6 @@ "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dev": true, "license": "ISC", - "peer": true, "dependencies": { "brace-expansion": "^2.0.1" }, @@ -4922,149 +4735,40 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.16.1.tgz", - "integrity": "sha512-WrFM8nzCowV0he0RlkotGDujx78xudsxnGMBHI88l5J8wEhED6yBwaSLP99ygfrzAjsQvcYQ94quDwI0d7E1fA==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.5.0.tgz", + "integrity": "sha512-6yyGYVL0e+VzGYp60wvkBHiqDWOpT63pdMV2CVG4LVDd5uR6q1qQN/7LafBZtAtNIn/mqXjsSeS5ggv/P0iECw==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "7.16.1", - "@typescript-eslint/types": "7.16.1", - "@typescript-eslint/typescript-estree": "7.16.1" + "@typescript-eslint/scope-manager": "8.5.0", + "@typescript-eslint/types": "8.5.0", + "@typescript-eslint/typescript-estree": "8.5.0" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^8.56.0" - } - }, - "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.16.1.tgz", - "integrity": "sha512-nYpyv6ALte18gbMz323RM+vpFpTjfNdyakbf3nsLvF43uF9KeNC289SUEW3QLZ1xPtyINJ1dIsZOuWuSRIWygw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "7.16.1", - "@typescript-eslint/visitor-keys": "7.16.1" - }, - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.16.1.tgz", - "integrity": "sha512-AQn9XqCzUXd4bAVEsAXM/Izk11Wx2u4H3BAfQVhSfzfDOm/wAON9nP7J5rpkCxts7E5TELmN845xTUCQrD1xIQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.16.1.tgz", - "integrity": "sha512-0vFPk8tMjj6apaAZ1HlwM8w7jbghC8jc1aRNJG5vN8Ym5miyhTQGMqU++kuBFDNKe9NcPeZ6x0zfSzV8xC1UlQ==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "@typescript-eslint/types": "7.16.1", - "@typescript-eslint/visitor-keys": "7.16.1", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "minimatch": "^9.0.4", - "semver": "^7.6.0", - "ts-api-utils": "^1.3.0" - }, - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.16.1.tgz", - "integrity": "sha512-Qlzzx4sE4u3FsHTPQAAQFJFNOuqtuY0LFrZHwQ8IHK705XxBiWOFkfKRWu6niB7hwfgnwIpO4jTC75ozW1PHWg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "7.16.1", - "eslint-visitor-keys": "^3.4.3" - }, - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/utils/node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@typescript-eslint/utils/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "eslint": "^8.57.0 || ^9.0.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz", - "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.5.0.tgz", + "integrity": "sha512-yTPqMnbAZJNy2Xq2XU8AdtOW9tJIr+UQb64aXB9f3B1498Zx9JorVgFJcZpEc9UBuCCrdzKID2RGAMkYcDtZOw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "@typescript-eslint/types": "7.18.0", + "@typescript-eslint/types": "8.5.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -5077,7 +4781,6 @@ "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, "license": "Apache-2.0", - "peer": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -5835,13 +5538,13 @@ "license": "Python-2.0" }, "node_modules/aria-query": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", - "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.1.tgz", + "integrity": "sha512-Z/ZeOgVl7bcSYZ/u/rh0fOpvEpq//LZmdbkXyc7syVzjPAhfOa9ebsdTSjEBDU4vs5nC98Kfduj1uFo0qyET3g==", "dev": true, "license": "Apache-2.0", - "dependencies": { - "dequal": "^2.0.3" + "engines": { + "node": ">= 0.4" } }, "node_modules/array-buffer-byte-length": { @@ -6083,9 +5786,9 @@ } }, "node_modules/astring": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/astring/-/astring-1.8.6.tgz", - "integrity": "sha512-ISvCdHdlTDlH5IpxQJIex7BWBywFWgjJSVdwst+/iQCoEYnyOaQ95+X1JGshuBjGp6nxKUy1jMgE3zPqN7fQdg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/astring/-/astring-1.9.0.tgz", + "integrity": "sha512-LElXdjswlqjWrPpJFg1Fx4wpkOCxj1TDHlSV4PlaRxHGWko024xICaa97ZkMfs6DRKlCguiAI+rbXv5GWwXIkg==", "dev": true, "license": "MIT", "bin": { @@ -6132,13 +5835,13 @@ } }, "node_modules/axobject-query": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz", - "integrity": "sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz", + "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==", "dev": true, "license": "Apache-2.0", - "dependencies": { - "deep-equal": "^2.0.5" + "engines": { + "node": ">= 0.4" } }, "node_modules/babel-plugin-polyfill-corejs2": { @@ -6409,9 +6112,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001651", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz", - "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==", + "version": "1.0.30001660", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz", + "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==", "funding": [ { "type": "opencollective", @@ -6784,9 +6487,9 @@ "license": "MIT" }, "node_modules/core-js-compat": { - "version": "3.38.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.0.tgz", - "integrity": "sha512-75LAicdLa4OJVwFxFbQR3NdnZjNgX6ILpVcVzcC4T2smerB5lELMrJQQQoWV6TiuC/vlaFqgU2tKQx9w5s0e0A==", + "version": "3.38.1", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz", + "integrity": "sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==", "dev": true, "license": "MIT", "dependencies": { @@ -7578,12 +7281,12 @@ "license": "MIT" }, "node_modules/debug": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", - "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "license": "MIT", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -7719,16 +7422,6 @@ "node": ">= 0.6.0" } }, - "node_modules/dequal": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", - "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/didyoumean": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", @@ -7906,9 +7599,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.11", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.11.tgz", - "integrity": "sha512-R1CccCDYqndR25CaXFd6hp/u9RaaMcftMkphmvuepXr5b1vfLkRml6aWVeBhXJ7rbevHkKEMJtz8XqPf7ffmew==", + "version": "1.5.23", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.23.tgz", + "integrity": "sha512-mBhODedOXg4v5QWwl21DjM5amzjmI1zw9EPrPK/5Wx7C8jt33bpZNrC7OhHUG3pxRtbLpr3W2dXT+Ph1SsfRZA==", "license": "ISC" }, "node_modules/emoji-regex": { @@ -7961,9 +7654,9 @@ } }, "node_modules/envinfo": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz", - "integrity": "sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==", + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz", + "integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==", "license": "MIT", "bin": { "envinfo": "dist/cli.js" @@ -8254,9 +7947,9 @@ } }, "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "license": "MIT", "engines": { "node": ">=6" @@ -8395,9 +8088,9 @@ } }, "node_modules/eslint-module-utils": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz", - "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.11.0.tgz", + "integrity": "sha512-gbBE5Hitek/oG6MUVj6sFuzEjA/ClzNflVrLovHi/JgLdC7fiN5gLAY1WIPW1a0V5I999MnsrvVrCOGmmVqDBQ==", "dev": true, "license": "MIT", "dependencies": { @@ -8526,225 +8219,6 @@ "eslint": "^8.0.1" } }, - "node_modules/eslint-plugin-github/node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.5.0.tgz", - "integrity": "sha512-lHS5hvz33iUFQKuPFGheAB84LwcJ60G8vKnEhnfcK1l8kGVLro2SFYW6K0/tj8FUhRJ0VHyg1oAfg50QGbPPHw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.5.0", - "@typescript-eslint/type-utils": "8.5.0", - "@typescript-eslint/utils": "8.5.0", - "@typescript-eslint/visitor-keys": "8.5.0", - "graphemer": "^1.4.0", - "ignore": "^5.3.1", - "natural-compare": "^1.4.0", - "ts-api-utils": "^1.3.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", - "eslint": "^8.57.0 || ^9.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/eslint-plugin-github/node_modules/@typescript-eslint/parser": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.5.0.tgz", - "integrity": "sha512-gF77eNv0Xz2UJg/NbpWJ0kqAm35UMsvZf1GHj8D9MRFTj/V3tAciIWXfmPLsAAF/vUlpWPvUDyH1jjsr0cMVWw==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "@typescript-eslint/scope-manager": "8.5.0", - "@typescript-eslint/types": "8.5.0", - "@typescript-eslint/typescript-estree": "8.5.0", - "@typescript-eslint/visitor-keys": "8.5.0", - "debug": "^4.3.4" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/eslint-plugin-github/node_modules/@typescript-eslint/scope-manager": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.5.0.tgz", - "integrity": "sha512-06JOQ9Qgj33yvBEx6tpC8ecP9o860rsR22hWMEd12WcTRrfaFgHr2RB/CA/B+7BMhHkXT4chg2MyboGdFGawYg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "8.5.0", - "@typescript-eslint/visitor-keys": "8.5.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/eslint-plugin-github/node_modules/@typescript-eslint/type-utils": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.5.0.tgz", - "integrity": "sha512-N1K8Ix+lUM+cIDhL2uekVn/ZD7TZW+9/rwz8DclQpcQ9rk4sIL5CAlBC0CugWKREmDjBzI/kQqU4wkg46jWLYA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/typescript-estree": "8.5.0", - "@typescript-eslint/utils": "8.5.0", - "debug": "^4.3.4", - "ts-api-utils": "^1.3.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/eslint-plugin-github/node_modules/@typescript-eslint/types": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.5.0.tgz", - "integrity": "sha512-qjkormnQS5wF9pjSi6q60bKUHH44j2APxfh9TQRXK8wbYVeDYYdYJGIROL87LGZZ2gz3Rbmjc736qyL8deVtdw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/eslint-plugin-github/node_modules/@typescript-eslint/typescript-estree": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.5.0.tgz", - "integrity": "sha512-vEG2Sf9P8BPQ+d0pxdfndw3xIXaoSjliG0/Ejk7UggByZPKXmJmw3GW5jV2gHNQNawBUyfahoSiCFVov0Ruf7Q==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "@typescript-eslint/types": "8.5.0", - "@typescript-eslint/visitor-keys": "8.5.0", - "debug": "^4.3.4", - "fast-glob": "^3.3.2", - "is-glob": "^4.0.3", - "minimatch": "^9.0.4", - "semver": "^7.6.0", - "ts-api-utils": "^1.3.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/eslint-plugin-github/node_modules/@typescript-eslint/utils": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.5.0.tgz", - "integrity": "sha512-6yyGYVL0e+VzGYp60wvkBHiqDWOpT63pdMV2CVG4LVDd5uR6q1qQN/7LafBZtAtNIn/mqXjsSeS5ggv/P0iECw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.5.0", - "@typescript-eslint/types": "8.5.0", - "@typescript-eslint/typescript-estree": "8.5.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0" - } - }, - "node_modules/eslint-plugin-github/node_modules/@typescript-eslint/visitor-keys": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.5.0.tgz", - "integrity": "sha512-yTPqMnbAZJNy2Xq2XU8AdtOW9tJIr+UQb64aXB9f3B1498Zx9JorVgFJcZpEc9UBuCCrdzKID2RGAMkYcDtZOw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "8.5.0", - "eslint-visitor-keys": "^3.4.3" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/eslint-plugin-github/node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-plugin-github/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/eslint-plugin-i": { "version": "2.29.1", "resolved": "https://registry.npmjs.org/eslint-plugin-i/-/eslint-plugin-i-2.29.1.tgz", @@ -8806,27 +8280,28 @@ } }, "node_modules/eslint-plugin-import": { - "version": "2.29.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", - "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", + "version": "2.30.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.30.0.tgz", + "integrity": "sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==", "dev": true, "license": "MIT", "dependencies": { - "array-includes": "^3.1.7", - "array.prototype.findlastindex": "^1.2.3", + "@rtsao/scc": "^1.1.0", + "array-includes": "^3.1.8", + "array.prototype.findlastindex": "^1.2.5", "array.prototype.flat": "^1.3.2", "array.prototype.flatmap": "^1.3.2", "debug": "^3.2.7", "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.9", - "eslint-module-utils": "^2.8.0", - "hasown": "^2.0.0", - "is-core-module": "^2.13.1", + "eslint-module-utils": "^2.9.0", + "hasown": "^2.0.2", + "is-core-module": "^2.15.1", "is-glob": "^4.0.3", "minimatch": "^3.1.2", - "object.fromentries": "^2.0.7", - "object.groupby": "^1.0.1", - "object.values": "^1.1.7", + "object.fromentries": "^2.0.8", + "object.groupby": "^1.0.3", + "object.values": "^1.2.0", "semver": "^6.3.1", "tsconfig-paths": "^3.15.0" }, @@ -8895,9 +8370,9 @@ } }, "node_modules/eslint-plugin-jsx-a11y": { - "version": "6.9.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.9.0.tgz", - "integrity": "sha512-nOFOCaJG2pYqORjK19lqPqxMO/JpvdCZdPtNdxY3kvom3jTvkAbOvQvD8wuD0G8BYR0IGAGYDlzqWJOh/ybn2g==", + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.0.tgz", + "integrity": "sha512-ySOHvXX8eSN6zz8Bywacm7CvGNhUtdjvqfQDVe6020TUK34Cywkw7m0KsCCk1Qtm9G1FayfTN1/7mMYnYO2Bhg==", "dev": true, "license": "MIT", "dependencies": { @@ -8905,8 +8380,8 @@ "array-includes": "^3.1.8", "array.prototype.flatmap": "^1.3.2", "ast-types-flow": "^0.0.8", - "axe-core": "^4.9.1", - "axobject-query": "~3.1.1", + "axe-core": "^4.10.0", + "axobject-query": "^4.1.0", "damerau-levenshtein": "^1.0.8", "emoji-regex": "^9.2.2", "es-iterator-helpers": "^1.0.19", @@ -8922,7 +8397,7 @@ "node": ">=4.0" }, "peerDependencies": { - "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9" } }, "node_modules/eslint-plugin-jsx-a11y/node_modules/aria-query": { @@ -9052,9 +8527,9 @@ } }, "node_modules/eslint-plugin-react": { - "version": "7.35.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.35.0.tgz", - "integrity": "sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA==", + "version": "7.36.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.36.1.tgz", + "integrity": "sha512-/qwbqNXZoq+VP30s1d4Nc1C5GTxjJQjk4Jzs4Wq2qzxFM7dSmuG2UkIjg2USMLh3A/aVcUNrK7v0J5U1XEGGwA==", "dev": true, "license": "MIT", "dependencies": { @@ -9219,6 +8694,373 @@ "eslint": "^8.0.0 || ^9.0.0" } }, + "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/eslint-plugin": { + "version": "7.16.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.16.1.tgz", + "integrity": "sha512-SxdPak/5bO0EnGktV05+Hq8oatjAYVY3Zh2bye9pGZy6+jwyR3LG3YKkV4YatlsgqXP28BTeVm9pqwJM96vf2A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/regexpp": "^4.10.0", + "@typescript-eslint/scope-manager": "7.16.1", + "@typescript-eslint/type-utils": "7.16.1", + "@typescript-eslint/utils": "7.16.1", + "@typescript-eslint/visitor-keys": "7.16.1", + "graphemer": "^1.4.0", + "ignore": "^5.3.1", + "natural-compare": "^1.4.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^7.0.0", + "eslint": "^8.56.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/parser": { + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz", + "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==", + "dev": true, + "license": "BSD-2-Clause", + "peer": true, + "dependencies": { + "@typescript-eslint/scope-manager": "7.18.0", + "@typescript-eslint/types": "7.18.0", + "@typescript-eslint/typescript-estree": "7.18.0", + "@typescript-eslint/visitor-keys": "7.18.0", + "debug": "^4.3.4" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.56.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": { + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz", + "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@typescript-eslint/types": "7.18.0", + "@typescript-eslint/visitor-keys": "7.18.0" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": { + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz", + "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@typescript-eslint/types": "7.18.0", + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/scope-manager": { + "version": "7.16.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.16.1.tgz", + "integrity": "sha512-nYpyv6ALte18gbMz323RM+vpFpTjfNdyakbf3nsLvF43uF9KeNC289SUEW3QLZ1xPtyINJ1dIsZOuWuSRIWygw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "7.16.1", + "@typescript-eslint/visitor-keys": "7.16.1" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/scope-manager/node_modules/@typescript-eslint/types": { + "version": "7.16.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.16.1.tgz", + "integrity": "sha512-AQn9XqCzUXd4bAVEsAXM/Izk11Wx2u4H3BAfQVhSfzfDOm/wAON9nP7J5rpkCxts7E5TELmN845xTUCQrD1xIQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/type-utils": { + "version": "7.16.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.16.1.tgz", + "integrity": "sha512-rbu/H2MWXN4SkjIIyWcmYBjlp55VT+1G3duFOIukTNFxr9PI35pLc2ydwAfejCEitCv4uztA07q0QWanOHC7dA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/typescript-estree": "7.16.1", + "@typescript-eslint/utils": "7.16.1", + "debug": "^4.3.4", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.56.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { + "version": "7.16.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.16.1.tgz", + "integrity": "sha512-AQn9XqCzUXd4bAVEsAXM/Izk11Wx2u4H3BAfQVhSfzfDOm/wAON9nP7J5rpkCxts7E5TELmN845xTUCQrD1xIQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { + "version": "7.16.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.16.1.tgz", + "integrity": "sha512-0vFPk8tMjj6apaAZ1HlwM8w7jbghC8jc1aRNJG5vN8Ym5miyhTQGMqU++kuBFDNKe9NcPeZ6x0zfSzV8xC1UlQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/types": "7.16.1", + "@typescript-eslint/visitor-keys": "7.16.1", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/types": { + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz", + "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/typescript-estree": { + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz", + "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==", + "dev": true, + "license": "BSD-2-Clause", + "peer": true, + "dependencies": { + "@typescript-eslint/types": "7.18.0", + "@typescript-eslint/visitor-keys": "7.18.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/typescript-estree/node_modules/@typescript-eslint/visitor-keys": { + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz", + "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@typescript-eslint/types": "7.18.0", + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/utils": { + "version": "7.16.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.16.1.tgz", + "integrity": "sha512-WrFM8nzCowV0he0RlkotGDujx78xudsxnGMBHI88l5J8wEhED6yBwaSLP99ygfrzAjsQvcYQ94quDwI0d7E1fA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "7.16.1", + "@typescript-eslint/types": "7.16.1", + "@typescript-eslint/typescript-estree": "7.16.1" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.56.0" + } + }, + "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": { + "version": "7.16.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.16.1.tgz", + "integrity": "sha512-AQn9XqCzUXd4bAVEsAXM/Izk11Wx2u4H3BAfQVhSfzfDOm/wAON9nP7J5rpkCxts7E5TELmN845xTUCQrD1xIQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": { + "version": "7.16.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.16.1.tgz", + "integrity": "sha512-0vFPk8tMjj6apaAZ1HlwM8w7jbghC8jc1aRNJG5vN8Ym5miyhTQGMqU++kuBFDNKe9NcPeZ6x0zfSzV8xC1UlQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/types": "7.16.1", + "@typescript-eslint/visitor-keys": "7.16.1", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/visitor-keys": { + "version": "7.16.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.16.1.tgz", + "integrity": "sha512-Qlzzx4sE4u3FsHTPQAAQFJFNOuqtuY0LFrZHwQ8IHK705XxBiWOFkfKRWu6niB7hwfgnwIpO4jTC75ozW1PHWg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "7.16.1", + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/visitor-keys/node_modules/@typescript-eslint/types": { + "version": "7.16.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.16.1.tgz", + "integrity": "sha512-AQn9XqCzUXd4bAVEsAXM/Izk11Wx2u4H3BAfQVhSfzfDOm/wAON9nP7J5rpkCxts7E5TELmN845xTUCQrD1xIQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, "node_modules/eslint-plugin-sonarjs/node_modules/eslint-scope": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.1.tgz", @@ -9236,6 +9078,19 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint-plugin-sonarjs/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/eslint-plugin-sonarjs/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -9335,6 +9190,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/eslint-plugin-unicorn/node_modules/jsesc": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", + "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", + "dev": true, + "license": "MIT", + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/eslint-plugin-vitest-globals": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/eslint-plugin-vitest-globals/-/eslint-plugin-vitest-globals-1.5.0.tgz", @@ -10001,9 +9869,9 @@ } }, "node_modules/get-tsconfig": { - "version": "4.7.6", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.6.tgz", - "integrity": "sha512-ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==", + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.8.1.tgz", + "integrity": "sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==", "license": "MIT", "dependencies": { "resolve-pkg-maps": "^1.0.0" @@ -10339,6 +10207,16 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/hosted-git-info/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, "node_modules/hpagent": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/hpagent/-/hpagent-1.2.0.tgz", @@ -10705,9 +10583,9 @@ } }, "node_modules/is-core-module": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz", - "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", + "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", "license": "MIT", "dependencies": { "hasown": "^2.0.2" @@ -11314,10 +11192,9 @@ "license": "MIT" }, "node_modules/js-tokens": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.0.tgz", - "integrity": "sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==", - "dev": true, + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", "license": "MIT" }, "node_modules/js-types": { @@ -11363,16 +11240,16 @@ } }, "node_modules/jsesc": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", - "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true, "license": "MIT", "bin": { "jsesc": "bin/jsesc" }, "engines": { - "node": ">=6" + "node": ">=4" } }, "node_modules/json-buffer": { @@ -11806,13 +11683,6 @@ "loose-envify": "cli.js" } }, - "node_modules/loose-envify/node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true, - "license": "MIT" - }, "node_modules/loupe": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.1.tgz", @@ -11834,13 +11704,13 @@ } }, "node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "license": "ISC", - "engines": { - "node": ">=12" + "dependencies": { + "yallist": "^3.0.2" } }, "node_modules/magic-string": { @@ -11854,14 +11724,14 @@ } }, "node_modules/magicast": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.4.tgz", - "integrity": "sha512-TyDF/Pn36bBji9rWKHlZe+PZb6Mx5V8IHCSxk7X4aljM4e/vyDvZZYwHewdVaqiA0nb3ghfHU/6AUpDxWoER2Q==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.5.tgz", + "integrity": "sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^7.24.4", - "@babel/types": "^7.24.0", + "@babel/parser": "^7.25.4", + "@babel/types": "^7.25.4", "source-map-js": "^1.2.0" } }, @@ -11881,6 +11751,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/markdown-escape": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/markdown-escape/-/markdown-escape-2.0.0.tgz", + "integrity": "sha512-Trz4v0+XWlwy68LJIyw3bLbsJiC8XAbRCKF9DbEtZjyndKOGVx6n+wNB0VfoRmY2LKboQLeniap3xrb6LGSJ8A==", + "dev": true, + "license": "MIT" + }, "node_modules/markdown-it": { "version": "14.1.0", "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", @@ -12262,9 +12139,9 @@ "license": "BSD-3-Clause" }, "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, "node_modules/mz": { @@ -13048,6 +12925,13 @@ "node": "^12 || >=14" } }, + "node_modules/postcss-html/node_modules/js-tokens": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.0.tgz", + "integrity": "sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==", + "dev": true, + "license": "MIT" + }, "node_modules/postcss-import": { "version": "15.1.0", "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz", @@ -13808,9 +13692,9 @@ "license": "MIT" }, "node_modules/regenerate-unicode-properties": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz", - "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz", + "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==", "dev": true, "license": "MIT", "dependencies": { @@ -14461,9 +14345,9 @@ } }, "node_modules/solid-js": { - "version": "1.8.21", - "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.8.21.tgz", - "integrity": "sha512-FHUGdoo7GVa1BTpGh/4UtwIISde0vSXoqNB6KFpHiTgkIY959tmCJ7NYQAWDfScBfnpoMGZR8lFz0DiwW/gFlw==", + "version": "1.8.22", + "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.8.22.tgz", + "integrity": "sha512-VBzN5j+9Y4rqIKEnK301aBk+S7fvFSTs9ljg+YEdFxjNjH0hkjXPiQRcws9tE5fUzMznSS6KToL5hwMfHDgpLA==", "license": "MIT", "dependencies": { "csstype": "^3.1.0", @@ -14573,9 +14457,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.18", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz", - "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==", + "version": "3.0.20", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz", + "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==", "dev": true, "license": "CC0-1.0" }, @@ -14977,9 +14861,9 @@ } }, "node_modules/stylelint/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "dev": true, "license": "MIT", "engines": { @@ -15077,9 +14961,9 @@ } }, "node_modules/stylis": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.2.tgz", - "integrity": "sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.4.tgz", + "integrity": "sha512-osIBl6BGUmSfDkyH2mB7EFvCJntXDrLhKjHTRj/rK6xLH0yuPrHULDRQzKokSOD4VoorhtKpfcfW1GAntu8now==", "license": "MIT" }, "node_modules/stylus": { @@ -15388,9 +15272,9 @@ "license": "ISC" }, "node_modules/terser": { - "version": "5.31.6", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz", - "integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==", + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.32.0.tgz", + "integrity": "sha512-v3Gtw3IzpBJ0ugkxEX8U0W6+TnPKRRCWGh1jC/iM/e3Ki5+qvO1L1EAZ56bZasc64aXHwRHNIQEzm6//i5cemQ==", "license": "BSD-2-Clause", "dependencies": { "@jridgewell/source-map": "^0.3.3", @@ -15603,9 +15487,9 @@ "license": "MIT" }, "node_modules/tinypool": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.0.tgz", - "integrity": "sha512-KIKExllK7jp3uvrNtvRBYBWBOAXSX8ZvoaD8T+7KB/QHIuoJW3Pmr60zucywjAlMb5TeXUkcs/MWeWLu0qvuAQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.1.tgz", + "integrity": "sha512-URZYihUbRPcGv95En+sz6MfghfIc2OJ1sv/RmhWZLouPY0/8Vo80viwPvg3dlaS9fuq7fQMEfgRRK7BBZThBEA==", "dev": true, "license": "MIT", "engines": { @@ -15745,9 +15629,9 @@ } }, "node_modules/tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", "dev": true, "license": "0BSD" }, @@ -15855,9 +15739,9 @@ } }, "node_modules/typescript": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.3.tgz", - "integrity": "sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==", + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", + "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", "devOptional": true, "license": "Apache-2.0", "bin": { @@ -15910,15 +15794,15 @@ } }, "node_modules/undici-types": { - "version": "6.19.6", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.6.tgz", - "integrity": "sha512-e/vggGopEfTKSvj4ihnOLTsqhrKRN3LeO6qSN/GxohhuRv8qH9bNQ4B8W7e/vFL+0XTnmHPB4/kegunZGA4Org==", + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", "license": "MIT" }, "node_modules/unicode-canonical-property-names-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", - "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz", + "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==", "dev": true, "license": "MIT", "engines": { @@ -15940,9 +15824,9 @@ } }, "node_modules/unicode-match-property-value-ecmascript": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz", - "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz", + "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==", "dev": true, "license": "MIT", "engines": { @@ -16072,15 +15956,15 @@ "license": "MIT" }, "node_modules/vite": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.1.tgz", - "integrity": "sha512-1oE6yuNXssjrZdblI9AfBbHCC41nnyoVoEZxQnID6yvQZAFBzxxkqoFLtHUMkYunL8hwOLEjgTuxpkRxvba3kA==", + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.5.tgz", + "integrity": "sha512-pXqR0qtb2bTwLkev4SE3r4abCNioP3GkjvIDLlzziPpXtHgiJIjuKl+1GN6ESOT3wMjG3JTeARopj2SwYaHTOA==", "dev": true, "license": "MIT", "dependencies": { "esbuild": "^0.21.3", - "postcss": "^8.4.41", - "rollup": "^4.13.0" + "postcss": "^8.4.43", + "rollup": "^4.20.0" }, "bin": { "vite": "bin/vite.js" @@ -16183,9 +16067,9 @@ } }, "node_modules/vite/node_modules/rollup": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.0.tgz", - "integrity": "sha512-vo+S/lfA2lMS7rZ2Qoubi6I5hwZwzXeUIctILZLbHI+laNtvhhOIon2S1JksA5UEDQ7l3vberd0fxK44lTYjbQ==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.3.tgz", + "integrity": "sha512-7sqRtBNnEbcBtMeRVc6VRsJMmpI+JU1z9VTvW8D4gXIYQFz0aLcsE6rRkyghZkLfEgUZgVvOG7A5CVz/VW5GIA==", "dev": true, "license": "MIT", "dependencies": { @@ -16199,22 +16083,22 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.21.0", - "@rollup/rollup-android-arm64": "4.21.0", - "@rollup/rollup-darwin-arm64": "4.21.0", - "@rollup/rollup-darwin-x64": "4.21.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.21.0", - "@rollup/rollup-linux-arm-musleabihf": "4.21.0", - "@rollup/rollup-linux-arm64-gnu": "4.21.0", - "@rollup/rollup-linux-arm64-musl": "4.21.0", - "@rollup/rollup-linux-powerpc64le-gnu": "4.21.0", - "@rollup/rollup-linux-riscv64-gnu": "4.21.0", - "@rollup/rollup-linux-s390x-gnu": "4.21.0", - "@rollup/rollup-linux-x64-gnu": "4.21.0", - "@rollup/rollup-linux-x64-musl": "4.21.0", - "@rollup/rollup-win32-arm64-msvc": "4.21.0", - "@rollup/rollup-win32-ia32-msvc": "4.21.0", - "@rollup/rollup-win32-x64-msvc": "4.21.0", + "@rollup/rollup-android-arm-eabi": "4.21.3", + "@rollup/rollup-android-arm64": "4.21.3", + "@rollup/rollup-darwin-arm64": "4.21.3", + "@rollup/rollup-darwin-x64": "4.21.3", + "@rollup/rollup-linux-arm-gnueabihf": "4.21.3", + "@rollup/rollup-linux-arm-musleabihf": "4.21.3", + "@rollup/rollup-linux-arm64-gnu": "4.21.3", + "@rollup/rollup-linux-arm64-musl": "4.21.3", + "@rollup/rollup-linux-powerpc64le-gnu": "4.21.3", + "@rollup/rollup-linux-riscv64-gnu": "4.21.3", + "@rollup/rollup-linux-s390x-gnu": "4.21.3", + "@rollup/rollup-linux-x64-gnu": "4.21.3", + "@rollup/rollup-linux-x64-musl": "4.21.3", + "@rollup/rollup-win32-arm64-msvc": "4.21.3", + "@rollup/rollup-win32-ia32-msvc": "4.21.3", + "@rollup/rollup-win32-x64-msvc": "4.21.3", "fsevents": "~2.3.2" } }, @@ -16374,9 +16258,9 @@ } }, "node_modules/vue-component-type-helpers": { - "version": "2.0.29", - "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.0.29.tgz", - "integrity": "sha512-58i+ZhUAUpwQ+9h5Hck0D+jr1qbYl4voRt5KffBx8qzELViQ4XdT/Tuo+mzq8u63teAG8K0lLaOiL5ofqW38rg==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.1.6.tgz", + "integrity": "sha512-ng11B8B/ZADUMMOsRbqv0arc442q7lifSubD0v8oDXIFoMg/mXwAPUunrroIDkY+mcD0dHKccdaznSVp8EoX3w==", "dev": true, "license": "MIT" }, @@ -16888,9 +16772,9 @@ } }, "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "license": "MIT", "engines": { "node": ">=12" @@ -16912,9 +16796,9 @@ } }, "node_modules/wrap-ansi/node_modules/emoji-regex": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", - "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", + "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", "license": "MIT" }, "node_modules/wrap-ansi/node_modules/string-width": { @@ -16998,9 +16882,9 @@ "license": "ISC" }, "node_modules/yaml": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz", - "integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz", + "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==", "license": "ISC", "bin": { "yaml": "bin.mjs" diff --git a/poetry.lock b/poetry.lock index a486f961ea..886dfe53d8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -214,104 +214,105 @@ files = [ [[package]] name = "regex" -version = "2023.12.25" +version = "2024.9.11" description = "Alternative regular expression module, to replace re." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "regex-2023.12.25-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0694219a1d54336fd0445ea382d49d36882415c0134ee1e8332afd1529f0baa5"}, - {file = "regex-2023.12.25-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b014333bd0217ad3d54c143de9d4b9a3ca1c5a29a6d0d554952ea071cff0f1f8"}, - {file = "regex-2023.12.25-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d865984b3f71f6d0af64d0d88f5733521698f6c16f445bb09ce746c92c97c586"}, - {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1e0eabac536b4cc7f57a5f3d095bfa557860ab912f25965e08fe1545e2ed8b4c"}, - {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c25a8ad70e716f96e13a637802813f65d8a6760ef48672aa3502f4c24ea8b400"}, - {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a9b6d73353f777630626f403b0652055ebfe8ff142a44ec2cf18ae470395766e"}, - {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a9cc99d6946d750eb75827cb53c4371b8b0fe89c733a94b1573c9dd16ea6c9e4"}, - {file = "regex-2023.12.25-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:88d1f7bef20c721359d8675f7d9f8e414ec5003d8f642fdfd8087777ff7f94b5"}, - {file = "regex-2023.12.25-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cb3fe77aec8f1995611f966d0c656fdce398317f850d0e6e7aebdfe61f40e1cd"}, - {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:7aa47c2e9ea33a4a2a05f40fcd3ea36d73853a2aae7b4feab6fc85f8bf2c9704"}, - {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:df26481f0c7a3f8739fecb3e81bc9da3fcfae34d6c094563b9d4670b047312e1"}, - {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:c40281f7d70baf6e0db0c2f7472b31609f5bc2748fe7275ea65a0b4601d9b392"}, - {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:d94a1db462d5690ebf6ae86d11c5e420042b9898af5dcf278bd97d6bda065423"}, - {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:ba1b30765a55acf15dce3f364e4928b80858fa8f979ad41f862358939bdd1f2f"}, - {file = "regex-2023.12.25-cp310-cp310-win32.whl", hash = "sha256:150c39f5b964e4d7dba46a7962a088fbc91f06e606f023ce57bb347a3b2d4630"}, - {file = "regex-2023.12.25-cp310-cp310-win_amd64.whl", hash = "sha256:09da66917262d9481c719599116c7dc0c321ffcec4b1f510c4f8a066f8768105"}, - {file = "regex-2023.12.25-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:1b9d811f72210fa9306aeb88385b8f8bcef0dfbf3873410413c00aa94c56c2b6"}, - {file = "regex-2023.12.25-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d902a43085a308cef32c0d3aea962524b725403fd9373dea18110904003bac97"}, - {file = "regex-2023.12.25-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d166eafc19f4718df38887b2bbe1467a4f74a9830e8605089ea7a30dd4da8887"}, - {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c7ad32824b7f02bb3c9f80306d405a1d9b7bb89362d68b3c5a9be53836caebdb"}, - {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:636ba0a77de609d6510235b7f0e77ec494d2657108f777e8765efc060094c98c"}, - {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0fda75704357805eb953a3ee15a2b240694a9a514548cd49b3c5124b4e2ad01b"}, - {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f72cbae7f6b01591f90814250e636065850c5926751af02bb48da94dfced7baa"}, - {file = "regex-2023.12.25-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:db2a0b1857f18b11e3b0e54ddfefc96af46b0896fb678c85f63fb8c37518b3e7"}, - {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7502534e55c7c36c0978c91ba6f61703faf7ce733715ca48f499d3dbbd7657e0"}, - {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:e8c7e08bb566de4faaf11984af13f6bcf6a08f327b13631d41d62592681d24fe"}, - {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:283fc8eed679758de38fe493b7d7d84a198b558942b03f017b1f94dda8efae80"}, - {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:f44dd4d68697559d007462b0a3a1d9acd61d97072b71f6d1968daef26bc744bd"}, - {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:67d3ccfc590e5e7197750fcb3a2915b416a53e2de847a728cfa60141054123d4"}, - {file = "regex-2023.12.25-cp311-cp311-win32.whl", hash = "sha256:68191f80a9bad283432385961d9efe09d783bcd36ed35a60fb1ff3f1ec2efe87"}, - {file = "regex-2023.12.25-cp311-cp311-win_amd64.whl", hash = "sha256:7d2af3f6b8419661a0c421584cfe8aaec1c0e435ce7e47ee2a97e344b98f794f"}, - {file = "regex-2023.12.25-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:8a0ccf52bb37d1a700375a6b395bff5dd15c50acb745f7db30415bae3c2b0715"}, - {file = "regex-2023.12.25-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:c3c4a78615b7762740531c27cf46e2f388d8d727d0c0c739e72048beb26c8a9d"}, - {file = "regex-2023.12.25-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ad83e7545b4ab69216cef4cc47e344d19622e28aabec61574b20257c65466d6a"}, - {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b7a635871143661feccce3979e1727c4e094f2bdfd3ec4b90dfd4f16f571a87a"}, - {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d498eea3f581fbe1b34b59c697512a8baef88212f92e4c7830fcc1499f5b45a5"}, - {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:43f7cd5754d02a56ae4ebb91b33461dc67be8e3e0153f593c509e21d219c5060"}, - {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51f4b32f793812714fd5307222a7f77e739b9bc566dc94a18126aba3b92b98a3"}, - {file = "regex-2023.12.25-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ba99d8077424501b9616b43a2d208095746fb1284fc5ba490139651f971d39d9"}, - {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:4bfc2b16e3ba8850e0e262467275dd4d62f0d045e0e9eda2bc65078c0110a11f"}, - {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:8c2c19dae8a3eb0ea45a8448356ed561be843b13cbc34b840922ddf565498c1c"}, - {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:60080bb3d8617d96f0fb7e19796384cc2467447ef1c491694850ebd3670bc457"}, - {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b77e27b79448e34c2c51c09836033056a0547aa360c45eeeb67803da7b0eedaf"}, - {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:518440c991f514331f4850a63560321f833979d145d7d81186dbe2f19e27ae3d"}, - {file = "regex-2023.12.25-cp312-cp312-win32.whl", hash = "sha256:e2610e9406d3b0073636a3a2e80db05a02f0c3169b5632022b4e81c0364bcda5"}, - {file = "regex-2023.12.25-cp312-cp312-win_amd64.whl", hash = "sha256:cc37b9aeebab425f11f27e5e9e6cf580be7206c6582a64467a14dda211abc232"}, - {file = "regex-2023.12.25-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:da695d75ac97cb1cd725adac136d25ca687da4536154cdc2815f576e4da11c69"}, - {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d126361607b33c4eb7b36debc173bf25d7805847346dd4d99b5499e1fef52bc7"}, - {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4719bb05094d7d8563a450cf8738d2e1061420f79cfcc1fa7f0a44744c4d8f73"}, - {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5dd58946bce44b53b06d94aa95560d0b243eb2fe64227cba50017a8d8b3cd3e2"}, - {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:22a86d9fff2009302c440b9d799ef2fe322416d2d58fc124b926aa89365ec482"}, - {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2aae8101919e8aa05ecfe6322b278f41ce2994c4a430303c4cd163fef746e04f"}, - {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e692296c4cc2873967771345a876bcfc1c547e8dd695c6b89342488b0ea55cd8"}, - {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:263ef5cc10979837f243950637fffb06e8daed7f1ac1e39d5910fd29929e489a"}, - {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:d6f7e255e5fa94642a0724e35406e6cb7001c09d476ab5fce002f652b36d0c39"}, - {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:88ad44e220e22b63b0f8f81f007e8abbb92874d8ced66f32571ef8beb0643b2b"}, - {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:3a17d3ede18f9cedcbe23d2daa8a2cd6f59fe2bf082c567e43083bba3fb00347"}, - {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d15b274f9e15b1a0b7a45d2ac86d1f634d983ca40d6b886721626c47a400bf39"}, - {file = "regex-2023.12.25-cp37-cp37m-win32.whl", hash = "sha256:ed19b3a05ae0c97dd8f75a5d8f21f7723a8c33bbc555da6bbe1f96c470139d3c"}, - {file = "regex-2023.12.25-cp37-cp37m-win_amd64.whl", hash = "sha256:a6d1047952c0b8104a1d371f88f4ab62e6275567d4458c1e26e9627ad489b445"}, - {file = "regex-2023.12.25-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:b43523d7bc2abd757119dbfb38af91b5735eea45537ec6ec3a5ec3f9562a1c53"}, - {file = "regex-2023.12.25-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:efb2d82f33b2212898f1659fb1c2e9ac30493ac41e4d53123da374c3b5541e64"}, - {file = "regex-2023.12.25-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b7fca9205b59c1a3d5031f7e64ed627a1074730a51c2a80e97653e3e9fa0d415"}, - {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:086dd15e9435b393ae06f96ab69ab2d333f5d65cbe65ca5a3ef0ec9564dfe770"}, - {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e81469f7d01efed9b53740aedd26085f20d49da65f9c1f41e822a33992cb1590"}, - {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:34e4af5b27232f68042aa40a91c3b9bb4da0eeb31b7632e0091afc4310afe6cb"}, - {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9852b76ab558e45b20bf1893b59af64a28bd3820b0c2efc80e0a70a4a3ea51c1"}, - {file = "regex-2023.12.25-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ff100b203092af77d1a5a7abe085b3506b7eaaf9abf65b73b7d6905b6cb76988"}, - {file = "regex-2023.12.25-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cc038b2d8b1470364b1888a98fd22d616fba2b6309c5b5f181ad4483e0017861"}, - {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:094ba386bb5c01e54e14434d4caabf6583334090865b23ef58e0424a6286d3dc"}, - {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:5cd05d0f57846d8ba4b71d9c00f6f37d6b97d5e5ef8b3c3840426a475c8f70f4"}, - {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:9aa1a67bbf0f957bbe096375887b2505f5d8ae16bf04488e8b0f334c36e31360"}, - {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:98a2636994f943b871786c9e82bfe7883ecdaba2ef5df54e1450fa9869d1f756"}, - {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:37f8e93a81fc5e5bd8db7e10e62dc64261bcd88f8d7e6640aaebe9bc180d9ce2"}, - {file = "regex-2023.12.25-cp38-cp38-win32.whl", hash = "sha256:d78bd484930c1da2b9679290a41cdb25cc127d783768a0369d6b449e72f88beb"}, - {file = "regex-2023.12.25-cp38-cp38-win_amd64.whl", hash = "sha256:b521dcecebc5b978b447f0f69b5b7f3840eac454862270406a39837ffae4e697"}, - {file = "regex-2023.12.25-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:f7bc09bc9c29ebead055bcba136a67378f03d66bf359e87d0f7c759d6d4ffa31"}, - {file = "regex-2023.12.25-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e14b73607d6231f3cc4622809c196b540a6a44e903bcfad940779c80dffa7be7"}, - {file = "regex-2023.12.25-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9eda5f7a50141291beda3edd00abc2d4a5b16c29c92daf8d5bd76934150f3edc"}, - {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc6bb9aa69aacf0f6032c307da718f61a40cf970849e471254e0e91c56ffca95"}, - {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:298dc6354d414bc921581be85695d18912bea163a8b23cac9a2562bbcd5088b1"}, - {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2f4e475a80ecbd15896a976aa0b386c5525d0ed34d5c600b6d3ebac0a67c7ddf"}, - {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:531ac6cf22b53e0696f8e1d56ce2396311254eb806111ddd3922c9d937151dae"}, - {file = "regex-2023.12.25-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:22f3470f7524b6da61e2020672df2f3063676aff444db1daa283c2ea4ed259d6"}, - {file = "regex-2023.12.25-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:89723d2112697feaa320c9d351e5f5e7b841e83f8b143dba8e2d2b5f04e10923"}, - {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:0ecf44ddf9171cd7566ef1768047f6e66975788258b1c6c6ca78098b95cf9a3d"}, - {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:905466ad1702ed4acfd67a902af50b8db1feeb9781436372261808df7a2a7bca"}, - {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:4558410b7a5607a645e9804a3e9dd509af12fb72b9825b13791a37cd417d73a5"}, - {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:7e316026cc1095f2a3e8cc012822c99f413b702eaa2ca5408a513609488cb62f"}, - {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:3b1de218d5375cd6ac4b5493e0b9f3df2be331e86520f23382f216c137913d20"}, - {file = "regex-2023.12.25-cp39-cp39-win32.whl", hash = "sha256:11a963f8e25ab5c61348d090bf1b07f1953929c13bd2309a0662e9ff680763c9"}, - {file = "regex-2023.12.25-cp39-cp39-win_amd64.whl", hash = "sha256:e693e233ac92ba83a87024e1d32b5f9ab15ca55ddd916d878146f4e3406b5c91"}, - {file = "regex-2023.12.25.tar.gz", hash = "sha256:29171aa128da69afdf4bde412d5bedc335f2ca8fcfe4489038577d05f16181e5"}, + {file = "regex-2024.9.11-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:1494fa8725c285a81d01dc8c06b55287a1ee5e0e382d8413adc0a9197aac6408"}, + {file = "regex-2024.9.11-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0e12c481ad92d129c78f13a2a3662317e46ee7ef96c94fd332e1c29131875b7d"}, + {file = "regex-2024.9.11-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:16e13a7929791ac1216afde26f712802e3df7bf0360b32e4914dca3ab8baeea5"}, + {file = "regex-2024.9.11-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:46989629904bad940bbec2106528140a218b4a36bb3042d8406980be1941429c"}, + {file = "regex-2024.9.11-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a906ed5e47a0ce5f04b2c981af1c9acf9e8696066900bf03b9d7879a6f679fc8"}, + {file = "regex-2024.9.11-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e9a091b0550b3b0207784a7d6d0f1a00d1d1c8a11699c1a4d93db3fbefc3ad35"}, + {file = "regex-2024.9.11-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5ddcd9a179c0a6fa8add279a4444015acddcd7f232a49071ae57fa6e278f1f71"}, + {file = "regex-2024.9.11-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6b41e1adc61fa347662b09398e31ad446afadff932a24807d3ceb955ed865cc8"}, + {file = "regex-2024.9.11-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ced479f601cd2f8ca1fd7b23925a7e0ad512a56d6e9476f79b8f381d9d37090a"}, + {file = "regex-2024.9.11-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:635a1d96665f84b292e401c3d62775851aedc31d4f8784117b3c68c4fcd4118d"}, + {file = "regex-2024.9.11-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:c0256beda696edcf7d97ef16b2a33a8e5a875affd6fa6567b54f7c577b30a137"}, + {file = "regex-2024.9.11-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:3ce4f1185db3fbde8ed8aa223fc9620f276c58de8b0d4f8cc86fd1360829edb6"}, + {file = "regex-2024.9.11-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:09d77559e80dcc9d24570da3745ab859a9cf91953062e4ab126ba9d5993688ca"}, + {file = "regex-2024.9.11-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:7a22ccefd4db3f12b526eccb129390942fe874a3a9fdbdd24cf55773a1faab1a"}, + {file = "regex-2024.9.11-cp310-cp310-win32.whl", hash = "sha256:f745ec09bc1b0bd15cfc73df6fa4f726dcc26bb16c23a03f9e3367d357eeedd0"}, + {file = "regex-2024.9.11-cp310-cp310-win_amd64.whl", hash = "sha256:01c2acb51f8a7d6494c8c5eafe3d8e06d76563d8a8a4643b37e9b2dd8a2ff623"}, + {file = "regex-2024.9.11-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:2cce2449e5927a0bf084d346da6cd5eb016b2beca10d0013ab50e3c226ffc0df"}, + {file = "regex-2024.9.11-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3b37fa423beefa44919e009745ccbf353d8c981516e807995b2bd11c2c77d268"}, + {file = "regex-2024.9.11-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:64ce2799bd75039b480cc0360907c4fb2f50022f030bf9e7a8705b636e408fad"}, + {file = "regex-2024.9.11-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a4cc92bb6db56ab0c1cbd17294e14f5e9224f0cc6521167ef388332604e92679"}, + {file = "regex-2024.9.11-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d05ac6fa06959c4172eccd99a222e1fbf17b5670c4d596cb1e5cde99600674c4"}, + {file = "regex-2024.9.11-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:040562757795eeea356394a7fb13076ad4f99d3c62ab0f8bdfb21f99a1f85664"}, + {file = "regex-2024.9.11-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6113c008a7780792efc80f9dfe10ba0cd043cbf8dc9a76ef757850f51b4edc50"}, + {file = "regex-2024.9.11-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8e5fb5f77c8745a60105403a774fe2c1759b71d3e7b4ca237a5e67ad066c7199"}, + {file = "regex-2024.9.11-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:54d9ff35d4515debf14bc27f1e3b38bfc453eff3220f5bce159642fa762fe5d4"}, + {file = "regex-2024.9.11-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:df5cbb1fbc74a8305b6065d4ade43b993be03dbe0f8b30032cced0d7740994bd"}, + {file = "regex-2024.9.11-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:7fb89ee5d106e4a7a51bce305ac4efb981536301895f7bdcf93ec92ae0d91c7f"}, + {file = "regex-2024.9.11-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:a738b937d512b30bf75995c0159c0ddf9eec0775c9d72ac0202076c72f24aa96"}, + {file = "regex-2024.9.11-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:e28f9faeb14b6f23ac55bfbbfd3643f5c7c18ede093977f1df249f73fd22c7b1"}, + {file = "regex-2024.9.11-cp311-cp311-win32.whl", hash = "sha256:18e707ce6c92d7282dfce370cd205098384b8ee21544e7cb29b8aab955b66fa9"}, + {file = "regex-2024.9.11-cp311-cp311-win_amd64.whl", hash = "sha256:313ea15e5ff2a8cbbad96ccef6be638393041b0a7863183c2d31e0c6116688cf"}, + {file = "regex-2024.9.11-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:b0d0a6c64fcc4ef9c69bd5b3b3626cc3776520a1637d8abaa62b9edc147a58f7"}, + {file = "regex-2024.9.11-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:49b0e06786ea663f933f3710a51e9385ce0cba0ea56b67107fd841a55d56a231"}, + {file = "regex-2024.9.11-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:5b513b6997a0b2f10e4fd3a1313568e373926e8c252bd76c960f96fd039cd28d"}, + {file = "regex-2024.9.11-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ee439691d8c23e76f9802c42a95cfeebf9d47cf4ffd06f18489122dbb0a7ad64"}, + {file = "regex-2024.9.11-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a8f877c89719d759e52783f7fe6e1c67121076b87b40542966c02de5503ace42"}, + {file = "regex-2024.9.11-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:23b30c62d0f16827f2ae9f2bb87619bc4fba2044911e2e6c2eb1af0161cdb766"}, + {file = "regex-2024.9.11-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:85ab7824093d8f10d44330fe1e6493f756f252d145323dd17ab6b48733ff6c0a"}, + {file = "regex-2024.9.11-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8dee5b4810a89447151999428fe096977346cf2f29f4d5e29609d2e19e0199c9"}, + {file = "regex-2024.9.11-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:98eeee2f2e63edae2181c886d7911ce502e1292794f4c5ee71e60e23e8d26b5d"}, + {file = "regex-2024.9.11-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:57fdd2e0b2694ce6fc2e5ccf189789c3e2962916fb38779d3e3521ff8fe7a822"}, + {file = "regex-2024.9.11-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:d552c78411f60b1fdaafd117a1fca2f02e562e309223b9d44b7de8be451ec5e0"}, + {file = "regex-2024.9.11-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:a0b2b80321c2ed3fcf0385ec9e51a12253c50f146fddb2abbb10f033fe3d049a"}, + {file = "regex-2024.9.11-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:18406efb2f5a0e57e3a5881cd9354c1512d3bb4f5c45d96d110a66114d84d23a"}, + {file = "regex-2024.9.11-cp312-cp312-win32.whl", hash = "sha256:e464b467f1588e2c42d26814231edecbcfe77f5ac414d92cbf4e7b55b2c2a776"}, + {file = "regex-2024.9.11-cp312-cp312-win_amd64.whl", hash = "sha256:9e8719792ca63c6b8340380352c24dcb8cd7ec49dae36e963742a275dfae6009"}, + {file = "regex-2024.9.11-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:c157bb447303070f256e084668b702073db99bbb61d44f85d811025fcf38f784"}, + {file = "regex-2024.9.11-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:4db21ece84dfeefc5d8a3863f101995de646c6cb0536952c321a2650aa202c36"}, + {file = "regex-2024.9.11-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:220e92a30b426daf23bb67a7962900ed4613589bab80382be09b48896d211e92"}, + {file = "regex-2024.9.11-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eb1ae19e64c14c7ec1995f40bd932448713d3c73509e82d8cd7744dc00e29e86"}, + {file = "regex-2024.9.11-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f47cd43a5bfa48f86925fe26fbdd0a488ff15b62468abb5d2a1e092a4fb10e85"}, + {file = "regex-2024.9.11-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9d4a76b96f398697fe01117093613166e6aa8195d63f1b4ec3f21ab637632963"}, + {file = "regex-2024.9.11-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ea51dcc0835eea2ea31d66456210a4e01a076d820e9039b04ae8d17ac11dee6"}, + {file = "regex-2024.9.11-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7aaa315101c6567a9a45d2839322c51c8d6e81f67683d529512f5bcfb99c802"}, + {file = "regex-2024.9.11-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:c57d08ad67aba97af57a7263c2d9006d5c404d721c5f7542f077f109ec2a4a29"}, + {file = "regex-2024.9.11-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:f8404bf61298bb6f8224bb9176c1424548ee1181130818fcd2cbffddc768bed8"}, + {file = "regex-2024.9.11-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:dd4490a33eb909ef5078ab20f5f000087afa2a4daa27b4c072ccb3cb3050ad84"}, + {file = "regex-2024.9.11-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:eee9130eaad130649fd73e5cd92f60e55708952260ede70da64de420cdcad554"}, + {file = "regex-2024.9.11-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6a2644a93da36c784e546de579ec1806bfd2763ef47babc1b03d765fe560c9f8"}, + {file = "regex-2024.9.11-cp313-cp313-win32.whl", hash = "sha256:e997fd30430c57138adc06bba4c7c2968fb13d101e57dd5bb9355bf8ce3fa7e8"}, + {file = "regex-2024.9.11-cp313-cp313-win_amd64.whl", hash = "sha256:042c55879cfeb21a8adacc84ea347721d3d83a159da6acdf1116859e2427c43f"}, + {file = "regex-2024.9.11-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:35f4a6f96aa6cb3f2f7247027b07b15a374f0d5b912c0001418d1d55024d5cb4"}, + {file = "regex-2024.9.11-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:55b96e7ce3a69a8449a66984c268062fbaa0d8ae437b285428e12797baefce7e"}, + {file = "regex-2024.9.11-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:cb130fccd1a37ed894824b8c046321540263013da72745d755f2d35114b81a60"}, + {file = "regex-2024.9.11-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:323c1f04be6b2968944d730e5c2091c8c89767903ecaa135203eec4565ed2b2b"}, + {file = "regex-2024.9.11-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:be1c8ed48c4c4065ecb19d882a0ce1afe0745dfad8ce48c49586b90a55f02366"}, + {file = "regex-2024.9.11-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b5b029322e6e7b94fff16cd120ab35a253236a5f99a79fb04fda7ae71ca20ae8"}, + {file = "regex-2024.9.11-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f6fff13ef6b5f29221d6904aa816c34701462956aa72a77f1f151a8ec4f56aeb"}, + {file = "regex-2024.9.11-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:587d4af3979376652010e400accc30404e6c16b7df574048ab1f581af82065e4"}, + {file = "regex-2024.9.11-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:079400a8269544b955ffa9e31f186f01d96829110a3bf79dc338e9910f794fca"}, + {file = "regex-2024.9.11-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:f9268774428ec173654985ce55fc6caf4c6d11ade0f6f914d48ef4719eb05ebb"}, + {file = "regex-2024.9.11-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:23f9985c8784e544d53fc2930fc1ac1a7319f5d5332d228437acc9f418f2f168"}, + {file = "regex-2024.9.11-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:ae2941333154baff9838e88aa71c1d84f4438189ecc6021a12c7573728b5838e"}, + {file = "regex-2024.9.11-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:e93f1c331ca8e86fe877a48ad64e77882c0c4da0097f2212873a69bbfea95d0c"}, + {file = "regex-2024.9.11-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:846bc79ee753acf93aef4184c040d709940c9d001029ceb7b7a52747b80ed2dd"}, + {file = "regex-2024.9.11-cp38-cp38-win32.whl", hash = "sha256:c94bb0a9f1db10a1d16c00880bdebd5f9faf267273b8f5bd1878126e0fbde771"}, + {file = "regex-2024.9.11-cp38-cp38-win_amd64.whl", hash = "sha256:2b08fce89fbd45664d3df6ad93e554b6c16933ffa9d55cb7e01182baaf971508"}, + {file = "regex-2024.9.11-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:07f45f287469039ffc2c53caf6803cd506eb5f5f637f1d4acb37a738f71dd066"}, + {file = "regex-2024.9.11-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4838e24ee015101d9f901988001038f7f0d90dc0c3b115541a1365fb439add62"}, + {file = "regex-2024.9.11-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:6edd623bae6a737f10ce853ea076f56f507fd7726bee96a41ee3d68d347e4d16"}, + {file = "regex-2024.9.11-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c69ada171c2d0e97a4b5aa78fbb835e0ffbb6b13fc5da968c09811346564f0d3"}, + {file = "regex-2024.9.11-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:02087ea0a03b4af1ed6ebab2c54d7118127fee8d71b26398e8e4b05b78963199"}, + {file = "regex-2024.9.11-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:69dee6a020693d12a3cf892aba4808fe168d2a4cef368eb9bf74f5398bfd4ee8"}, + {file = "regex-2024.9.11-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:297f54910247508e6e5cae669f2bc308985c60540a4edd1c77203ef19bfa63ca"}, + {file = "regex-2024.9.11-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ecea58b43a67b1b79805f1a0255730edaf5191ecef84dbc4cc85eb30bc8b63b9"}, + {file = "regex-2024.9.11-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:eab4bb380f15e189d1313195b062a6aa908f5bd687a0ceccd47c8211e9cf0d4a"}, + {file = "regex-2024.9.11-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:0cbff728659ce4bbf4c30b2a1be040faafaa9eca6ecde40aaff86f7889f4ab39"}, + {file = "regex-2024.9.11-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:54c4a097b8bc5bb0dfc83ae498061d53ad7b5762e00f4adaa23bee22b012e6ba"}, + {file = "regex-2024.9.11-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:73d6d2f64f4d894c96626a75578b0bf7d9e56dcda8c3d037a2118fdfe9b1c664"}, + {file = "regex-2024.9.11-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:e53b5fbab5d675aec9f0c501274c467c0f9a5d23696cfc94247e1fb56501ed89"}, + {file = "regex-2024.9.11-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:0ffbcf9221e04502fc35e54d1ce9567541979c3fdfb93d2c554f0ca583a19b35"}, + {file = "regex-2024.9.11-cp39-cp39-win32.whl", hash = "sha256:e4c22e1ac1f1ec1e09f72e6c44d8f2244173db7eb9629cc3a346a8d7ccc31142"}, + {file = "regex-2024.9.11-cp39-cp39-win_amd64.whl", hash = "sha256:faa3c142464efec496967359ca99696c896c591c56c53506bac1ad465f66e919"}, + {file = "regex-2024.9.11.tar.gz", hash = "sha256:6c188c307e8433bcb63dc1915022deb553b4203a70722fc542c363bf120a01fd"}, ] [[package]] diff --git a/web_src/fomantic/package-lock.json b/web_src/fomantic/package-lock.json index f3d6d42d17..2401294105 100644 --- a/web_src/fomantic/package-lock.json +++ b/web_src/fomantic/package-lock.json @@ -44,9 +44,9 @@ } }, "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "license": "MIT", "engines": { "node": ">=12" @@ -492,9 +492,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.4.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.4.0.tgz", - "integrity": "sha512-49AbMDwYUz7EXxKU/r7mXOsxwFr4BYbvB7tWYxVuLdb2ibd30ijjXINSMAHiEEZk5PCRBmW1gUeisn2VMKt3cQ==", + "version": "22.5.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.5.tgz", + "integrity": "sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==", "license": "MIT", "dependencies": { "undici-types": "~6.19.2" @@ -1219,9 +1219,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001651", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz", - "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==", + "version": "1.0.30001660", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz", + "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==", "funding": [ { "type": "opencollective", @@ -1277,7 +1277,6 @@ "version": "2.1.8", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", - "deprecated": "Chokidar 2 does not receive security updates since 2019. Upgrade to chokidar 3 with 15x fewer dependencies", "license": "MIT", "dependencies": { "anymatch": "^2.0.0", @@ -1962,9 +1961,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.11", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.11.tgz", - "integrity": "sha512-R1CccCDYqndR25CaXFd6hp/u9RaaMcftMkphmvuepXr5b1vfLkRml6aWVeBhXJ7rbevHkKEMJtz8XqPf7ffmew==", + "version": "1.5.23", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.23.tgz", + "integrity": "sha512-mBhODedOXg4v5QWwl21DjM5amzjmI1zw9EPrPK/5Wx7C8jt33bpZNrC7OhHUG3pxRtbLpr3W2dXT+Ph1SsfRZA==", "license": "ISC" }, "node_modules/emoji-regex": { @@ -2078,9 +2077,9 @@ } }, "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "license": "MIT", "engines": { "node": ">=6" @@ -2700,9 +2699,9 @@ } }, "node_modules/get-stream/node_modules/pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", + "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", "license": "MIT", "dependencies": { "end-of-stream": "^1.1.0", @@ -4105,9 +4104,9 @@ } }, "node_modules/gulp-uglify/node_modules/uglify-js": { - "version": "3.19.2", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.2.tgz", - "integrity": "sha512-S8KA6DDI47nQXJSi2ctQ629YzwOVs+bQML6DAtvy0wgNdpi+0ySpQK0g2pxBq2xfF2z3YCscu7NNA8nXT9PlIQ==", + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", + "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", "license": "BSD-2-Clause", "bin": { "uglifyjs": "bin/uglifyjs" @@ -4620,9 +4619,9 @@ "license": "MIT" }, "node_modules/is-core-module": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz", - "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", + "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", "license": "MIT", "dependencies": { "hasown": "^2.0.2" @@ -5836,9 +5835,9 @@ } }, "node_modules/native-request": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.1.0.tgz", - "integrity": "sha512-uZ5rQaeRn15XmpgE0xoPL8YWqcX90VtCFglYwAgkvKM5e8fog+vePLAhHxuuv/gRkrQxIeh5U3q9sMNUrENqWw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.1.2.tgz", + "integrity": "sha512-/etjwrK0J4Ebbcnt35VMWnfiUX/B04uwGJxyJInagxDqf2z5drSt/lsOvEMWGYunz1kaLZAFrV4NDAbOoDKvAQ==", "license": "MIT", "optional": true }, @@ -7415,9 +7414,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.18", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz", - "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==", + "version": "3.0.20", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz", + "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==", "license": "CC0-1.0" }, "node_modules/split-string": { @@ -8132,9 +8131,9 @@ } }, "node_modules/undici-types": { - "version": "6.19.6", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.6.tgz", - "integrity": "sha512-e/vggGopEfTKSvj4ihnOLTsqhrKRN3LeO6qSN/GxohhuRv8qH9bNQ4B8W7e/vFL+0XTnmHPB4/kegunZGA4Org==", + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", "license": "MIT" }, "node_modules/union-value": { @@ -8260,9 +8259,9 @@ } }, "node_modules/update-browserslist-db/node_modules/picocolors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", - "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", "license": "ISC" }, "node_modules/urix": { From 1e5f7d211653372fa8b262623d14b04c91be9c2e Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 16 Sep 2024 08:33:39 +0200 Subject: [PATCH 024/443] chore: fix lint error --- tests/e2e/shared/forms.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/shared/forms.js b/tests/e2e/shared/forms.js index 7340dc60ff..0ffd6eef2d 100644 --- a/tests/e2e/shared/forms.js +++ b/tests/e2e/shared/forms.js @@ -1,5 +1,5 @@ import {expect} from '@playwright/test'; -import AxeBuilder from '@axe-core/playwright'; +import {AxeBuilder} from '@axe-core/playwright'; export async function validate_form({page}, scope) { scope ??= 'form'; From e1a9ad600b31c1c2af563720423e282baa60f707 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 25 Sep 2024 09:03:00 +0000 Subject: [PATCH 025/443] Update dependency tailwindcss to v3.4.13 (forgejo) (#5345) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5345 Reviewed-by: Michael Kriese Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index fe848ce5ad..e23a87edc5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "pretty-ms": "9.0.0", "sortablejs": "1.15.3", "swagger-ui-dist": "5.17.14", - "tailwindcss": "3.4.11", + "tailwindcss": "3.4.13", "temporal-polyfill": "0.2.4", "throttle-debounce": "5.0.0", "tinycolor2": "1.6.0", @@ -15211,9 +15211,9 @@ } }, "node_modules/tailwindcss": { - "version": "3.4.11", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.11.tgz", - "integrity": "sha512-qhEuBcLemjSJk5ajccN9xJFtM/h0AVCPaA6C92jNP+M2J8kX+eMJHI7R2HFKUvvAsMpcfLILMCFYSeDwpMmlUg==", + "version": "3.4.13", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.13.tgz", + "integrity": "sha512-KqjHOJKogOUt5Bs752ykCeiwvi0fKVkr5oqsFNt/8px/tA8scFPIlkygsf6jXrfCqGHz7VflA6+yytWuM+XhFw==", "license": "MIT", "dependencies": { "@alloc/quick-lru": "^5.2.0", diff --git a/package.json b/package.json index fd083ea6f4..b29f80de50 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "pretty-ms": "9.0.0", "sortablejs": "1.15.3", "swagger-ui-dist": "5.17.14", - "tailwindcss": "3.4.11", + "tailwindcss": "3.4.13", "temporal-polyfill": "0.2.4", "throttle-debounce": "5.0.0", "tinycolor2": "1.6.0", From e1566d2a1f4c3030ff10071d79bf37e4b0a6e016 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 25 Sep 2024 09:03:29 +0000 Subject: [PATCH 026/443] Update dependency mermaid to v11.2.1 (forgejo) (#5338) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5338 Reviewed-by: Michael Kriese Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index e23a87edc5..0c92ceff22 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "idiomorph": "0.3.0", "jquery": "3.7.1", "katex": "0.16.11", - "mermaid": "11.2.0", + "mermaid": "11.2.1", "mini-css-extract-plugin": "2.9.1", "minimatch": "10.0.1", "monaco-editor": "0.50.0", @@ -11952,9 +11952,9 @@ } }, "node_modules/mermaid": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.2.0.tgz", - "integrity": "sha512-ZinOa063lk81lujX8vkINNqmFaNMk1A95Z4kCL7fE6QLAi01CxeiUJVw+tpXU+lAM73utO39G+2PLjxS2GYS/w==", + "version": "11.2.1", + "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.2.1.tgz", + "integrity": "sha512-F8TEaLVVyxTUmvKswVFyOkjPrlJA5h5vNR1f7ZnSWSpqxgEZG1hggtn/QCa7znC28bhlcrNh10qYaIiill7q4A==", "license": "MIT", "dependencies": { "@braintree/sanitize-url": "^7.0.1", diff --git a/package.json b/package.json index b29f80de50..3bba4b8ab7 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "idiomorph": "0.3.0", "jquery": "3.7.1", "katex": "0.16.11", - "mermaid": "11.2.0", + "mermaid": "11.2.1", "mini-css-extract-plugin": "2.9.1", "minimatch": "10.0.1", "monaco-editor": "0.50.0", From 68cade5b1d7861e53cfc1f3a2bb71995463fbd29 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 25 Sep 2024 09:04:07 +0000 Subject: [PATCH 027/443] Update dependency @vitejs/plugin-vue to v5.1.4 (forgejo) (#5350) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5350 Reviewed-by: Michael Kriese Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0c92ceff22..7dd1cba03a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -66,7 +66,7 @@ "@stoplight/spectral-cli": "6.13.1", "@stylistic/eslint-plugin-js": "2.8.0", "@stylistic/stylelint-plugin": "3.0.1", - "@vitejs/plugin-vue": "5.1.3", + "@vitejs/plugin-vue": "5.1.4", "@vitest/coverage-v8": "2.1.1", "@vitest/eslint-plugin": "1.0.0", "@vue/test-utils": "2.4.6", @@ -4796,9 +4796,9 @@ "license": "ISC" }, "node_modules/@vitejs/plugin-vue": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.1.3.tgz", - "integrity": "sha512-3xbWsKEKXYlmX82aOHufFQVnkbMC/v8fLpWwh6hWOUrK5fbbtBh9Q/WWse27BFgSy2/e2c0fz5Scgya9h2GLhw==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.1.4.tgz", + "integrity": "sha512-N2XSI2n3sQqp5w7Y/AN/L2XDjBIRGqXko+eDp42sydYSBeJuSm5a1sLf8zakmo8u7tA8NmBgoDLA1HeOESjp9A==", "dev": true, "license": "MIT", "engines": { diff --git a/package.json b/package.json index 3bba4b8ab7..12c6a05c12 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "@stoplight/spectral-cli": "6.13.1", "@stylistic/eslint-plugin-js": "2.8.0", "@stylistic/stylelint-plugin": "3.0.1", - "@vitejs/plugin-vue": "5.1.3", + "@vitejs/plugin-vue": "5.1.4", "@vitest/coverage-v8": "2.1.1", "@vitest/eslint-plugin": "1.0.0", "@vue/test-utils": "2.4.6", From f0dab9cc0597dc357ed723438a3e9cfd238b917d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 25 Sep 2024 09:10:00 +0000 Subject: [PATCH 028/443] Update module code.forgejo.org/forgejo/act to v1.21.3 (forgejo) (#5333) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5333 Reviewed-by: Michael Kriese Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9566af1d37..3f7bb9d7ce 100644 --- a/go.mod +++ b/go.mod @@ -293,6 +293,6 @@ replace github.com/hashicorp/go-version => github.com/6543/go-version v1.3.1 replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142115-2c99e1ffdfa0 -replace github.com/nektos/act => code.forgejo.org/forgejo/act v1.21.2 +replace github.com/nektos/act => code.forgejo.org/forgejo/act v1.21.3 replace github.com/mholt/archiver/v3 => code.forgejo.org/forgejo/archiver/v3 v3.5.1 diff --git a/go.sum b/go.sum index bdfde0a499..a8f4ff066f 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,8 @@ code.forgejo.org/f3/gof3/v3 v3.7.0 h1:ZfuCP8CGm8ZJbWmL+V0pUu3E0X4FCAA7GfRDy/y5/K code.forgejo.org/f3/gof3/v3 v3.7.0/go.mod h1:oNhOeqD4DZYjVcNjQXIOdDX9b/1tqxi9ITLS8H9/Csw= code.forgejo.org/forgejo-contrib/go-libravatar v0.0.0-20191008002943-06d1c002b251 h1:HTZl3CBk3ABNYtFI6TPLvJgGKFIhKT5CBk0sbOtkDKU= code.forgejo.org/forgejo-contrib/go-libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1:PphB88CPbx601QrWPMZATeorACeVmQlyv3u+uUMbSaM= -code.forgejo.org/forgejo/act v1.21.2 h1:LERMtDNZDFXOYYYSU7Yduyyz7sN0t/Xnc1wFlupweiE= -code.forgejo.org/forgejo/act v1.21.2/go.mod h1:+PcvJ9iv+NTFeJSh79ra9Jbk9l0vvyA9D9me5/dbxYM= +code.forgejo.org/forgejo/act v1.21.3 h1:EeJbrz0aar2QhIcBlOW5gjK1rjrQxcAvQSPpG/R1h5w= +code.forgejo.org/forgejo/act v1.21.3/go.mod h1:+PcvJ9iv+NTFeJSh79ra9Jbk9l0vvyA9D9me5/dbxYM= code.forgejo.org/forgejo/archiver/v3 v3.5.1 h1:UmmbA7D5550uf71SQjarmrn6yKwOGxtEjb3jaYYtmSE= code.forgejo.org/forgejo/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4= code.forgejo.org/forgejo/reply v1.0.2 h1:dMhQCHV6/O3L5CLWNTol+dNzDAuyCK88z4J/lCdgFuQ= From cd7f92797b6ce3191ffec9524d7e2e979f94b812 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 25 Sep 2024 11:10:39 +0200 Subject: [PATCH 029/443] start of the v10.0 development branch --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 2edc449177..0c4becacc4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -

Welcome to Forgejo

From a9f9b94478970725c15d339e4287469f55b085c9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 26 Sep 2024 00:04:54 +0000 Subject: [PATCH 030/443] Update citation-js monorepo --- package-lock.json | 16 ++++++++-------- package.json | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7dd1cba03a..616a2caf65 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,8 +5,8 @@ "packages": { "": { "dependencies": { - "@citation-js/core": "0.7.11", - "@citation-js/plugin-bibtex": "0.7.11", + "@citation-js/core": "0.7.14", + "@citation-js/plugin-bibtex": "0.7.16", "@citation-js/plugin-software-formats": "0.6.1", "@github/markdown-toolbar-element": "2.2.3", "@github/relative-time-element": "4.4.3", @@ -2298,9 +2298,9 @@ "license": "Apache-2.0" }, "node_modules/@citation-js/core": { - "version": "0.7.11", - "resolved": "https://registry.npmjs.org/@citation-js/core/-/core-0.7.11.tgz", - "integrity": "sha512-evQtyzeW+Gbmq+xWciIq9sbcvXXDbm8q32orD/HDd5ay6RQFKoW/BKxBLp+Nmpxgspb9sxTJn3iFK7+jxOTNTw==", + "version": "0.7.14", + "resolved": "https://registry.npmjs.org/@citation-js/core/-/core-0.7.14.tgz", + "integrity": "sha512-dgeGqYDSQmn2MtnWZkwPGpJQPh43yr1lAAr9jl1NJ9pIY1RXUQxtlAUZVur0V9PHdbfQC+kkvB1KC3VpgVV3MA==", "license": "MIT", "dependencies": { "@citation-js/date": "^0.5.0", @@ -2331,9 +2331,9 @@ } }, "node_modules/@citation-js/plugin-bibtex": { - "version": "0.7.11", - "resolved": "https://registry.npmjs.org/@citation-js/plugin-bibtex/-/plugin-bibtex-0.7.11.tgz", - "integrity": "sha512-G4vEmLjrQUxgBIp3ffWN5dDOlwjPsrRSi/uTyxDJuFgKBD8GR1eO7Y/ZcePNAOHMqUxG7lxhhBbZJwcJZNVHYw==", + "version": "0.7.16", + "resolved": "https://registry.npmjs.org/@citation-js/plugin-bibtex/-/plugin-bibtex-0.7.16.tgz", + "integrity": "sha512-Udeli19VAoFjOw0H1bB1KgmekRoW6XP5cdR3OQF5c2Mt1tZatXWcSQVdq+FeLKzodRocZXG5NFRvjyUZjVbV6A==", "license": "MIT", "dependencies": { "@citation-js/date": "^0.5.0", diff --git a/package.json b/package.json index 12c6a05c12..7195994cb2 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "node": ">= 18.0.0" }, "dependencies": { - "@citation-js/core": "0.7.11", - "@citation-js/plugin-bibtex": "0.7.11", + "@citation-js/core": "0.7.14", + "@citation-js/plugin-bibtex": "0.7.16", "@citation-js/plugin-software-formats": "0.6.1", "@github/markdown-toolbar-element": "2.2.3", "@github/relative-time-element": "4.4.3", From ed656ca0f301b748aa141ba882f9474fe8e7c7bf Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 26 Sep 2024 00:05:12 +0000 Subject: [PATCH 031/443] Update dependency @github/text-expander-element to v2.7.2 --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7dd1cba03a..d44168a89d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "@citation-js/plugin-software-formats": "0.6.1", "@github/markdown-toolbar-element": "2.2.3", "@github/relative-time-element": "4.4.3", - "@github/text-expander-element": "2.7.1", + "@github/text-expander-element": "2.7.2", "@mcaptcha/vanilla-glue": "0.1.0-alpha-3", "@primer/octicons": "19.9.0", "ansi_up": "6.0.2", @@ -3124,13 +3124,13 @@ "license": "MIT" }, "node_modules/@github/text-expander-element": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/@github/text-expander-element/-/text-expander-element-2.7.1.tgz", - "integrity": "sha512-CWxfYxJRkeWVCUhJveproLs6pHsPrWtK8TsjL8ByYVcSCs8CJmNzF8b7ZawrUgfai0F2jb4aIdw2FoBTykj9XA==", + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/@github/text-expander-element/-/text-expander-element-2.7.2.tgz", + "integrity": "sha512-eTIOUQKoBxe+e0yHKHQHoo4x61Erb7m0lhi2vMRHZS7TwI6OCGSj/3YydAr3obbQbZjevF9wPihLf1wADu3A9g==", "license": "MIT", "dependencies": { "@github/combobox-nav": "^2.0.2", - "dom-input-range": "^1.1.6" + "dom-input-range": "^1.2.0" } }, "node_modules/@humanwhocodes/config-array": { @@ -7461,9 +7461,9 @@ } }, "node_modules/dom-input-range": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/dom-input-range/-/dom-input-range-1.1.6.tgz", - "integrity": "sha512-4o/SkTpscD0n81BeErrrtmE58lG8vTks++92vk//ld0NmkQTb4AVJ2rexh2yor6rtBf5IMte26u+fF3EgCppPQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/dom-input-range/-/dom-input-range-1.2.0.tgz", + "integrity": "sha512-8HVA5Oy5Vt872S7IXsjjp6/5Hqsm5YZLhurxwwQXp80T9qVsj8/mEUH3sQlFujLLUoWfxiaThHHuJ3/q1MHVuA==", "license": "MIT", "workspaces": [ "demos" diff --git a/package.json b/package.json index 12c6a05c12..b7310d05c4 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "@citation-js/plugin-software-formats": "0.6.1", "@github/markdown-toolbar-element": "2.2.3", "@github/relative-time-element": "4.4.3", - "@github/text-expander-element": "2.7.1", + "@github/text-expander-element": "2.7.2", "@mcaptcha/vanilla-glue": "0.1.0-alpha-3", "@primer/octicons": "19.9.0", "ansi_up": "6.0.2", From 7fbe6b4dc391e984e476a07dc8955ee93944c734 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 26 Sep 2024 02:03:41 +0000 Subject: [PATCH 032/443] Update module github.com/klauspost/compress to v1.17.10 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3f7bb9d7ce..7fe2490193 100644 --- a/go.mod +++ b/go.mod @@ -66,7 +66,7 @@ require ( github.com/jhillyerd/enmime v1.3.0 github.com/json-iterator/go v1.1.12 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 - github.com/klauspost/compress v1.17.9 + github.com/klauspost/compress v1.17.10 github.com/klauspost/cpuid/v2 v2.2.8 github.com/lib/pq v1.10.9 github.com/markbates/goth v1.80.0 diff --git a/go.sum b/go.sum index a8f4ff066f..97663e3fd9 100644 --- a/go.sum +++ b/go.sum @@ -448,8 +448,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= -github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0= +github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c= From 76c6b342702f76061fe6549546204d6207b3a7df Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 26 Sep 2024 02:03:56 +0000 Subject: [PATCH 033/443] Update module github.com/minio/minio-go/v7 to v7.0.77 --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 3f7bb9d7ce..87ccc0669b 100644 --- a/go.mod +++ b/go.mod @@ -75,7 +75,7 @@ require ( github.com/meilisearch/meilisearch-go v0.28.0 github.com/mholt/archiver/v3 v3.5.1 github.com/microcosm-cc/bluemonday v1.0.27 - github.com/minio/minio-go/v7 v7.0.74 + github.com/minio/minio-go/v7 v7.0.77 github.com/msteinert/pam v1.2.0 github.com/nektos/act v0.2.52 github.com/niklasfasching/go-org v1.7.0 @@ -250,7 +250,7 @@ require ( github.com/rhysd/actionlint v1.6.27 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect - github.com/rs/xid v1.5.0 // indirect + github.com/rs/xid v1.6.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect diff --git a/go.sum b/go.sum index a8f4ff066f..f5e0e87bd5 100644 --- a/go.sum +++ b/go.sum @@ -502,8 +502,8 @@ github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs= github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= -github.com/minio/minio-go/v7 v7.0.74 h1:fTo/XlPBTSpo3BAMshlwKL5RspXRv9us5UeHEGYCFe0= -github.com/minio/minio-go/v7 v7.0.74/go.mod h1:qydcVzV8Hqtj1VtEocfxbmVFa2siu6HGa+LDEPogjD8= +github.com/minio/minio-go/v7 v7.0.77 h1:GaGghJRg9nwDVlNbwYjSDJT1rqltQkBFDsypWX1v3Bw= +github.com/minio/minio-go/v7 v7.0.77/go.mod h1:AVM3IUN6WwKzmwBxVdjzhH8xq+f57JSbbvzqvUzR6eg= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= @@ -599,8 +599,8 @@ github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc= -github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= +github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= From d00099390539621317cd39f0ca2c100467ade4b5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 27 Sep 2024 00:04:48 +0000 Subject: [PATCH 034/443] Update dependency @stylistic/stylelint-plugin to v3.1.0 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7a537c3fc0..3e4c8451fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -65,7 +65,7 @@ "@playwright/test": "1.47.2", "@stoplight/spectral-cli": "6.13.1", "@stylistic/eslint-plugin-js": "2.8.0", - "@stylistic/stylelint-plugin": "3.0.1", + "@stylistic/stylelint-plugin": "3.1.0", "@vitejs/plugin-vue": "5.1.4", "@vitest/coverage-v8": "2.1.1", "@vitest/eslint-plugin": "1.0.0", @@ -4441,15 +4441,15 @@ } }, "node_modules/@stylistic/stylelint-plugin": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@stylistic/stylelint-plugin/-/stylelint-plugin-3.0.1.tgz", - "integrity": "sha512-j3mH8HSw2Rob/KJFWZ627w3CQ8gQqVHtzCdPeEffUg5vOgpz4rgrR+Xw2kU0OQCDcdW8Y1nKfdXKKjM5Rn8X0g==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@stylistic/stylelint-plugin/-/stylelint-plugin-3.1.0.tgz", + "integrity": "sha512-NU2XR6i1x163KdyDj3zqblA13890fBzHNZYqZ13aor/sB3Yq8kU/0NKCudv5pfl9Kb/UAteo/D7vKMHtaror/A==", "dev": true, "license": "MIT", "dependencies": { - "@csstools/css-parser-algorithms": "^3.0.0", - "@csstools/css-tokenizer": "^3.0.0", - "@csstools/media-query-list-parser": "^3.0.0", + "@csstools/css-parser-algorithms": "^3.0.1", + "@csstools/css-tokenizer": "^3.0.1", + "@csstools/media-query-list-parser": "^3.0.1", "is-plain-object": "^5.0.0", "postcss-selector-parser": "^6.1.2", "postcss-value-parser": "^4.2.0", diff --git a/package.json b/package.json index 085d10dfca..22290825d8 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "@playwright/test": "1.47.2", "@stoplight/spectral-cli": "6.13.1", "@stylistic/eslint-plugin-js": "2.8.0", - "@stylistic/stylelint-plugin": "3.0.1", + "@stylistic/stylelint-plugin": "3.1.0", "@vitejs/plugin-vue": "5.1.4", "@vitest/coverage-v8": "2.1.1", "@vitest/eslint-plugin": "1.0.0", From 757080addd67397d474470fdd1c7ec7723cb894d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 27 Sep 2024 02:03:09 +0000 Subject: [PATCH 035/443] Update dependency @vitest/eslint-plugin to v1.1.4 --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7a537c3fc0..14df46c898 100644 --- a/package-lock.json +++ b/package-lock.json @@ -68,7 +68,7 @@ "@stylistic/stylelint-plugin": "3.0.1", "@vitejs/plugin-vue": "5.1.4", "@vitest/coverage-v8": "2.1.1", - "@vitest/eslint-plugin": "1.0.0", + "@vitest/eslint-plugin": "1.1.4", "@vue/test-utils": "2.4.6", "eslint": "8.57.1", "eslint-plugin-array-func": "4.0.0", @@ -4853,13 +4853,13 @@ } }, "node_modules/@vitest/eslint-plugin": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@vitest/eslint-plugin/-/eslint-plugin-1.0.0.tgz", - "integrity": "sha512-YQSFGYrD+eAa2QqdL8v4WAG3yYhcfW3LGlPdNRcjbF1etX0xUfI4isE+U+tYjQuVVzHG4KccRg1F8UuveFVdfg==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@vitest/eslint-plugin/-/eslint-plugin-1.1.4.tgz", + "integrity": "sha512-kudjgefmJJ7xQ2WfbUU6pZbm7Ou4gLYRaao/8Ynide3G0QhVKHd978sDyWX4KOH0CCMH9cyrGAkFd55eGzJ48Q==", "dev": true, "license": "MIT", "peerDependencies": { - "@typescript-eslint/utils": ">= 7.8 || 8.0.0", + "@typescript-eslint/utils": ">= 8.0", "eslint": ">= 8.57.0", "typescript": ">= 5.0.0", "vitest": "*" diff --git a/package.json b/package.json index 085d10dfca..9c995c84b0 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "@stylistic/stylelint-plugin": "3.0.1", "@vitejs/plugin-vue": "5.1.4", "@vitest/coverage-v8": "2.1.1", - "@vitest/eslint-plugin": "1.0.0", + "@vitest/eslint-plugin": "1.1.4", "@vue/test-utils": "2.4.6", "eslint": "8.57.1", "eslint-plugin-array-func": "4.0.0", From 70014a7bc913cdd100bcf13d3f33c20718cd327c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 27 Sep 2024 02:03:21 +0000 Subject: [PATCH 036/443] Update dependency markdownlint-cli to v0.42.0 --- package-lock.json | 113 ++++++++++++++++++++++++++++++++-------------- package.json | 2 +- 2 files changed, 79 insertions(+), 36 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7a537c3fc0..d045caeb93 100644 --- a/package-lock.json +++ b/package-lock.json @@ -86,7 +86,7 @@ "eslint-plugin-wc": "2.1.1", "happy-dom": "15.7.4", "license-checker-rseidelsohn": "4.4.2", - "markdownlint-cli": "0.41.0", + "markdownlint-cli": "0.42.0", "postcss-html": "1.7.0", "stylelint": "16.9.0", "stylelint-declaration-block-no-ignored-properties": "2.8.0", @@ -11777,14 +11777,14 @@ } }, "node_modules/markdownlint": { - "version": "0.34.0", - "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.34.0.tgz", - "integrity": "sha512-qwGyuyKwjkEMOJ10XN6OTKNOVYvOIi35RNvDLNxTof5s8UmyGHlCdpngRHoRGNvQVGuxO3BJ7uNSgdeX166WXw==", + "version": "0.35.0", + "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.35.0.tgz", + "integrity": "sha512-wgp8yesWjFBL7bycA3hxwHRdsZGJhjhyP1dSxKVKrza0EPFYtn+mHtkVy6dvP1kGSjovyG5B8yNP6Frj0UFUJg==", "dev": true, "license": "MIT", "dependencies": { "markdown-it": "14.1.0", - "markdownlint-micromark": "0.1.9" + "markdownlint-micromark": "0.1.10" }, "engines": { "node": ">=18" @@ -11794,23 +11794,23 @@ } }, "node_modules/markdownlint-cli": { - "version": "0.41.0", - "resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.41.0.tgz", - "integrity": "sha512-kp29tKrMKdn+xonfefjp3a/MsNzAd9c5ke0ydMEI9PR98bOjzglYN4nfMSaIs69msUf1DNkgevAIAPtK2SeX0Q==", + "version": "0.42.0", + "resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.42.0.tgz", + "integrity": "sha512-AjkzhhZa3TmEGi/CE2Wpmny69x1IrzqK2gPB0k8SmNMRgnSAJfyEO5FgZdWTHtJ6Nrdv5FWt5c4C5pkG6Dk30A==", "dev": true, "license": "MIT", "dependencies": { "commander": "~12.1.0", "get-stdin": "~9.0.0", - "glob": "~10.4.1", - "ignore": "~5.3.1", + "glob": "~11.0.0", + "ignore": "~6.0.2", "js-yaml": "^4.1.0", - "jsonc-parser": "~3.2.1", + "jsonc-parser": "~3.3.1", "jsonpointer": "5.0.1", - "markdownlint": "~0.34.0", - "minimatch": "~9.0.4", + "markdownlint": "~0.35.0", + "minimatch": "~10.0.1", "run-con": "~1.3.2", - "smol-toml": "~1.2.0" + "smol-toml": "~1.3.0" }, "bin": { "markdownlint": "markdownlint.js" @@ -11830,53 +11830,93 @@ } }, "node_modules/markdownlint-cli/node_modules/glob": { - "version": "10.4.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", - "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz", + "integrity": "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==", "dev": true, "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", + "jackspeak": "^4.0.1", + "minimatch": "^10.0.0", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" + "path-scurry": "^2.0.0" }, "bin": { "glob": "dist/esm/bin.mjs" }, + "engines": { + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/markdownlint-cli/node_modules/ignore": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-6.0.2.tgz", + "integrity": "sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/markdownlint-cli/node_modules/jackspeak": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.2.tgz", + "integrity": "sha512-bZsjR/iRjl1Nk1UkjGpAzLNfQtzuijhn2g+pbZb98HQ1Gk8vM9hfbxeMBP+M2/UUdwj0RqGG3mlvk2MsAqwvEw==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "engines": { + "node": "20 || >=22" + }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, "node_modules/markdownlint-cli/node_modules/jsonc-parser": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", - "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", + "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", "dev": true, "license": "MIT" }, - "node_modules/markdownlint-cli/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "node_modules/markdownlint-cli/node_modules/lru-cache": { + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.1.tgz", + "integrity": "sha512-CgeuL5uom6j/ZVrg7G/+1IXqRY8JXX4Hghfy5YE0EhoYQWvndP1kufu58cmZLNIDKnRhZrXfdS9urVWx98AipQ==", "dev": true, "license": "ISC", + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/markdownlint-cli/node_modules/path-scurry": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", + "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==", + "dev": true, + "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^2.0.1" + "lru-cache": "^11.0.0", + "minipass": "^7.1.2" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, "node_modules/markdownlint-micromark": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/markdownlint-micromark/-/markdownlint-micromark-0.1.9.tgz", - "integrity": "sha512-5hVs/DzAFa8XqYosbEAEg6ok6MF2smDj89ztn9pKkCtdKHVdPQuGMH7frFfYL9mLkvfFe4pTyAMffLbjf3/EyA==", + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/markdownlint-micromark/-/markdownlint-micromark-0.1.10.tgz", + "integrity": "sha512-no5ZfdqAdWGxftCLlySHSgddEjyW4kui4z7amQcGsSKfYC5v/ou+8mIQVyg9KQMeEZLNtz9OPDTj7nnTnoR4FQ==", "dev": true, "license": "MIT", "engines": { @@ -14335,13 +14375,16 @@ } }, "node_modules/smol-toml": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.2.2.tgz", - "integrity": "sha512-fVEjX2ybKdJKzFL46VshQbj9PuA4IUKivalgp48/3zwS9vXzyykzQ6AX92UxHSvWJagziMRLeHMgEzoGO7A8hQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.3.0.tgz", + "integrity": "sha512-tWpi2TsODPScmi48b/OQZGi2lgUmBCHy6SZrhi/FdnnHiU1GwebbCfuQuxsC3nHaLwtYeJGPrDZDIeodDOc4pA==", "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">= 18" + }, + "funding": { + "url": "https://github.com/sponsors/cyyynthia" } }, "node_modules/solid-js": { diff --git a/package.json b/package.json index 085d10dfca..18d522f094 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "eslint-plugin-wc": "2.1.1", "happy-dom": "15.7.4", "license-checker-rseidelsohn": "4.4.2", - "markdownlint-cli": "0.41.0", + "markdownlint-cli": "0.42.0", "postcss-html": "1.7.0", "stylelint": "16.9.0", "stylelint-declaration-block-no-ignored-properties": "2.8.0", From 1bdf334844f398d0a2adafc4499cef15f95df6d8 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Sun, 22 Sep 2024 09:28:20 +0200 Subject: [PATCH 037/443] feat: add IfZero utility function (cherry picked from commit 43de021ac1ca017212ec75fd88a8a80a9db27c4c) --- modules/util/util.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/util/util.go b/modules/util/util.go index 0444680228..dcd7cf4f29 100644 --- a/modules/util/util.go +++ b/modules/util/util.go @@ -225,6 +225,15 @@ func Iif[T any](condition bool, trueVal, falseVal T) T { return falseVal } +// IfZero returns "def" if "v" is a zero value, otherwise "v" +func IfZero[T comparable](v, def T) T { + var zero T + if v == zero { + return def + } + return v +} + func ReserveLineBreakForTextarea(input string) string { // Since the content is from a form which is a textarea, the line endings are \r\n. // It's a standard behavior of HTML. From 1ae3b127fc74906f0722caf6486890cf32d23715 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 18 Sep 2024 15:17:25 +0800 Subject: [PATCH 038/443] Refactor CSRF protector (#32057) Remove unused CSRF options, decouple "new csrf protector" and "prepare" logic, do not redirect to home page if CSRF validation falis (it shouldn't happen in daily usage, if it happens, redirecting to home doesn't help either but just makes the problem more complex for "fetch") (cherry picked from commit 1fede04b83288d8a91304a83b7601699bb5cba04) Conflicts: options/locale/locale_en-US.ini tests/integration/repo_branch_test.go trivial context conflicts --- options/locale/locale_en-US.ini | 1 - routers/web/web.go | 2 + services/context/context.go | 6 +- services/context/csrf.go | 192 ++++++++------------------ tests/integration/attachment_test.go | 3 +- tests/integration/csrf_test.go | 26 +--- tests/integration/repo_branch_test.go | 12 +- 7 files changed, 71 insertions(+), 171 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 1631c90ba2..2512fe8b55 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -231,7 +231,6 @@ string.desc = Z - A [error] occurred = An error occurred report_message = If you believe that this is a Forgejo bug, please search for issues on Codeberg or open a new issue if necessary. -invalid_csrf = Bad Request: invalid CSRF token not_found = The target couldn't be found. network_error = Network error server_internal = Internal server error diff --git a/routers/web/web.go b/routers/web/web.go index d174b4e251..39116b882d 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -132,6 +132,8 @@ func webAuth(authMethod auth_service.Method) func(*context.Context) { // ensure the session uid is deleted _ = ctx.Session.Delete("uid") } + + ctx.Csrf.PrepareForSessionUser(ctx) } } diff --git a/services/context/context.go b/services/context/context.go index c0819ab11e..91e7b1849d 100644 --- a/services/context/context.go +++ b/services/context/context.go @@ -127,10 +127,8 @@ func Contexter() func(next http.Handler) http.Handler { csrfOpts := CsrfOptions{ Secret: hex.EncodeToString(setting.GetGeneralTokenSigningSecret()), Cookie: setting.CSRFCookieName, - SetCookie: true, Secure: setting.SessionConfig.Secure, CookieHTTPOnly: setting.CSRFCookieHTTPOnly, - Header: "X-Csrf-Token", CookieDomain: setting.SessionConfig.Domain, CookiePath: setting.SessionConfig.CookiePath, SameSite: setting.SessionConfig.SameSite, @@ -156,7 +154,7 @@ func Contexter() func(next http.Handler) http.Handler { ctx.Base.AppendContextValue(WebContextKey, ctx) ctx.Base.AppendContextValueFunc(gitrepo.RepositoryContextKey, func() any { return ctx.Repo.GitRepo }) - ctx.Csrf = PrepareCSRFProtector(csrfOpts, ctx) + ctx.Csrf = NewCSRFProtector(csrfOpts) // Get the last flash message from cookie lastFlashCookie := middleware.GetSiteCookie(ctx.Req, CookieNameFlash) @@ -193,8 +191,6 @@ func Contexter() func(next http.Handler) http.Handler { ctx.Resp.Header().Set(`X-Frame-Options`, setting.CORSConfig.XFrameOptions) ctx.Data["SystemConfig"] = setting.Config() - ctx.Data["CsrfToken"] = ctx.Csrf.GetToken() - ctx.Data["CsrfTokenHtml"] = template.HTML(``) // FIXME: do we really always need these setting? There should be someway to have to avoid having to always set these ctx.Data["DisableMigrations"] = setting.Repository.DisableMigrations diff --git a/services/context/csrf.go b/services/context/csrf.go index 57c55e6550..5890d53f42 100644 --- a/services/context/csrf.go +++ b/services/context/csrf.go @@ -20,64 +20,42 @@ package context import ( - "encoding/base32" - "fmt" + "html/template" "net/http" "strconv" "time" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web/middleware" +) + +const ( + CsrfHeaderName = "X-Csrf-Token" + CsrfFormName = "_csrf" ) // CSRFProtector represents a CSRF protector and is used to get the current token and validate the token. type CSRFProtector interface { - // GetHeaderName returns HTTP header to search for token. - GetHeaderName() string - // GetFormName returns form value to search for token. - GetFormName() string - // GetToken returns the token. - GetToken() string - // Validate validates the token in http context. + // PrepareForSessionUser prepares the csrf protector for the current session user. + PrepareForSessionUser(ctx *Context) + // Validate validates the csrf token in http context. Validate(ctx *Context) - // DeleteCookie deletes the cookie + // DeleteCookie deletes the csrf cookie DeleteCookie(ctx *Context) } type csrfProtector struct { opt CsrfOptions - // Token generated to pass via header, cookie, or hidden form value. - Token string - // This value must be unique per user. - ID string -} - -// GetHeaderName returns the name of the HTTP header for csrf token. -func (c *csrfProtector) GetHeaderName() string { - return c.opt.Header -} - -// GetFormName returns the name of the form value for csrf token. -func (c *csrfProtector) GetFormName() string { - return c.opt.Form -} - -// GetToken returns the current token. This is typically used -// to populate a hidden form in an HTML template. -func (c *csrfProtector) GetToken() string { - return c.Token + // id must be unique per user. + id string + // token is the valid one which wil be used by end user and passed via header, cookie, or hidden form value. + token string } // CsrfOptions maintains options to manage behavior of Generate. type CsrfOptions struct { // The global secret value used to generate Tokens. Secret string - // HTTP header used to set and get token. - Header string - // Form value used to set and get token. - Form string // Cookie value used to set and get token. Cookie string // Cookie domain. @@ -87,103 +65,64 @@ type CsrfOptions struct { CookieHTTPOnly bool // SameSite set the cookie SameSite type SameSite http.SameSite - // Key used for getting the unique ID per user. - SessionKey string - // oldSessionKey saves old value corresponding to SessionKey. - oldSessionKey string - // If true, send token via X-Csrf-Token header. - SetHeader bool - // If true, send token via _csrf cookie. - SetCookie bool // Set the Secure flag to true on the cookie. Secure bool - // Disallow Origin appear in request header. - Origin bool - // Cookie lifetime. Default is 0 - CookieLifeTime int + // sessionKey is the key used for getting the unique ID per user. + sessionKey string + // oldSessionKey saves old value corresponding to sessionKey. + oldSessionKey string } -func prepareDefaultCsrfOptions(opt CsrfOptions) CsrfOptions { - if opt.Secret == "" { - randBytes, err := util.CryptoRandomBytes(8) - if err != nil { - // this panic can be handled by the recover() in http handlers - panic(fmt.Errorf("failed to generate random bytes: %w", err)) - } - opt.Secret = base32.StdEncoding.EncodeToString(randBytes) - } - if opt.Header == "" { - opt.Header = "X-Csrf-Token" - } - if opt.Form == "" { - opt.Form = "_csrf" - } - if opt.Cookie == "" { - opt.Cookie = "_csrf" - } - if opt.CookiePath == "" { - opt.CookiePath = "/" - } - if opt.SessionKey == "" { - opt.SessionKey = "uid" - } - if opt.CookieLifeTime == 0 { - opt.CookieLifeTime = int(CsrfTokenTimeout.Seconds()) - } - - opt.oldSessionKey = "_old_" + opt.SessionKey - return opt -} - -func newCsrfCookie(c *csrfProtector, value string) *http.Cookie { +func newCsrfCookie(opt *CsrfOptions, value string) *http.Cookie { return &http.Cookie{ - Name: c.opt.Cookie, + Name: opt.Cookie, Value: value, - Path: c.opt.CookiePath, - Domain: c.opt.CookieDomain, - MaxAge: c.opt.CookieLifeTime, - Secure: c.opt.Secure, - HttpOnly: c.opt.CookieHTTPOnly, - SameSite: c.opt.SameSite, + Path: opt.CookiePath, + Domain: opt.CookieDomain, + MaxAge: int(CsrfTokenTimeout.Seconds()), + Secure: opt.Secure, + HttpOnly: opt.CookieHTTPOnly, + SameSite: opt.SameSite, } } -// PrepareCSRFProtector returns a CSRFProtector to be used for every request. -// Additionally, depending on options set, generated tokens will be sent via Header and/or Cookie. -func PrepareCSRFProtector(opt CsrfOptions, ctx *Context) CSRFProtector { - opt = prepareDefaultCsrfOptions(opt) - x := &csrfProtector{opt: opt} - - if opt.Origin && len(ctx.Req.Header.Get("Origin")) > 0 { - return x +func NewCSRFProtector(opt CsrfOptions) CSRFProtector { + if opt.Secret == "" { + panic("CSRF secret is empty but it must be set") // it shouldn't happen because it is always set in code } + opt.Cookie = util.IfZero(opt.Cookie, "_csrf") + opt.CookiePath = util.IfZero(opt.CookiePath, "/") + opt.sessionKey = "uid" + opt.oldSessionKey = "_old_" + opt.sessionKey + return &csrfProtector{opt: opt} +} - x.ID = "0" - uidAny := ctx.Session.Get(opt.SessionKey) - if uidAny != nil { +func (c *csrfProtector) PrepareForSessionUser(ctx *Context) { + c.id = "0" + if uidAny := ctx.Session.Get(c.opt.sessionKey); uidAny != nil { switch uidVal := uidAny.(type) { case string: - x.ID = uidVal + c.id = uidVal case int64: - x.ID = strconv.FormatInt(uidVal, 10) + c.id = strconv.FormatInt(uidVal, 10) default: log.Error("invalid uid type in session: %T", uidAny) } } - oldUID := ctx.Session.Get(opt.oldSessionKey) - uidChanged := oldUID == nil || oldUID.(string) != x.ID - cookieToken := ctx.GetSiteCookie(opt.Cookie) + oldUID := ctx.Session.Get(c.opt.oldSessionKey) + uidChanged := oldUID == nil || oldUID.(string) != c.id + cookieToken := ctx.GetSiteCookie(c.opt.Cookie) needsNew := true if uidChanged { - _ = ctx.Session.Set(opt.oldSessionKey, x.ID) + _ = ctx.Session.Set(c.opt.oldSessionKey, c.id) } else if cookieToken != "" { // If cookie token presents, reuse existing unexpired token, else generate a new one. if issueTime, ok := ParseCsrfToken(cookieToken); ok { dur := time.Since(issueTime) // issueTime is not a monotonic-clock, the server time may change a lot to an early time. if dur >= -CsrfTokenRegenerationInterval && dur <= CsrfTokenRegenerationInterval { - x.Token = cookieToken + c.token = cookieToken needsNew = false } } @@ -191,42 +130,33 @@ func PrepareCSRFProtector(opt CsrfOptions, ctx *Context) CSRFProtector { if needsNew { // FIXME: actionId. - x.Token = GenerateCsrfToken(x.opt.Secret, x.ID, "POST", time.Now()) - if opt.SetCookie { - cookie := newCsrfCookie(x, x.Token) - ctx.Resp.Header().Add("Set-Cookie", cookie.String()) - } + c.token = GenerateCsrfToken(c.opt.Secret, c.id, "POST", time.Now()) + cookie := newCsrfCookie(&c.opt, c.token) + ctx.Resp.Header().Add("Set-Cookie", cookie.String()) } - if opt.SetHeader { - ctx.Resp.Header().Add(opt.Header, x.Token) - } - return x + ctx.Data["CsrfToken"] = c.token + ctx.Data["CsrfTokenHtml"] = template.HTML(``) } func (c *csrfProtector) validateToken(ctx *Context, token string) { - if !ValidCsrfToken(token, c.opt.Secret, c.ID, "POST", time.Now()) { + if !ValidCsrfToken(token, c.opt.Secret, c.id, "POST", time.Now()) { c.DeleteCookie(ctx) - if middleware.IsAPIPath(ctx.Req) { - // currently, there should be no access to the APIPath with CSRF token. because templates shouldn't use the `/api/` endpoints. - http.Error(ctx.Resp, "Invalid CSRF token.", http.StatusBadRequest) - } else { - ctx.Flash.Error(ctx.Tr("error.invalid_csrf")) - ctx.Redirect(setting.AppSubURL + "/") - } + // currently, there should be no access to the APIPath with CSRF token. because templates shouldn't use the `/api/` endpoints. + // FIXME: distinguish what the response is for: HTML (web page) or JSON (fetch) + http.Error(ctx.Resp, "Invalid CSRF token.", http.StatusBadRequest) } } // Validate should be used as a per route middleware. It attempts to get a token from an "X-Csrf-Token" // HTTP header and then a "_csrf" form value. If one of these is found, the token will be validated. -// If this validation fails, custom Error is sent in the reply. -// If neither a header nor form value is found, http.StatusBadRequest is sent. +// If this validation fails, http.StatusBadRequest is sent. func (c *csrfProtector) Validate(ctx *Context) { - if token := ctx.Req.Header.Get(c.GetHeaderName()); token != "" { + if token := ctx.Req.Header.Get(CsrfHeaderName); token != "" { c.validateToken(ctx, token) return } - if token := ctx.Req.FormValue(c.GetFormName()); token != "" { + if token := ctx.Req.FormValue(CsrfFormName); token != "" { c.validateToken(ctx, token) return } @@ -234,9 +164,7 @@ func (c *csrfProtector) Validate(ctx *Context) { } func (c *csrfProtector) DeleteCookie(ctx *Context) { - if c.opt.SetCookie { - cookie := newCsrfCookie(c, "") - cookie.MaxAge = -1 - ctx.Resp.Header().Add("Set-Cookie", cookie.String()) - } + cookie := newCsrfCookie(&c.opt, "") + cookie.MaxAge = -1 + ctx.Resp.Header().Add("Set-Cookie", cookie.String()) } diff --git a/tests/integration/attachment_test.go b/tests/integration/attachment_test.go index 95c9c9f753..7cbc2545d5 100644 --- a/tests/integration/attachment_test.go +++ b/tests/integration/attachment_test.go @@ -60,7 +60,8 @@ func createAttachment(t *testing.T, session *TestSession, repoURL, filename stri func TestCreateAnonymousAttachment(t *testing.T) { defer tests.PrepareTestEnv(t)() session := emptyTestSession(t) - createAttachment(t, session, "user2/repo1", "image.png", generateImg(), http.StatusSeeOther) + // this test is not right because it just doesn't pass the CSRF validation + createAttachment(t, session, "user2/repo1", "image.png", generateImg(), http.StatusBadRequest) } func TestCreateIssueAttachment(t *testing.T) { diff --git a/tests/integration/csrf_test.go b/tests/integration/csrf_test.go index a789859889..fcb9661b8a 100644 --- a/tests/integration/csrf_test.go +++ b/tests/integration/csrf_test.go @@ -5,12 +5,10 @@ package integration import ( "net/http" - "strings" "testing" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" @@ -25,28 +23,12 @@ func TestCsrfProtection(t *testing.T) { req := NewRequestWithValues(t, "POST", "/user/settings", map[string]string{ "_csrf": "fake_csrf", }) - session.MakeRequest(t, req, http.StatusSeeOther) - - resp := session.MakeRequest(t, req, http.StatusSeeOther) - loc := resp.Header().Get("Location") - assert.Equal(t, setting.AppSubURL+"/", loc) - resp = session.MakeRequest(t, NewRequest(t, "GET", loc), http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - assert.Equal(t, "Bad Request: invalid CSRF token", - strings.TrimSpace(htmlDoc.doc.Find(".ui.message").Text()), - ) + resp := session.MakeRequest(t, req, http.StatusBadRequest) + assert.Contains(t, resp.Body.String(), "Invalid CSRF token") // test web form csrf via header. TODO: should use an UI api to test req = NewRequest(t, "POST", "/user/settings") req.Header.Add("X-Csrf-Token", "fake_csrf") - session.MakeRequest(t, req, http.StatusSeeOther) - - resp = session.MakeRequest(t, req, http.StatusSeeOther) - loc = resp.Header().Get("Location") - assert.Equal(t, setting.AppSubURL+"/", loc) - resp = session.MakeRequest(t, NewRequest(t, "GET", loc), http.StatusOK) - htmlDoc = NewHTMLParser(t, resp.Body) - assert.Equal(t, "Bad Request: invalid CSRF token", - strings.TrimSpace(htmlDoc.doc.Find(".ui.message").Text()), - ) + resp = session.MakeRequest(t, req, http.StatusBadRequest) + assert.Contains(t, resp.Body.String(), "Invalid CSRF token") } diff --git a/tests/integration/repo_branch_test.go b/tests/integration/repo_branch_test.go index 2aa299479a..df9ea9a97c 100644 --- a/tests/integration/repo_branch_test.go +++ b/tests/integration/repo_branch_test.go @@ -18,7 +18,6 @@ import ( "code.gitea.io/gitea/models/unittest" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/modules/translation" repo_service "code.gitea.io/gitea/services/repository" @@ -157,15 +156,8 @@ func TestCreateBranchInvalidCSRF(t *testing.T) { "_csrf": "fake_csrf", "new_branch_name": "test", }) - resp := session.MakeRequest(t, req, http.StatusSeeOther) - loc := resp.Header().Get("Location") - assert.Equal(t, setting.AppSubURL+"/", loc) - resp = session.MakeRequest(t, NewRequest(t, "GET", loc), http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - assert.Equal(t, - "Bad Request: invalid CSRF token", - strings.TrimSpace(htmlDoc.doc.Find(".ui.message").Text()), - ) + resp := session.MakeRequest(t, req, http.StatusBadRequest) + assert.Contains(t, resp.Body.String(), "Invalid CSRF token") } func TestDatabaseMissingABranch(t *testing.T) { From 6275d1bc5000a09793574696cb18cc5b5c4b07d6 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Sun, 22 Sep 2024 12:57:03 +0200 Subject: [PATCH 039/443] Refactor CSRF protector (#32057) (fix forgejo tests) Fix the tests unique to Forgejo that are impacted by the refactor. --- services/context/csrf.go | 7 ++-- tests/integration/links_test.go | 24 +++++++++--- tests/integration/oauth_test.go | 66 ++++++++++++++++++--------------- 3 files changed, 59 insertions(+), 38 deletions(-) diff --git a/services/context/csrf.go b/services/context/csrf.go index 5890d53f42..e0518a499b 100644 --- a/services/context/csrf.go +++ b/services/context/csrf.go @@ -30,8 +30,9 @@ import ( ) const ( - CsrfHeaderName = "X-Csrf-Token" - CsrfFormName = "_csrf" + CsrfHeaderName = "X-Csrf-Token" + CsrfFormName = "_csrf" + CsrfErrorString = "Invalid CSRF token." ) // CSRFProtector represents a CSRF protector and is used to get the current token and validate the token. @@ -144,7 +145,7 @@ func (c *csrfProtector) validateToken(ctx *Context, token string) { c.DeleteCookie(ctx) // currently, there should be no access to the APIPath with CSRF token. because templates shouldn't use the `/api/` endpoints. // FIXME: distinguish what the response is for: HTML (web page) or JSON (fetch) - http.Error(ctx.Resp, "Invalid CSRF token.", http.StatusBadRequest) + http.Error(ctx.Resp, CsrfErrorString, http.StatusBadRequest) } } diff --git a/tests/integration/links_test.go b/tests/integration/links_test.go index 68d7008e02..e9ad933b24 100644 --- a/tests/integration/links_test.go +++ b/tests/integration/links_test.go @@ -12,6 +12,7 @@ import ( "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/test" + forgejo_context "code.gitea.io/gitea/services/context" "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" @@ -190,11 +191,6 @@ func TestRedirectsWebhooks(t *testing.T) { {from: "/user/settings/hooks/" + kind + "/new", to: "/user/login", verb: "GET"}, {from: "/admin/system-hooks/" + kind + "/new", to: "/user/login", verb: "GET"}, {from: "/admin/default-hooks/" + kind + "/new", to: "/user/login", verb: "GET"}, - {from: "/user2/repo1/settings/hooks/" + kind + "/new", to: "/", verb: "POST"}, - {from: "/admin/system-hooks/" + kind + "/new", to: "/", verb: "POST"}, - {from: "/admin/default-hooks/" + kind + "/new", to: "/", verb: "POST"}, - {from: "/user2/repo1/settings/hooks/1", to: "/", verb: "POST"}, - {from: "/admin/hooks/1", to: "/", verb: "POST"}, } for _, info := range redirects { req := NewRequest(t, info.verb, info.from) @@ -202,6 +198,24 @@ func TestRedirectsWebhooks(t *testing.T) { assert.EqualValues(t, path.Join(setting.AppSubURL, info.to), test.RedirectURL(resp), info.from) } } + + for _, kind := range []string{"forgejo", "gitea"} { + csrf := []struct { + from string + verb string + }{ + {from: "/user2/repo1/settings/hooks/" + kind + "/new", verb: "POST"}, + {from: "/admin/hooks/1", verb: "POST"}, + {from: "/admin/system-hooks/" + kind + "/new", verb: "POST"}, + {from: "/admin/default-hooks/" + kind + "/new", verb: "POST"}, + {from: "/user2/repo1/settings/hooks/1", verb: "POST"}, + } + for _, info := range csrf { + req := NewRequest(t, info.verb, info.from) + resp := MakeRequest(t, req, http.StatusBadRequest) + assert.Contains(t, resp.Body.String(), forgejo_context.CsrfErrorString) + } + } } func TestRepoLinks(t *testing.T) { diff --git a/tests/integration/oauth_test.go b/tests/integration/oauth_test.go index 0d5e9a0472..f385b99e46 100644 --- a/tests/integration/oauth_test.go +++ b/tests/integration/oauth_test.go @@ -11,6 +11,7 @@ import ( "fmt" "io" "net/http" + "net/http/httptest" "net/url" "strings" "testing" @@ -24,6 +25,7 @@ import ( api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/routers/web/auth" + forgejo_context "code.gitea.io/gitea/services/context" "code.gitea.io/gitea/tests" "github.com/markbates/goth" @@ -803,6 +805,16 @@ func TestOAuthIntrospection(t *testing.T) { }) } +func requireCookieCSRF(t *testing.T, resp http.ResponseWriter) string { + for _, c := range resp.(*httptest.ResponseRecorder).Result().Cookies() { + if c.Name == "_csrf" { + return c.Value + } + } + require.True(t, false, "_csrf not found in cookies") + return "" +} + func TestOAuth_GrantScopesReadUser(t *testing.T) { defer tests.PrepareTestEnv(t)() @@ -840,19 +852,18 @@ func TestOAuth_GrantScopesReadUser(t *testing.T) { authorizeResp := ctx.MakeRequest(t, authorizeReq, http.StatusSeeOther) authcode := strings.Split(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&")[0] - htmlDoc := NewHTMLParser(t, authorizeResp.Body) grantReq := NewRequestWithValues(t, "POST", "/login/oauth/grant", map[string]string{ - "_csrf": htmlDoc.GetCSRF(), + "_csrf": requireCookieCSRF(t, authorizeResp), "client_id": app.ClientID, "redirect_uri": "a", "state": "thestate", "granted": "true", }) - grantResp := ctx.MakeRequest(t, grantReq, http.StatusSeeOther) - htmlDocGrant := NewHTMLParser(t, grantResp.Body) + grantResp := ctx.MakeRequest(t, grantReq, http.StatusBadRequest) + assert.NotContains(t, grantResp.Body.String(), forgejo_context.CsrfErrorString) accessTokenReq := NewRequestWithValues(t, "POST", "/login/oauth/access_token", map[string]string{ - "_csrf": htmlDocGrant.GetCSRF(), + "_csrf": requireCookieCSRF(t, authorizeResp), "grant_type": "authorization_code", "client_id": app.ClientID, "client_secret": app.ClientSecret, @@ -921,19 +932,18 @@ func TestOAuth_GrantScopesFailReadRepository(t *testing.T) { authorizeResp := ctx.MakeRequest(t, authorizeReq, http.StatusSeeOther) authcode := strings.Split(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&")[0] - htmlDoc := NewHTMLParser(t, authorizeResp.Body) grantReq := NewRequestWithValues(t, "POST", "/login/oauth/grant", map[string]string{ - "_csrf": htmlDoc.GetCSRF(), + "_csrf": requireCookieCSRF(t, authorizeResp), "client_id": app.ClientID, "redirect_uri": "a", "state": "thestate", "granted": "true", }) - grantResp := ctx.MakeRequest(t, grantReq, http.StatusSeeOther) - htmlDocGrant := NewHTMLParser(t, grantResp.Body) + grantResp := ctx.MakeRequest(t, grantReq, http.StatusBadRequest) + assert.NotContains(t, grantResp.Body.String(), forgejo_context.CsrfErrorString) accessTokenReq := NewRequestWithValues(t, "POST", "/login/oauth/access_token", map[string]string{ - "_csrf": htmlDocGrant.GetCSRF(), + "_csrf": requireCookieCSRF(t, authorizeResp), "grant_type": "authorization_code", "client_id": app.ClientID, "client_secret": app.ClientSecret, @@ -1000,19 +1010,18 @@ func TestOAuth_GrantScopesReadRepository(t *testing.T) { authorizeResp := ctx.MakeRequest(t, authorizeReq, http.StatusSeeOther) authcode := strings.Split(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&")[0] - htmlDoc := NewHTMLParser(t, authorizeResp.Body) grantReq := NewRequestWithValues(t, "POST", "/login/oauth/grant", map[string]string{ - "_csrf": htmlDoc.GetCSRF(), + "_csrf": requireCookieCSRF(t, authorizeResp), "client_id": app.ClientID, "redirect_uri": "a", "state": "thestate", "granted": "true", }) - grantResp := ctx.MakeRequest(t, grantReq, http.StatusSeeOther) - htmlDocGrant := NewHTMLParser(t, grantResp.Body) + grantResp := ctx.MakeRequest(t, grantReq, http.StatusBadRequest) + assert.NotContains(t, grantResp.Body.String(), forgejo_context.CsrfErrorString) accessTokenReq := NewRequestWithValues(t, "POST", "/login/oauth/access_token", map[string]string{ - "_csrf": htmlDocGrant.GetCSRF(), + "_csrf": requireCookieCSRF(t, authorizeResp), "grant_type": "authorization_code", "client_id": app.ClientID, "client_secret": app.ClientSecret, @@ -1082,19 +1091,18 @@ func TestOAuth_GrantScopesReadPrivateGroups(t *testing.T) { authorizeResp := ctx.MakeRequest(t, authorizeReq, http.StatusSeeOther) authcode := strings.Split(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&")[0] - htmlDoc := NewHTMLParser(t, authorizeResp.Body) grantReq := NewRequestWithValues(t, "POST", "/login/oauth/grant", map[string]string{ - "_csrf": htmlDoc.GetCSRF(), + "_csrf": requireCookieCSRF(t, authorizeResp), "client_id": app.ClientID, "redirect_uri": "a", "state": "thestate", "granted": "true", }) - grantResp := ctx.MakeRequest(t, grantReq, http.StatusSeeOther) - htmlDocGrant := NewHTMLParser(t, grantResp.Body) + grantResp := ctx.MakeRequest(t, grantReq, http.StatusBadRequest) + assert.NotContains(t, grantResp.Body.String(), forgejo_context.CsrfErrorString) accessTokenReq := NewRequestWithValues(t, "POST", "/login/oauth/access_token", map[string]string{ - "_csrf": htmlDocGrant.GetCSRF(), + "_csrf": requireCookieCSRF(t, authorizeResp), "grant_type": "authorization_code", "client_id": app.ClientID, "client_secret": app.ClientSecret, @@ -1164,19 +1172,18 @@ func TestOAuth_GrantScopesReadOnlyPublicGroups(t *testing.T) { authorizeResp := ctx.MakeRequest(t, authorizeReq, http.StatusSeeOther) authcode := strings.Split(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&")[0] - htmlDoc := NewHTMLParser(t, authorizeResp.Body) grantReq := NewRequestWithValues(t, "POST", "/login/oauth/grant", map[string]string{ - "_csrf": htmlDoc.GetCSRF(), + "_csrf": requireCookieCSRF(t, authorizeResp), "client_id": app.ClientID, "redirect_uri": "a", "state": "thestate", "granted": "true", }) - grantResp := ctx.MakeRequest(t, grantReq, http.StatusSeeOther) - htmlDocGrant := NewHTMLParser(t, grantResp.Body) + grantResp := ctx.MakeRequest(t, grantReq, http.StatusBadRequest) + assert.NotContains(t, grantResp.Body.String(), forgejo_context.CsrfErrorString) accessTokenReq := NewRequestWithValues(t, "POST", "/login/oauth/access_token", map[string]string{ - "_csrf": htmlDocGrant.GetCSRF(), + "_csrf": requireCookieCSRF(t, authorizeResp), "grant_type": "authorization_code", "client_id": app.ClientID, "client_secret": app.ClientSecret, @@ -1260,19 +1267,18 @@ func TestOAuth_GrantScopesReadPublicGroupsWithTheReadScope(t *testing.T) { authorizeResp := ctx.MakeRequest(t, authorizeReq, http.StatusSeeOther) authcode := strings.Split(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&")[0] - htmlDoc := NewHTMLParser(t, authorizeResp.Body) grantReq := NewRequestWithValues(t, "POST", "/login/oauth/grant", map[string]string{ - "_csrf": htmlDoc.GetCSRF(), + "_csrf": requireCookieCSRF(t, authorizeResp), "client_id": app.ClientID, "redirect_uri": "a", "state": "thestate", "granted": "true", }) - grantResp := ctx.MakeRequest(t, grantReq, http.StatusSeeOther) - htmlDocGrant := NewHTMLParser(t, grantResp.Body) + grantResp := ctx.MakeRequest(t, grantReq, http.StatusBadRequest) + assert.NotContains(t, grantResp.Body.String(), forgejo_context.CsrfErrorString) accessTokenReq := NewRequestWithValues(t, "POST", "/login/oauth/access_token", map[string]string{ - "_csrf": htmlDocGrant.GetCSRF(), + "_csrf": requireCookieCSRF(t, authorizeResp), "grant_type": "authorization_code", "client_id": app.ClientID, "client_secret": app.ClientSecret, From 526054332acb221e061d3900bba2dc6e012da52d Mon Sep 17 00:00:00 2001 From: KN4CK3R Date: Fri, 20 Sep 2024 21:00:39 +0200 Subject: [PATCH 040/443] Fix incorrect `/tokens` api (#32085) Fixes #32078 - Add missing scopes output. - Disallow empty scope. --------- Co-authored-by: Lunny Xiao (cherry picked from commit 08adbc468f8875fd4763c3656b334203c11adc0a) --- routers/api/v1/user/app.go | 5 +++++ tests/integration/api_token_test.go | 31 ++++++++++------------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/routers/api/v1/user/app.go b/routers/api/v1/user/app.go index b61ebac7d0..d5b20f7703 100644 --- a/routers/api/v1/user/app.go +++ b/routers/api/v1/user/app.go @@ -118,6 +118,10 @@ func CreateAccessToken(ctx *context.APIContext) { ctx.Error(http.StatusBadRequest, "AccessTokenScope.Normalize", fmt.Errorf("invalid access token scope provided: %w", err)) return } + if scope == "" { + ctx.Error(http.StatusBadRequest, "AccessTokenScope", "access token must have a scope") + return + } t.Scope = scope if err := auth_model.NewAccessToken(ctx, t); err != nil { @@ -129,6 +133,7 @@ func CreateAccessToken(ctx *context.APIContext) { Token: t.Token, ID: t.ID, TokenLastEight: t.TokenLastEight, + Scopes: t.Scope.StringSlice(), }) } diff --git a/tests/integration/api_token_test.go b/tests/integration/api_token_test.go index 9c7bf37330..01d18ef6f1 100644 --- a/tests/integration/api_token_test.go +++ b/tests/integration/api_token_test.go @@ -23,10 +23,10 @@ func TestAPICreateAndDeleteToken(t *testing.T) { defer tests.PrepareTestEnv(t)() user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) - newAccessToken := createAPIAccessTokenWithoutCleanUp(t, "test-key-1", user, nil) + newAccessToken := createAPIAccessTokenWithoutCleanUp(t, "test-key-1", user, []auth_model.AccessTokenScope{auth_model.AccessTokenScopeAll}) deleteAPIAccessToken(t, newAccessToken, user) - newAccessToken = createAPIAccessTokenWithoutCleanUp(t, "test-key-2", user, nil) + newAccessToken = createAPIAccessTokenWithoutCleanUp(t, "test-key-2", user, []auth_model.AccessTokenScope{auth_model.AccessTokenScopeAll}) deleteAPIAccessToken(t, newAccessToken, user) } @@ -72,19 +72,19 @@ func TestAPIDeleteTokensPermission(t *testing.T) { user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4}) // admin can delete tokens for other users - createAPIAccessTokenWithoutCleanUp(t, "test-key-1", user2, nil) + createAPIAccessTokenWithoutCleanUp(t, "test-key-1", user2, []auth_model.AccessTokenScope{auth_model.AccessTokenScopeAll}) req := NewRequest(t, "DELETE", "/api/v1/users/"+user2.LoginName+"/tokens/test-key-1"). AddBasicAuth(admin.Name) MakeRequest(t, req, http.StatusNoContent) // non-admin can delete tokens for himself - createAPIAccessTokenWithoutCleanUp(t, "test-key-2", user2, nil) + createAPIAccessTokenWithoutCleanUp(t, "test-key-2", user2, []auth_model.AccessTokenScope{auth_model.AccessTokenScopeAll}) req = NewRequest(t, "DELETE", "/api/v1/users/"+user2.LoginName+"/tokens/test-key-2"). AddBasicAuth(user2.Name) MakeRequest(t, req, http.StatusNoContent) // non-admin can't delete tokens for other users - createAPIAccessTokenWithoutCleanUp(t, "test-key-3", user2, nil) + createAPIAccessTokenWithoutCleanUp(t, "test-key-3", user2, []auth_model.AccessTokenScope{auth_model.AccessTokenScopeAll}) req = NewRequest(t, "DELETE", "/api/v1/users/"+user2.LoginName+"/tokens/test-key-3"). AddBasicAuth(user4.Name) MakeRequest(t, req, http.StatusForbidden) @@ -520,7 +520,7 @@ func runTestCase(t *testing.T, testCase *requiredScopeTestCase, user *user_model unauthorizedScopes = append(unauthorizedScopes, cateogoryUnauthorizedScopes...) } - accessToken := createAPIAccessTokenWithoutCleanUp(t, "test-token", user, &unauthorizedScopes) + accessToken := createAPIAccessTokenWithoutCleanUp(t, "test-token", user, unauthorizedScopes) defer deleteAPIAccessToken(t, accessToken, user) // Request the endpoint. Verify that permission is denied. @@ -532,20 +532,12 @@ func runTestCase(t *testing.T, testCase *requiredScopeTestCase, user *user_model // createAPIAccessTokenWithoutCleanUp Create an API access token and assert that // creation succeeded. The caller is responsible for deleting the token. -func createAPIAccessTokenWithoutCleanUp(t *testing.T, tokenName string, user *user_model.User, scopes *[]auth_model.AccessTokenScope) api.AccessToken { +func createAPIAccessTokenWithoutCleanUp(t *testing.T, tokenName string, user *user_model.User, scopes []auth_model.AccessTokenScope) api.AccessToken { payload := map[string]any{ - "name": tokenName, - } - if scopes != nil { - for _, scope := range *scopes { - scopes, scopesExists := payload["scopes"].([]string) - if !scopesExists { - scopes = make([]string, 0) - } - scopes = append(scopes, string(scope)) - payload["scopes"] = scopes - } + "name": tokenName, + "scopes": scopes, } + log.Debug("Requesting creation of token with scopes: %v", scopes) req := NewRequestWithJSON(t, "POST", "/api/v1/users/"+user.LoginName+"/tokens", payload). AddBasicAuth(user.Name) @@ -563,8 +555,7 @@ func createAPIAccessTokenWithoutCleanUp(t *testing.T, tokenName string, user *us return newAccessToken } -// createAPIAccessTokenWithoutCleanUp Delete an API access token and assert that -// deletion succeeded. +// deleteAPIAccessToken deletes an API access token and assert that deletion succeeded. func deleteAPIAccessToken(t *testing.T, accessToken api.AccessToken, user *user_model.User) { req := NewRequestf(t, "DELETE", "/api/v1/users/"+user.LoginName+"/tokens/%d", accessToken.ID). AddBasicAuth(user.Name) From 2675a24649af2fff34f5c7e416d6ff78591d8d9c Mon Sep 17 00:00:00 2001 From: Timon van der Berg Date: Sat, 21 Sep 2024 20:57:01 +0200 Subject: [PATCH 041/443] Repo Activity: count new issues that were closed (#31776) I'm new to go and contributing to gitea, your guidance is much appreciated. This is meant to solve https://github.com/go-gitea/gitea/issues/13309 Previously, closed issues would not be shown under new issues in the activity tab, even if they were newly created. changes: * Split out newlyCreatedIssues from issuesForActivityStatement to count both currently open and closed issues. * Use a seperate function to count active issues to prevent double-counting issues after the above change. Result is that new issues that have been closed are shown both under "new" and "closed". Signed-off-by: Timon van der Berg (cherry picked from commit ebfde845294cc681de6b1fe1adcf27e35f61b89b) --- models/activities/repo_activity.go | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/models/activities/repo_activity.go b/models/activities/repo_activity.go index ba5e4959f0..3ffad035b7 100644 --- a/models/activities/repo_activity.go +++ b/models/activities/repo_activity.go @@ -34,6 +34,7 @@ type ActivityStats struct { OpenedPRAuthorCount int64 MergedPRs issues_model.PullRequestList MergedPRAuthorCount int64 + ActiveIssues issues_model.IssueList OpenedIssues issues_model.IssueList OpenedIssueAuthorCount int64 ClosedIssues issues_model.IssueList @@ -172,7 +173,7 @@ func (stats *ActivityStats) MergedPRPerc() int { // ActiveIssueCount returns total active issue count func (stats *ActivityStats) ActiveIssueCount() int { - return stats.OpenedIssueCount() + stats.ClosedIssueCount() + return len(stats.ActiveIssues) } // OpenedIssueCount returns open issue count @@ -285,13 +286,21 @@ func (stats *ActivityStats) FillIssues(ctx context.Context, repoID int64, fromTi stats.ClosedIssueAuthorCount = count // New issues - sess = issuesForActivityStatement(ctx, repoID, fromTime, false, false) + sess = newlyCreatedIssues(ctx, repoID, fromTime) sess.OrderBy("issue.created_unix ASC") stats.OpenedIssues = make(issues_model.IssueList, 0) if err = sess.Find(&stats.OpenedIssues); err != nil { return err } + // Active issues + sess = activeIssues(ctx, repoID, fromTime) + sess.OrderBy("issue.created_unix ASC") + stats.ActiveIssues = make(issues_model.IssueList, 0) + if err = sess.Find(&stats.ActiveIssues); err != nil { + return err + } + // Opened issue authors sess = issuesForActivityStatement(ctx, repoID, fromTime, false, false) if _, err = sess.Select("count(distinct issue.poster_id) as `count`").Table("issue").Get(&count); err != nil { @@ -317,6 +326,23 @@ func (stats *ActivityStats) FillUnresolvedIssues(ctx context.Context, repoID int return sess.Find(&stats.UnresolvedIssues) } +func newlyCreatedIssues(ctx context.Context, repoID int64, fromTime time.Time) *xorm.Session { + sess := db.GetEngine(ctx).Where("issue.repo_id = ?", repoID). + And("issue.is_pull = ?", false). // Retain the is_pull check to exclude pull requests + And("issue.created_unix >= ?", fromTime.Unix()) // Include all issues created after fromTime + + return sess +} + +func activeIssues(ctx context.Context, repoID int64, fromTime time.Time) *xorm.Session { + sess := db.GetEngine(ctx).Where("issue.repo_id = ?", repoID). + And("issue.is_pull = ?", false). + And("issue.created_unix >= ?", fromTime.Unix()). + Or("issue.closed_unix >= ?", fromTime.Unix()) + + return sess +} + func issuesForActivityStatement(ctx context.Context, repoID int64, fromTime time.Time, closed, unresolved bool) *xorm.Session { sess := db.GetEngine(ctx).Where("issue.repo_id = ?", repoID). And("issue.is_closed = ?", closed) From f709de24039ab7e605d3e09e3b61240836381603 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 22 Sep 2024 05:56:25 +0800 Subject: [PATCH 042/443] Fix wrong last modify time (#32102) (cherry picked from commit a802508f88e546bf18990559e44bf27a09c869ee) --- modules/httpcache/httpcache.go | 3 ++- modules/httplib/serve.go | 1 + routers/api/packages/maven/maven.go | 4 +++- routers/web/repo/githttp.go | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/httpcache/httpcache.go b/modules/httpcache/httpcache.go index b4af371541..30ce0a4a03 100644 --- a/modules/httpcache/httpcache.go +++ b/modules/httpcache/httpcache.go @@ -76,7 +76,8 @@ func HandleGenericETagTimeCache(req *http.Request, w http.ResponseWriter, etag s w.Header().Set("Etag", etag) } if lastModified != nil && !lastModified.IsZero() { - w.Header().Set("Last-Modified", lastModified.Format(http.TimeFormat)) + // http.TimeFormat required a UTC time, refer to https://pkg.go.dev/net/http#TimeFormat + w.Header().Set("Last-Modified", lastModified.UTC().Format(http.TimeFormat)) } if len(etag) > 0 { diff --git a/modules/httplib/serve.go b/modules/httplib/serve.go index 6e147d76f5..2e3e6a7c42 100644 --- a/modules/httplib/serve.go +++ b/modules/httplib/serve.go @@ -79,6 +79,7 @@ func ServeSetHeaders(w http.ResponseWriter, opts *ServeHeaderOptions) { httpcache.SetCacheControlInHeader(header, duration) if !opts.LastModified.IsZero() { + // http.TimeFormat required a UTC time, refer to https://pkg.go.dev/net/http#TimeFormat header.Set("Last-Modified", opts.LastModified.UTC().Format(http.TimeFormat)) } } diff --git a/routers/api/packages/maven/maven.go b/routers/api/packages/maven/maven.go index 58271e1d43..4181577454 100644 --- a/routers/api/packages/maven/maven.go +++ b/routers/api/packages/maven/maven.go @@ -117,7 +117,9 @@ func serveMavenMetadata(ctx *context.Context, params parameters) { xmlMetadataWithHeader := append([]byte(xml.Header), xmlMetadata...) latest := pds[len(pds)-1] - ctx.Resp.Header().Set("Last-Modified", latest.Version.CreatedUnix.Format(http.TimeFormat)) + // http.TimeFormat required a UTC time, refer to https://pkg.go.dev/net/http#TimeFormat + lastModifed := latest.Version.CreatedUnix.AsTime().UTC().Format(http.TimeFormat) + ctx.Resp.Header().Set("Last-Modified", lastModifed) ext := strings.ToLower(filepath.Ext(params.Filename)) if isChecksumExtension(ext) { diff --git a/routers/web/repo/githttp.go b/routers/web/repo/githttp.go index 9f3b63698a..a082498dfd 100644 --- a/routers/web/repo/githttp.go +++ b/routers/web/repo/githttp.go @@ -395,7 +395,8 @@ func (h *serviceHandler) sendFile(ctx *context.Context, contentType, file string ctx.Resp.Header().Set("Content-Type", contentType) ctx.Resp.Header().Set("Content-Length", fmt.Sprintf("%d", fi.Size())) - ctx.Resp.Header().Set("Last-Modified", fi.ModTime().Format(http.TimeFormat)) + // http.TimeFormat required a UTC time, refer to https://pkg.go.dev/net/http#TimeFormat + ctx.Resp.Header().Set("Last-Modified", fi.ModTime().UTC().Format(http.TimeFormat)) http.ServeFile(ctx.Resp, ctx.Req, reqFile) } From 9d3473119893ffde0ab36d98e7a0e41c5d0ba9a3 Mon Sep 17 00:00:00 2001 From: Jamie Schouten Date: Sun, 22 Sep 2024 00:42:17 +0200 Subject: [PATCH 043/443] Add bin to Composer Metadata (#32099) This PR addresses the missing `bin` field in Composer metadata, which currently causes vendor-provided binaries to not be symlinked to `vendor/bin` during installation. In the current implementation, running `composer install` does not publish the binaries, leading to issues where expected binaries are not available. By properly declaring the `bin` field, this PR ensures that binaries are correctly symlinked upon installation, as described in the [Composer documentation](https://getcomposer.org/doc/articles/vendor-binaries.md). (cherry picked from commit d351a42494e71b5e2da63302c2f9b46c78e6dbde) --- modules/packages/composer/metadata.go | 1 + tests/integration/api_packages_composer_test.go | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/packages/composer/metadata.go b/modules/packages/composer/metadata.go index 2c2e9ebf27..6035eae8ca 100644 --- a/modules/packages/composer/metadata.go +++ b/modules/packages/composer/metadata.go @@ -48,6 +48,7 @@ type Metadata struct { Homepage string `json:"homepage,omitempty"` License Licenses `json:"license,omitempty"` Authors []Author `json:"authors,omitempty"` + Bin []string `json:"bin,omitempty"` Autoload map[string]any `json:"autoload,omitempty"` AutoloadDev map[string]any `json:"autoload-dev,omitempty"` Extra map[string]any `json:"extra,omitempty"` diff --git a/tests/integration/api_packages_composer_test.go b/tests/integration/api_packages_composer_test.go index 9cdcd07e37..9d25cc4d64 100644 --- a/tests/integration/api_packages_composer_test.go +++ b/tests/integration/api_packages_composer_test.go @@ -37,6 +37,7 @@ func TestPackageComposer(t *testing.T) { packageType := "composer-plugin" packageAuthor := "Gitea Authors" packageLicense := "MIT" + packageBin := "./bin/script" var buf bytes.Buffer archive := zip.NewWriter(&buf) @@ -50,6 +51,9 @@ func TestPackageComposer(t *testing.T) { { "name": "` + packageAuthor + `" } + ], + "bin": [ + "` + packageBin + `" ] }`)) archive.Close() @@ -211,6 +215,8 @@ func TestPackageComposer(t *testing.T) { assert.Len(t, pkgs[0].Authors, 1) assert.Equal(t, packageAuthor, pkgs[0].Authors[0].Name) assert.Equal(t, "zip", pkgs[0].Dist.Type) - assert.Equal(t, "7b40bfd6da811b2b78deec1e944f156dbb2c747b", pkgs[0].Dist.Checksum) + assert.Equal(t, "4f5fa464c3cb808a1df191dbf6cb75363f8b7072", pkgs[0].Dist.Checksum) + assert.Len(t, pkgs[0].Bin, 1) + assert.Equal(t, packageBin, pkgs[0].Bin[0]) }) } From 2ffb08bb888bb950b6ed4ff12a4cf4bacc337e18 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 21 Sep 2024 17:50:54 +0800 Subject: [PATCH 044/443] Use camo.Always instead of camo.Allways (#32097) Fix #31575 https://gitea.com/gitea/docs/pulls/73 (cherry picked from commit 8e2dd5d3ddfb442937c79f05df88d18b856952cb) --- custom/conf/app.example.ini | 3 ++- modules/markup/camo.go | 2 +- modules/markup/camo_test.go | 2 +- modules/setting/camo.go | 14 ++++++++++++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 9cb5a67172..2eff51fe98 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -529,7 +529,8 @@ INTERNAL_TOKEN = ;; HMAC to encode urls with, it **is required** if camo is enabled. ;HMAC_KEY = ;; Set to true to use camo for https too lese only non https urls are proxyed -;ALLWAYS = false +;; ALLWAYS is deprecated and will be removed in the future +;ALWAYS = false ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/modules/markup/camo.go b/modules/markup/camo.go index e93797de2b..7e2583469d 100644 --- a/modules/markup/camo.go +++ b/modules/markup/camo.go @@ -38,7 +38,7 @@ func camoHandleLink(link string) string { if setting.Camo.Enabled { lnkURL, err := url.Parse(link) if err == nil && lnkURL.IsAbs() && !strings.HasPrefix(link, setting.AppURL) && - (setting.Camo.Allways || lnkURL.Scheme != "https") { + (setting.Camo.Always || lnkURL.Scheme != "https") { return CamoEncode(link) } } diff --git a/modules/markup/camo_test.go b/modules/markup/camo_test.go index ba58835221..3c5d40afa0 100644 --- a/modules/markup/camo_test.go +++ b/modules/markup/camo_test.go @@ -28,7 +28,7 @@ func TestCamoHandleLink(t *testing.T) { "https://image.proxy/eivin43gJwGVIjR9MiYYtFIk0mw/aHR0cDovL3Rlc3RpbWFnZXMub3JnL2ltZy5qcGc", camoHandleLink("http://testimages.org/img.jpg")) - setting.Camo.Allways = true + setting.Camo.Always = true assert.Equal(t, "https://gitea.com/img.jpg", camoHandleLink("https://gitea.com/img.jpg")) diff --git a/modules/setting/camo.go b/modules/setting/camo.go index 366e9a116c..608ecf8363 100644 --- a/modules/setting/camo.go +++ b/modules/setting/camo.go @@ -3,18 +3,28 @@ package setting -import "code.gitea.io/gitea/modules/log" +import ( + "strconv" + + "code.gitea.io/gitea/modules/log" +) var Camo = struct { Enabled bool ServerURL string `ini:"SERVER_URL"` HMACKey string `ini:"HMAC_KEY"` - Allways bool + Always bool }{} func loadCamoFrom(rootCfg ConfigProvider) { mustMapSetting(rootCfg, "camo", &Camo) if Camo.Enabled { + oldValue := rootCfg.Section("camo").Key("ALLWAYS").MustString("") + if oldValue != "" { + log.Warn("camo.ALLWAYS is deprecated, use camo.ALWAYS instead") + Camo.Always, _ = strconv.ParseBool(oldValue) + } + if Camo.ServerURL == "" || Camo.HMACKey == "" { log.Fatal(`Camo settings require "SERVER_URL" and HMAC_KEY`) } From e3deb88a8d2494e386f221b9dc743a6a1710837d Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Sun, 22 Sep 2024 10:01:43 +0200 Subject: [PATCH 045/443] chore(release-notes): weekly cherry-pick week 2024-39 --- release-notes/5372.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 release-notes/5372.md diff --git a/release-notes/5372.md b/release-notes/5372.md new file mode 100644 index 0000000000..fccb305f34 --- /dev/null +++ b/release-notes/5372.md @@ -0,0 +1,5 @@ +feat: [commit](https://codeberg.org/forgejo/forgejo/commit/9d3473119893ffde0ab36d98e7a0e41c5d0ba9a3) Add bin to Composer Metadata. +fix: [commit](https://codeberg.org/forgejo/forgejo/commit/f709de24039ab7e605d3e09e3b61240836381603) Fix wrong last modify time. +fix: [commit](https://codeberg.org/forgejo/forgejo/commit/2675a24649af2fff34f5c7e416d6ff78591d8d9c) Repo Activity: count new issues that were closed. +fix: [commit](https://codeberg.org/forgejo/forgejo/commit/526054332acb221e061d3900bba2dc6e012da52d) Fix incorrect /tokens api. +fix: [commit](https://codeberg.org/forgejo/forgejo/commit/0cafec4c7a2faf810953e9d522faf5dc019e1522) Do not escape relative path in RPM primary index. From 89742c49135e47372e272596bd536d5d1244721f Mon Sep 17 00:00:00 2001 From: Exploding Dragon Date: Fri, 27 Sep 2024 08:21:22 +0000 Subject: [PATCH 046/443] feat: add architecture-specific removal support for arch package (#5351) - [x] add architecture-specific removal support - [x] Fix upload competition - [x] Fix not checking input when downloading docs: https://codeberg.org/forgejo/docs/pulls/874 ### Release notes - [ ] I do not want this change to show in the release notes. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5351 Reviewed-by: Earl Warren Co-authored-by: Exploding Dragon Co-committed-by: Exploding Dragon --- modules/packages/arch/metadata.go | 69 ++++++++++----------- routers/api/packages/api.go | 12 ++-- routers/api/packages/arch/arch.go | 47 +++++++++----- services/packages/arch/repository.go | 65 ++++++++++--------- templates/package/content/arch.tmpl | 4 +- templates/package/metadata/arch.tmpl | 4 +- tests/integration/api_packages_arch_test.go | 50 ++++++++++++--- 7 files changed, 151 insertions(+), 100 deletions(-) diff --git a/modules/packages/arch/metadata.go b/modules/packages/arch/metadata.go index 0e08670311..6cdde75cdc 100644 --- a/modules/packages/arch/metadata.go +++ b/modules/packages/arch/metadata.go @@ -39,8 +39,8 @@ const ( var ( reName = regexp.MustCompile(`^[a-zA-Z0-9@._+-]+$`) reVer = regexp.MustCompile(`^[a-zA-Z0-9:_.+]+-+[0-9]+$`) - reOptDep = regexp.MustCompile(`^[a-zA-Z0-9@._+-]+([<>]?=?[a-zA-Z0-9@._+-]+)?(:.*)?$`) - rePkgVer = regexp.MustCompile(`^[a-zA-Z0-9@._+-]+([<>]?=?[a-zA-Z0-9@._+-]+)?$`) + reOptDep = regexp.MustCompile(`^[a-zA-Z0-9@._+-]+([<>]?=?([0-9]+:)?[a-zA-Z0-9@._+-]+)?(:.*)?$`) + rePkgVer = regexp.MustCompile(`^[a-zA-Z0-9@._+-]+([<>]?=?([0-9]+:)?[a-zA-Z0-9@._+-]+)?$`) magicZSTD = []byte{0x28, 0xB5, 0x2F, 0xFD} magicXZ = []byte{0xFD, 0x37, 0x7A, 0x58, 0x5A} @@ -71,7 +71,7 @@ type VersionMetadata struct { Conflicts []string `json:"conflicts,omitempty"` Replaces []string `json:"replaces,omitempty"` Backup []string `json:"backup,omitempty"` - Xdata []string `json:"xdata,omitempty"` + XData []string `json:"xdata,omitempty"` } // FileMetadata Metadata related to specific package file. @@ -125,7 +125,7 @@ func ParsePackage(r *packages.HashedBuffer) (*Package, error) { defer tarball.Close() var pkg *Package - var mtree bool + var mTree bool for { f, err := tarball.Read() @@ -135,24 +135,24 @@ func ParsePackage(r *packages.HashedBuffer) (*Package, error) { if err != nil { return nil, err } - defer f.Close() - switch f.Name() { case ".PKGINFO": pkg, err = ParsePackageInfo(tarballType, f) if err != nil { + _ = f.Close() return nil, err } case ".MTREE": - mtree = true + mTree = true } + _ = f.Close() } if pkg == nil { return nil, util.NewInvalidArgumentErrorf(".PKGINFO file not found") } - if !mtree { + if !mTree { return nil, util.NewInvalidArgumentErrorf(".MTREE file not found") } @@ -220,7 +220,7 @@ func ParsePackageInfo(compressType string, r io.Reader) (*Package, error) { case "replaces": p.VersionMetadata.Replaces = append(p.VersionMetadata.Replaces, value) case "xdata": - p.VersionMetadata.Xdata = append(p.VersionMetadata.Xdata, value) + p.VersionMetadata.XData = append(p.VersionMetadata.XData, value) case "builddate": bd, err := strconv.ParseInt(value, 10, 64) if err != nil { @@ -260,48 +260,43 @@ func ValidatePackageSpec(p *Package) error { return util.NewInvalidArgumentErrorf("invalid project URL") } } - for _, cd := range p.VersionMetadata.CheckDepends { - if !rePkgVer.MatchString(cd) { - return util.NewInvalidArgumentErrorf("invalid check dependency: %s", cd) + for _, checkDepend := range p.VersionMetadata.CheckDepends { + if !rePkgVer.MatchString(checkDepend) { + return util.NewInvalidArgumentErrorf("invalid check dependency: %s", checkDepend) } } - for _, d := range p.VersionMetadata.Depends { - if !rePkgVer.MatchString(d) { - return util.NewInvalidArgumentErrorf("invalid dependency: %s", d) + for _, depend := range p.VersionMetadata.Depends { + if !rePkgVer.MatchString(depend) { + return util.NewInvalidArgumentErrorf("invalid dependency: %s", depend) } } - for _, md := range p.VersionMetadata.MakeDepends { - if !rePkgVer.MatchString(md) { - return util.NewInvalidArgumentErrorf("invalid make dependency: %s", md) + for _, makeDepend := range p.VersionMetadata.MakeDepends { + if !rePkgVer.MatchString(makeDepend) { + return util.NewInvalidArgumentErrorf("invalid make dependency: %s", makeDepend) } } - for _, p := range p.VersionMetadata.Provides { - if !rePkgVer.MatchString(p) { - return util.NewInvalidArgumentErrorf("invalid provides: %s", p) + for _, provide := range p.VersionMetadata.Provides { + if !rePkgVer.MatchString(provide) { + return util.NewInvalidArgumentErrorf("invalid provides: %s", provide) } } - for _, p := range p.VersionMetadata.Conflicts { - if !rePkgVer.MatchString(p) { - return util.NewInvalidArgumentErrorf("invalid conflicts: %s", p) + for _, conflict := range p.VersionMetadata.Conflicts { + if !rePkgVer.MatchString(conflict) { + return util.NewInvalidArgumentErrorf("invalid conflicts: %s", conflict) } } - for _, p := range p.VersionMetadata.Replaces { - if !rePkgVer.MatchString(p) { - return util.NewInvalidArgumentErrorf("invalid replaces: %s", p) + for _, replace := range p.VersionMetadata.Replaces { + if !rePkgVer.MatchString(replace) { + return util.NewInvalidArgumentErrorf("invalid replaces: %s", replace) } } - for _, p := range p.VersionMetadata.Replaces { - if !rePkgVer.MatchString(p) { - return util.NewInvalidArgumentErrorf("invalid xdata: %s", p) + for _, optDepend := range p.VersionMetadata.OptDepends { + if !reOptDep.MatchString(optDepend) { + return util.NewInvalidArgumentErrorf("invalid optional dependency: %s", optDepend) } } - for _, od := range p.VersionMetadata.OptDepends { - if !reOptDep.MatchString(od) { - return util.NewInvalidArgumentErrorf("invalid optional dependency: %s", od) - } - } - for _, bf := range p.VersionMetadata.Backup { - if strings.HasPrefix(bf, "/") { + for _, b := range p.VersionMetadata.Backup { + if strings.HasPrefix(b, "/") { return util.NewInvalidArgumentErrorf("backup file contains leading forward slash") } } diff --git a/routers/api/packages/api.go b/routers/api/packages/api.go index 76a8fd4714..c72f812704 100644 --- a/routers/api/packages/api.go +++ b/routers/api/packages/api.go @@ -175,18 +175,20 @@ func CommonRoutes() *web.Route { arch.PushPackage(ctx) return } else if isDelete { - if groupLen < 2 { + if groupLen < 3 { ctx.Status(http.StatusBadRequest) return } - if groupLen == 2 { + if groupLen == 3 { ctx.SetParams("group", "") ctx.SetParams("package", pathGroups[0]) ctx.SetParams("version", pathGroups[1]) + ctx.SetParams("arch", pathGroups[2]) } else { - ctx.SetParams("group", strings.Join(pathGroups[:groupLen-2], "/")) - ctx.SetParams("package", pathGroups[groupLen-2]) - ctx.SetParams("version", pathGroups[groupLen-1]) + ctx.SetParams("group", strings.Join(pathGroups[:groupLen-3], "/")) + ctx.SetParams("package", pathGroups[groupLen-3]) + ctx.SetParams("version", pathGroups[groupLen-2]) + ctx.SetParams("arch", pathGroups[groupLen-1]) } reqPackageAccess(perm.AccessModeWrite)(ctx) if ctx.Written() { diff --git a/routers/api/packages/arch/arch.go b/routers/api/packages/arch/arch.go index 2d3481a33f..15fcc37c70 100644 --- a/routers/api/packages/arch/arch.go +++ b/routers/api/packages/arch/arch.go @@ -9,12 +9,14 @@ import ( "fmt" "io" "net/http" + "path/filepath" "regexp" "strings" packages_model "code.gitea.io/gitea/models/packages" packages_module "code.gitea.io/gitea/modules/packages" arch_module "code.gitea.io/gitea/modules/packages/arch" + "code.gitea.io/gitea/modules/sync" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/routers/api/packages/helper" "code.gitea.io/gitea/services/context" @@ -25,6 +27,8 @@ import ( var ( archPkgOrSig = regexp.MustCompile(`^.*\.pkg\.tar\.\w+(\.sig)*$`) archDBOrSig = regexp.MustCompile(`^.*.db(\.tar\.gz)*(\.sig)*$`) + + locker = sync.NewExclusivePool() ) func apiError(ctx *context.Context, status int, obj any) { @@ -33,6 +37,14 @@ func apiError(ctx *context.Context, status int, obj any) { }) } +func refreshLocker(ctx *context.Context, group string) func() { + key := fmt.Sprintf("pkg_%d_arch_pkg_%s", ctx.Package.Owner.ID, group) + locker.CheckIn(key) + return func() { + locker.CheckOut(key) + } +} + func GetRepositoryKey(ctx *context.Context) { _, pub, err := arch_service.GetOrCreateKeyPair(ctx, ctx.Package.Owner.ID) if err != nil { @@ -48,7 +60,8 @@ func GetRepositoryKey(ctx *context.Context) { func PushPackage(ctx *context.Context) { group := ctx.Params("group") - + releaser := refreshLocker(ctx, group) + defer releaser() upload, needToClose, err := ctx.UploadStream() if err != nil { apiError(ctx, http.StatusInternalServerError, err) @@ -154,6 +167,7 @@ func PushPackage(ctx *context.Context) { }) if err != nil { apiError(ctx, http.StatusInternalServerError, err) + return } if err = arch_service.BuildPacmanDB(ctx, ctx.Package.Owner.ID, group, p.FileMetadata.Arch); err != nil { apiError(ctx, http.StatusInternalServerError, err) @@ -169,7 +183,7 @@ func GetPackageOrDB(ctx *context.Context) { arch = ctx.Params("arch") ) if archPkgOrSig.MatchString(file) { - pkg, err := arch_service.GetPackageFile(ctx, group, file, ctx.Package.Owner.ID) + pkg, u, pf, err := arch_service.GetPackageFile(ctx, group, file, ctx.Package.Owner.ID) if err != nil { if errors.Is(err, util.ErrNotExist) { apiError(ctx, http.StatusNotFound, err) @@ -178,15 +192,12 @@ func GetPackageOrDB(ctx *context.Context) { } return } - - ctx.ServeContent(pkg, &context.ServeHeaderOptions{ - Filename: file, - }) + helper.ServePackageFile(ctx, pkg, u, pf) return } if archDBOrSig.MatchString(file) { - pkg, err := arch_service.GetPackageDBFile(ctx, group, arch, ctx.Package.Owner.ID, + pkg, u, pf, err := arch_service.GetPackageDBFile(ctx, group, arch, ctx.Package.Owner.ID, strings.HasSuffix(file, ".sig")) if err != nil { if errors.Is(err, util.ErrNotExist) { @@ -196,9 +207,7 @@ func GetPackageOrDB(ctx *context.Context) { } return } - ctx.ServeContent(pkg, &context.ServeHeaderOptions{ - Filename: file, - }) + helper.ServePackageFile(ctx, pkg, u, pf) return } @@ -207,10 +216,13 @@ func GetPackageOrDB(ctx *context.Context) { func RemovePackage(ctx *context.Context) { var ( - group = ctx.Params("group") - pkg = ctx.Params("package") - ver = ctx.Params("version") + group = ctx.Params("group") + pkg = ctx.Params("package") + ver = ctx.Params("version") + pkgArch = ctx.Params("arch") ) + releaser := refreshLocker(ctx, group) + defer releaser() pv, err := packages_model.GetVersionByNameAndVersion( ctx, ctx.Package.Owner.ID, packages_model.TypeArch, pkg, ver, ) @@ -229,7 +241,13 @@ func RemovePackage(ctx *context.Context) { } deleted := false for _, file := range files { - if file.CompositeKey == group { + extName := fmt.Sprintf("-%s.pkg.tar%s", pkgArch, filepath.Ext(file.LowerName)) + if strings.HasSuffix(file.LowerName, ".sig") { + extName = fmt.Sprintf("-%s.pkg.tar%s.sig", pkgArch, + filepath.Ext(strings.TrimSuffix(file.LowerName, filepath.Ext(file.LowerName)))) + } + if file.CompositeKey == group && + strings.HasSuffix(file.LowerName, extName) { deleted = true err := packages_service.RemovePackageFileAndVersionIfUnreferenced(ctx, ctx.ContextUser, file) if err != nil { @@ -242,6 +260,7 @@ func RemovePackage(ctx *context.Context) { err = arch_service.BuildCustomRepositoryFiles(ctx, ctx.Package.Owner.ID, group) if err != nil { apiError(ctx, http.StatusInternalServerError, err) + return } ctx.Status(http.StatusNoContent) } else { diff --git a/services/packages/arch/repository.go b/services/packages/arch/repository.go index de72467421..58433ab5c2 100644 --- a/services/packages/arch/repository.go +++ b/services/packages/arch/repository.go @@ -10,6 +10,7 @@ import ( "errors" "fmt" "io" + "net/url" "os" "path/filepath" "sort" @@ -20,6 +21,7 @@ import ( packages_module "code.gitea.io/gitea/modules/packages" arch_module "code.gitea.io/gitea/modules/packages/arch" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/sync" "code.gitea.io/gitea/modules/util" packages_service "code.gitea.io/gitea/services/packages" @@ -28,6 +30,8 @@ import ( "github.com/ProtonMail/go-crypto/openpgp/packet" ) +var locker = sync.NewExclusivePool() + func GetOrCreateRepositoryVersion(ctx context.Context, ownerID int64) (*packages_model.PackageVersion, error) { return packages_service.GetOrCreateInternalPackageVersion(ctx, ownerID, packages_model.TypeArch, arch_module.RepositoryPackage, arch_module.RepositoryVersion) } @@ -101,6 +105,9 @@ func NewFileSign(ctx context.Context, ownerID int64, input io.Reader) (*packages // BuildPacmanDB Create db signature cache func BuildPacmanDB(ctx context.Context, ownerID int64, group, arch string) error { + key := fmt.Sprintf("pkg_%d_arch_db_%s", ownerID, group) + locker.CheckIn(key) + defer locker.CheckOut(key) pv, err := GetOrCreateRepositoryVersion(ctx, ownerID) if err != nil { return err @@ -173,15 +180,18 @@ func createDB(ctx context.Context, ownerID int64, group, arch string) (*packages if err != nil { return nil, err } + defer db.Close() gw := gzip.NewWriter(db) + defer gw.Close() tw := tar.NewWriter(gw) + defer tw.Close() count := 0 for _, pkg := range pkgs { versions, err := packages_model.GetVersionsByPackageName( ctx, ownerID, packages_model.TypeArch, pkg.Name, ) if err != nil { - return nil, errors.Join(tw.Close(), gw.Close(), db.Close(), err) + return nil, err } sort.Slice(versions, func(i, j int) bool { return versions[i].CreatedUnix > versions[j].CreatedUnix @@ -190,7 +200,7 @@ func createDB(ctx context.Context, ownerID int64, group, arch string) (*packages for _, ver := range versions { files, err := packages_model.GetFilesByVersionID(ctx, ver.ID) if err != nil { - return nil, errors.Join(tw.Close(), gw.Close(), db.Close(), err) + return nil, err } var pf *packages_model.PackageFile for _, file := range files { @@ -213,7 +223,7 @@ func createDB(ctx context.Context, ownerID int64, group, arch string) (*packages ctx, packages_model.PropertyTypeFile, pf.ID, arch_module.PropertyDescription, ) if err != nil { - return nil, errors.Join(tw.Close(), gw.Close(), db.Close(), err) + return nil, err } if len(pps) >= 1 { meta := []byte(pps[0].Value) @@ -223,60 +233,50 @@ func createDB(ctx context.Context, ownerID int64, group, arch string) (*packages Mode: int64(os.ModePerm), } if err = tw.WriteHeader(header); err != nil { - return nil, errors.Join(tw.Close(), gw.Close(), db.Close(), err) + return nil, err } if _, err := tw.Write(meta); err != nil { - return nil, errors.Join(tw.Close(), gw.Close(), db.Close(), err) + return nil, err } count++ break } } } - defer gw.Close() - defer tw.Close() if count == 0 { - return nil, errors.Join(db.Close(), io.EOF) + return nil, io.EOF } return db, nil } // GetPackageFile Get data related to provided filename and distribution, for package files // update download counter. -func GetPackageFile(ctx context.Context, group, file string, ownerID int64) (io.ReadSeekCloser, error) { - pf, err := getPackageFile(ctx, group, file, ownerID) - if err != nil { - return nil, err +func GetPackageFile(ctx context.Context, group, file string, ownerID int64) (io.ReadSeekCloser, *url.URL, *packages_model.PackageFile, error) { + fileSplit := strings.Split(file, "-") + if len(fileSplit) <= 3 { + return nil, nil, nil, errors.New("invalid file format, need ---.pkg.") } - - filestream, _, _, err := packages_service.GetPackageFileStream(ctx, pf) - return filestream, err -} - -// Ejects parameters required to get package file property from file name. -func getPackageFile(ctx context.Context, group, file string, ownerID int64) (*packages_model.PackageFile, error) { var ( - splt = strings.Split(file, "-") - pkgname = strings.Join(splt[0:len(splt)-3], "-") - vername = splt[len(splt)-3] + "-" + splt[len(splt)-2] + pkgName = strings.Join(fileSplit[0:len(fileSplit)-3], "-") + pkgVer = fileSplit[len(fileSplit)-3] + "-" + fileSplit[len(fileSplit)-2] ) - - version, err := packages_model.GetVersionByNameAndVersion(ctx, ownerID, packages_model.TypeArch, pkgname, vername) + version, err := packages_model.GetVersionByNameAndVersion(ctx, ownerID, packages_model.TypeArch, pkgName, pkgVer) if err != nil { - return nil, err + return nil, nil, nil, err } - pkgfile, err := packages_model.GetFileForVersionByName(ctx, version.ID, file, group) + pkgFile, err := packages_model.GetFileForVersionByName(ctx, version.ID, file, group) if err != nil { - return nil, err + return nil, nil, nil, err } - return pkgfile, nil + + return packages_service.GetPackageFileStream(ctx, pkgFile) } -func GetPackageDBFile(ctx context.Context, group, arch string, ownerID int64, signFile bool) (io.ReadSeekCloser, error) { +func GetPackageDBFile(ctx context.Context, group, arch string, ownerID int64, signFile bool) (io.ReadSeekCloser, *url.URL, *packages_model.PackageFile, error) { pv, err := GetOrCreateRepositoryVersion(ctx, ownerID) if err != nil { - return nil, err + return nil, nil, nil, err } fileName := fmt.Sprintf("%s.db", arch) if signFile { @@ -284,10 +284,9 @@ func GetPackageDBFile(ctx context.Context, group, arch string, ownerID int64, si } file, err := packages_model.GetFileForVersionByName(ctx, pv.ID, fileName, group) if err != nil { - return nil, err + return nil, nil, nil, err } - filestream, _, _, err := packages_service.GetPackageFileStream(ctx, file) - return filestream, err + return packages_service.GetPackageFileStream(ctx, file) } // GetOrCreateKeyPair gets or creates the PGP keys used to sign repository metadata files diff --git a/templates/package/content/arch.tmpl b/templates/package/content/arch.tmpl index bcc24b585b..6138b1d698 100644 --- a/templates/package/content/arch.tmpl +++ b/templates/package/content/arch.tmpl @@ -16,11 +16,11 @@ pacman-key --lsign-key '{{$.SignMail}}' 

 {{- if gt (len $.Groups) 1 -}}
-# {{ctx.Locale.Tr "packages.arch.pacman.repo.multi"  $.PackageDescriptor.Package.LowerName}}
+# {{ctx.Locale.Tr "packages.arch.pacman.repo.multi" $.PackageDescriptor.Package.LowerName}}
 
 {{end -}}
 {{- $GroupSize := (len .Groups) -}}
-{{-  range $i,$v :=  .Groups -}}
+{{-  range $i,$v := .Groups -}}
 {{- if gt $i 0}}
 {{end -}}{{- if gt $GroupSize 1 -}}
 # {{ctx.Locale.Tr "packages.arch.pacman.repo.multi.item" .}}
diff --git a/templates/package/metadata/arch.tmpl b/templates/package/metadata/arch.tmpl
index 822973eb7d..89001b979c 100644
--- a/templates/package/metadata/arch.tmpl
+++ b/templates/package/metadata/arch.tmpl
@@ -1,4 +1,4 @@
 {{if eq .PackageDescriptor.Package.Type "arch"}}
-	{{range .PackageDescriptor.Metadata.License}}
{{svg "octicon-law" 16 "gt-mr-3"}} {{.}}
{{end}}
-	{{if .PackageDescriptor.Metadata.ProjectURL}}
{{svg "octicon-link-external" 16 "mr-3"}} {{ctx.Locale.Tr "packages.details.project_site"}}
{{end}}
+	{{if .PackageDescriptor.Metadata.ProjectURL}}
{{svg "octicon-link-external" 16 "tw-mr-2"}} {{ctx.Locale.Tr "packages.details.project_site"}}
{{end}}
+	{{range .PackageDescriptor.Metadata.License}}
{{svg "octicon-law" 16 "tw-mr-2"}} {{.}}
{{end}}
 {{end}}
diff --git a/tests/integration/api_packages_arch_test.go b/tests/integration/api_packages_arch_test.go
index af275de442..2cf0186416 100644
--- a/tests/integration/api_packages_arch_test.go
+++ b/tests/integration/api_packages_arch_test.go
@@ -14,6 +14,7 @@ import (
 	"io"
 	"net/http"
 	"strings"
+	"sync"
 	"testing"
 	"testing/fstest"
 
@@ -258,11 +259,15 @@ HMhNSS1IzUsBcpJAPFAwwUXSM0u4BjoaR8EoGAWjgGQAAILFeyQADAAA
 				AddBasicAuth(user.Name)
 			MakeRequest(t, req, http.StatusCreated)
 
-			req = NewRequestWithBody(t, "DELETE", rootURL+"/base/notfound/1.0.0-1", nil).
+			req = NewRequestWithBody(t, "DELETE", rootURL+"/base/notfound/1.0.0-1/any", nil).
 				AddBasicAuth(user.Name)
 			MakeRequest(t, req, http.StatusNotFound)
 
-			req = NewRequestWithBody(t, "DELETE", groupURL+"/test/1.0.0-1", nil).
+			req = NewRequestWithBody(t, "DELETE", groupURL+"/test/1.0.0-1/x86_64", nil).
+				AddBasicAuth(user.Name)
+			MakeRequest(t, req, http.StatusNoContent)
+
+			req = NewRequestWithBody(t, "DELETE", groupURL+"/test/1.0.0-1/any", nil).
 				AddBasicAuth(user.Name)
 			MakeRequest(t, req, http.StatusNoContent)
 
@@ -270,12 +275,22 @@ HMhNSS1IzUsBcpJAPFAwwUXSM0u4BjoaR8EoGAWjgGQAAILFeyQADAAA
 			respPkg := MakeRequest(t, req, http.StatusOK)
 			files, err := listTarGzFiles(respPkg.Body.Bytes())
 			require.NoError(t, err)
-			require.Len(t, files, 1) // other pkg in L225
+			require.Len(t, files, 1)
 
-			req = NewRequestWithBody(t, "DELETE", groupURL+"/test2/1.0.0-1", nil).
+			req = NewRequestWithBody(t, "DELETE", groupURL+"/test2/1.0.0-1/any", nil).
 				AddBasicAuth(user.Name)
 			MakeRequest(t, req, http.StatusNoContent)
-			req = NewRequest(t, "GET", groupURL+"/x86_64/base.db")
+
+			req = NewRequest(t, "GET", groupURL+"/x86_64/base.db").
+				AddBasicAuth(user.Name)
+			MakeRequest(t, req, http.StatusNotFound)
+
+			req = NewRequestWithBody(t, "DELETE", groupURL+"/test/1.0.0-1/aarch64", nil).
+				AddBasicAuth(user.Name)
+			MakeRequest(t, req, http.StatusNoContent)
+
+			req = NewRequest(t, "GET", groupURL+"/aarch64/base.db").
+				AddBasicAuth(user.Name)
 			MakeRequest(t, req, http.StatusNotFound)
 		})
 
@@ -294,12 +309,33 @@ HMhNSS1IzUsBcpJAPFAwwUXSM0u4BjoaR8EoGAWjgGQAAILFeyQADAAA
 				resp := MakeRequest(t, req, http.StatusOK)
 				require.Equal(t, pkgs[key], resp.Body.Bytes())
 
-				req = NewRequestWithBody(t, "DELETE", groupURL+"/test2/1.0.0-1", nil).
+				req = NewRequestWithBody(t, "DELETE", groupURL+"/test2/1.0.0-1/any", nil).
 					AddBasicAuth(user.Name)
 				MakeRequest(t, req, http.StatusNoContent)
 			})
 		}
 	}
+	t.Run("Concurrent Upload", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		var wg sync.WaitGroup
+
+		targets := []string{"any", "aarch64", "x86_64"}
+		for _, tag := range targets {
+			wg.Add(1)
+			go func(i string) {
+				defer wg.Done()
+				req := NewRequestWithBody(t, "PUT", rootURL, bytes.NewReader(pkgs[i])).
+					AddBasicAuth(user.Name)
+				MakeRequest(t, req, http.StatusCreated)
+			}(tag)
+		}
+		wg.Wait()
+		for _, target := range targets {
+			req := NewRequestWithBody(t, "DELETE", rootURL+"/test/1.0.0-1/"+target, nil).
+				AddBasicAuth(user.Name)
+			MakeRequest(t, req, http.StatusNoContent)
+		}
+	})
 }
 
 func getProperty(data, key string) string {
@@ -318,10 +354,10 @@ func getProperty(data, key string) string {
 
 func listTarGzFiles(data []byte) (fstest.MapFS, error) {
 	reader, err := gzip.NewReader(bytes.NewBuffer(data))
-	defer reader.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer reader.Close()
 	tarRead := tar.NewReader(reader)
 	files := make(fstest.MapFS)
 	for {

From 5b847561370fe768775390afc0c82cb7302f3f80 Mon Sep 17 00:00:00 2001
From: Otto Richter 
Date: Fri, 27 Sep 2024 20:44:22 +0200
Subject: [PATCH 047/443] Split env preparation boilerplate

---
 .../workflows/composite/setup-env/action.yaml | 11 ++++
 .forgejo/workflows/testing.yml                | 51 +++----------------
 2 files changed, 18 insertions(+), 44 deletions(-)
 create mode 100644 .forgejo/workflows/composite/setup-env/action.yaml

diff --git a/.forgejo/workflows/composite/setup-env/action.yaml b/.forgejo/workflows/composite/setup-env/action.yaml
new file mode 100644
index 0000000000..30e78dbb71
--- /dev/null
+++ b/.forgejo/workflows/composite/setup-env/action.yaml
@@ -0,0 +1,11 @@
+runs:
+  using: "composite"
+  steps:
+    - uses: https://code.forgejo.org/actions/setup-go@v4
+      with:
+        go-version-file: "go.mod"
+    - name: setup user and permissions
+      run: |
+        git config --add safe.directory '*'
+        adduser --quiet --comment forgejo --disabled-password forgejo
+        chown -R forgejo:forgejo .
diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml
index 725cd242ee..d5c7b86abb 100644
--- a/.forgejo/workflows/testing.yml
+++ b/.forgejo/workflows/testing.yml
@@ -20,9 +20,7 @@ jobs:
           ${{ toJSON(github) }}
           EOF
       - uses: https://code.forgejo.org/actions/checkout@v3
-      - uses: https://code.forgejo.org/actions/setup-go@v4
-        with:
-          go-version-file: "go.mod"
+      - uses: ./.forgejo/workflows/composite/setup-env
       - run: make deps-backend deps-tools
       - run: make --always-make -j$(nproc) lint-backend tidy-check swagger-check fmt-check swagger-validate # ensure the "go-licenses" make target runs
       - run: |
@@ -67,13 +65,7 @@ jobs:
           MINIO_ROOT_PASSWORD: 12345678
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v3
-      - uses: https://code.forgejo.org/actions/setup-go@v4
-        with:
-          go-version-file: "go.mod"
-      - run: |
-          git config --add safe.directory '*'
-          adduser --quiet --comment forgejo --disabled-password forgejo
-          chown -R forgejo:forgejo .
+      - uses: ./.forgejo/workflows/composite/setup-env
       - name: install git >= 2.42
         run: |
           export DEBIAN_FRONTEND=noninteractive
@@ -132,13 +124,7 @@ jobs:
         options: ${{ matrix.cacher.options }}
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v3
-      - uses: https://code.forgejo.org/actions/setup-go@v4
-        with:
-          go-version-file: "go.mod"
-      - run: |
-          git config --add safe.directory '*'
-          adduser --quiet --comment forgejo --disabled-password forgejo
-          chown -R forgejo:forgejo .
+      - uses: ./.forgejo/workflows/composite/setup-env
       - name: install git >= 2.42
         run: |
           export DEBIAN_FRONTEND=noninteractive
@@ -184,9 +170,7 @@ jobs:
           MYSQL_EXTRA_FLAGS: --innodb-adaptive-flushing=OFF --innodb-buffer-pool-size=4G --innodb-log-buffer-size=128M --innodb-flush-log-at-trx-commit=0 --innodb-flush-log-at-timeout=30 --innodb-flush-method=nosync --innodb-fsync-threshold=1000000000
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v3
-      - uses: https://code.forgejo.org/actions/setup-go@v4
-        with:
-          go-version-file: "go.mod"
+      - uses: ./.forgejo/workflows/composite/setup-env
       - name: install dependencies & git >= 2.42
         run: |
           export DEBIAN_FRONTEND=noninteractive
@@ -195,11 +179,6 @@ jobs:
           apt-get install --no-install-recommends -qq -y git git-lfs
           rm /etc/apt/sources.list.d/testing.list
           apt-get update -qq
-      - name: setup user and permissions
-        run: |
-          git config --add safe.directory '*'
-          adduser --quiet --comment forgejo --disabled-password forgejo
-          chown -R forgejo:forgejo .
       - run: |
           su forgejo -c 'make deps-backend'
       - uses: actions/cache/restore@v4
@@ -238,9 +217,7 @@ jobs:
           POSTGRES_PASSWORD: postgres
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v3
-      - uses: https://code.forgejo.org/actions/setup-go@v4
-        with:
-          go-version-file: "go.mod"
+      - uses: ./.forgejo/workflows/composite/setup-env
       - name: install dependencies & git >= 2.42
         run: |
           export DEBIAN_FRONTEND=noninteractive
@@ -249,11 +226,6 @@ jobs:
           apt-get install --no-install-recommends -qq -y git git-lfs
           rm /etc/apt/sources.list.d/testing.list
           apt-get update -qq
-      - name: setup user and permissions
-        run: |
-          git config --add safe.directory '*'
-          adduser --quiet --comment forgejo --disabled-password forgejo
-          chown -R forgejo:forgejo .
       - run: |
           su forgejo -c 'make deps-backend'
       - uses: actions/cache/restore@v4
@@ -281,9 +253,7 @@ jobs:
       image: 'code.forgejo.org/oci/node:20-bookworm'
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v3
-      - uses: https://code.forgejo.org/actions/setup-go@v4
-        with:
-          go-version-file: "go.mod"
+      - uses: ./.forgejo/workflows/composite/setup-env
       - name: install dependencies & git >= 2.42
         run: |
           export DEBIAN_FRONTEND=noninteractive
@@ -292,11 +262,6 @@ jobs:
           apt-get install --no-install-recommends -qq -y git git-lfs
           rm /etc/apt/sources.list.d/testing.list
           apt-get update -qq
-      - name: setup user and permissions
-        run: |
-          git config --add safe.directory '*'
-          adduser --quiet --comment forgejo --disabled-password forgejo
-          chown -R forgejo:forgejo .
       - run: |
           su forgejo -c 'make deps-backend'
       - uses: actions/cache/restore@v4
@@ -330,8 +295,6 @@ jobs:
       image: 'code.forgejo.org/oci/node:20-bookworm'
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v3
-      - uses: https://code.forgejo.org/actions/setup-go@v4
-        with:
-          go-version-file: "go.mod"
+      - uses: ./.forgejo/workflows/composite/setup-env
       - run: make deps-backend deps-tools
       - run: make security-check

From c0b17a06ef53d122644304dd8a85a01a3c842ade Mon Sep 17 00:00:00 2001
From: Otto Richter 
Date: Fri, 27 Sep 2024 20:47:09 +0200
Subject: [PATCH 048/443] Split backend building boilerplate

---
 .../composite/build-backend/action.yaml       | 15 ++++
 .forgejo/workflows/testing.yml                | 78 ++-----------------
 2 files changed, 23 insertions(+), 70 deletions(-)
 create mode 100644 .forgejo/workflows/composite/build-backend/action.yaml

diff --git a/.forgejo/workflows/composite/build-backend/action.yaml b/.forgejo/workflows/composite/build-backend/action.yaml
new file mode 100644
index 0000000000..193ff911e1
--- /dev/null
+++ b/.forgejo/workflows/composite/build-backend/action.yaml
@@ -0,0 +1,15 @@
+runs:
+  using: "composite"
+  steps:
+    - run: |
+        su forgejo -c 'make deps-backend'
+    - uses: actions/cache@v4
+      id: cache-backend
+      with:
+        path: '/workspace/forgejo/forgejo/gitea'
+        key: backend-build-${{ github.sha }}
+    - if: steps.cache-backend.outputs.cache-hit != 'true'
+      run: |
+        su forgejo -c 'make backend'
+      env:
+        TAGS: bindata
diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml
index d5c7b86abb..5f7a1e351a 100644
--- a/.forgejo/workflows/testing.yml
+++ b/.forgejo/workflows/testing.yml
@@ -21,16 +21,9 @@ jobs:
           EOF
       - uses: https://code.forgejo.org/actions/checkout@v3
       - uses: ./.forgejo/workflows/composite/setup-env
-      - run: make deps-backend deps-tools
-      - run: make --always-make -j$(nproc) lint-backend tidy-check swagger-check fmt-check swagger-validate # ensure the "go-licenses" make target runs
-      - run: |
-          make backend
-        env:
-          TAGS: bindata
-      - uses: actions/cache@v4
-        with:
-          path: '/workspace/forgejo/forgejo/gitea'
-          key: backend-build-${{ github.sha }}
+      - run: su forgejo -c 'make deps-backend deps-tools'
+      - run: su forgejo -c 'make --always-make -j$(nproc) lint-backend tidy-check swagger-check fmt-check swagger-validate' # ensure the "go-licenses" make target runs
+      - uses: ./.forgejo/workflows/composite/build-backend
   frontend-checks:
     if: ${{ !startsWith(vars.ROLE, 'forgejo-') }}
     runs-on: docker
@@ -78,18 +71,7 @@ jobs:
         run: |
           apt-get -q install -qq -y jq
           ./release-notes-assistant.sh test_main
-      - run: |
-          su forgejo -c 'make deps-backend'
-      - uses: actions/cache/restore@v4
-        id: cache-backend
-        with:
-          path: '/workspace/forgejo/forgejo/gitea'
-          key: backend-build-${{ github.sha }}
-      - if: steps.cache-backend.outputs.cache-hit != 'true'
-        run: |
-          su forgejo -c 'make backend'
-        env:
-          TAGS: bindata
+      - uses: ./.forgejo/workflows/composite/build-backend
       - run: |
           su forgejo -c 'make test-backend test-check'
         timeout-minutes: 50
@@ -133,18 +115,7 @@ jobs:
           apt-get -q install -qq -y git
           rm /etc/apt/sources.list.d/testing.list
           apt-get update -qq
-      - run: |
-          su forgejo -c 'make deps-backend'
-      - uses: actions/cache/restore@v4
-        id: cache-backend
-        with:
-          path: '/workspace/forgejo/forgejo/gitea'
-          key: backend-build-${{ github.sha }}
-      - if: steps.cache-backend.outputs.cache-hit != 'true'
-        run: |
-          su forgejo -c 'make backend'
-        env:
-          TAGS: bindata
+      - uses: ./.forgejo/workflows/composite/build-backend
       - run: |
           su forgejo -c 'make test-remote-cacher test-check'
         timeout-minutes: 50
@@ -179,18 +150,7 @@ jobs:
           apt-get install --no-install-recommends -qq -y git git-lfs
           rm /etc/apt/sources.list.d/testing.list
           apt-get update -qq
-      - run: |
-          su forgejo -c 'make deps-backend'
-      - uses: actions/cache/restore@v4
-        id: cache-backend
-        with:
-          path: '/workspace/forgejo/forgejo/gitea'
-          key: backend-build-${{ github.sha }}
-      - if: steps.cache-backend.outputs.cache-hit != 'true'
-        run: |
-          su forgejo -c 'make backend'
-        env:
-          TAGS: bindata
+      - uses: ./.forgejo/workflows/composite/build-backend
       - run: |
           su forgejo -c 'make test-mysql-migration test-mysql'
         timeout-minutes: 50
@@ -226,18 +186,7 @@ jobs:
           apt-get install --no-install-recommends -qq -y git git-lfs
           rm /etc/apt/sources.list.d/testing.list
           apt-get update -qq
-      - run: |
-          su forgejo -c 'make deps-backend'
-      - uses: actions/cache/restore@v4
-        id: cache-backend
-        with:
-          path: '/workspace/forgejo/forgejo/gitea'
-          key: backend-build-${{ github.sha }}
-      - if: steps.cache-backend.outputs.cache-hit != 'true'
-        run: |
-          su forgejo -c 'make backend'
-        env:
-          TAGS: bindata
+      - uses: ./.forgejo/workflows/composite/build-backend
       - run: |
           su forgejo -c 'make test-pgsql-migration test-pgsql'
         timeout-minutes: 50
@@ -262,18 +211,7 @@ jobs:
           apt-get install --no-install-recommends -qq -y git git-lfs
           rm /etc/apt/sources.list.d/testing.list
           apt-get update -qq
-      - run: |
-          su forgejo -c 'make deps-backend'
-      - uses: actions/cache/restore@v4
-        id: cache-backend
-        with:
-          path: '/workspace/forgejo/forgejo/gitea'
-          key: backend-build-${{ github.sha }}
-      - if: steps.cache-backend.outputs.cache-hit != 'true'
-        run: |
-          su forgejo -c 'make backend'
-        env:
-          TAGS: bindata sqlite sqlite_unlock_notify
+      - uses: ./.forgejo/workflows/composite/build-backend
       - run: |
           su forgejo -c 'make test-sqlite-migration test-sqlite'
         timeout-minutes: 50

From 735bcf978f4d98399b1e05008911a1f8670fcacd Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Sat, 28 Sep 2024 00:02:39 +0000
Subject: [PATCH 049/443] Update dependency webpack to v5.95.0

---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 156a76f3ce..b6edb9d5a5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -55,7 +55,7 @@
         "vue-chartjs": "5.3.1",
         "vue-loader": "17.4.2",
         "vue3-calendar-heatmap": "2.0.5",
-        "webpack": "5.94.0",
+        "webpack": "5.95.0",
         "webpack-cli": "5.1.4",
         "wrap-ansi": "9.0.0"
       },
@@ -16422,9 +16422,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.94.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
-      "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
+      "version": "5.95.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz",
+      "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==",
       "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.5",
@@ -16537,9 +16537,9 @@
       }
     },
     "node_modules/webpack/node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
       "license": "MIT"
     },
     "node_modules/webpack/node_modules/ajv": {
diff --git a/package.json b/package.json
index b3daef53f0..24e3bd3eb9 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "vue-chartjs": "5.3.1",
     "vue-loader": "17.4.2",
     "vue3-calendar-heatmap": "2.0.5",
-    "webpack": "5.94.0",
+    "webpack": "5.95.0",
     "webpack-cli": "5.1.4",
     "wrap-ansi": "9.0.0"
   },

From e40554f89baa79d12a1ff89b434041b297afff02 Mon Sep 17 00:00:00 2001
From: Codeberg Translate 
Date: Sat, 28 Sep 2024 09:40:29 +0000
Subject: [PATCH 050/443] i18n: update of translations from Codeberg Translate
 (#5355)

Co-authored-by: earl-warren 
Co-authored-by: Vaclovas Intas 
Co-authored-by: Zughy 
Co-authored-by: aleksi 
Co-authored-by: Application-Maker 
Co-authored-by: Salif Mehmed 
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro 
Co-authored-by: Panagiotis \"Ivory\" Vasilopoulos 
Co-authored-by: claudep 
Co-authored-by: vri 
Co-authored-by: nicokaiser 
Co-authored-by: Outbreak2096 
Co-authored-by: robines 
Co-authored-by: nazrin 
Co-authored-by: Kaede Fujisaki 

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5355
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Codeberg Translate 
Co-committed-by: Codeberg Translate 
---
 options/locale/locale_bg.ini    |  25 +++-
 options/locale/locale_cs-CZ.ini |  38 +++--
 options/locale/locale_de-DE.ini |  32 ++++-
 options/locale/locale_el-GR.ini | 242 ++++++++++++++++----------------
 options/locale/locale_fi-FI.ini |   5 +
 options/locale/locale_fr-FR.ini |  58 +++++---
 options/locale/locale_is-IS.ini |   8 +-
 options/locale/locale_it-IT.ini |  23 +++
 options/locale/locale_ja-JP.ini |   7 +
 options/locale/locale_lt.ini    |  77 +++++++++-
 options/locale/locale_nb_NO.ini | 113 ++++++++++++++-
 options/locale/locale_ru-RU.ini |  16 ++-
 options/locale/locale_zh-CN.ini |  34 ++++-
 13 files changed, 505 insertions(+), 173 deletions(-)

diff --git a/options/locale/locale_bg.ini b/options/locale/locale_bg.ini
index 01fb84c3c6..2207129cfa 100644
--- a/options/locale/locale_bg.ini
+++ b/options/locale/locale_bg.ini
@@ -168,6 +168,7 @@ versions.view_all = Вижте всички
 dependencies = Зависимости
 published_by_in = Публикуван %[1]s от %[3]s в %[5]s
 published_by = Публикуван %[1]s от %[3]s
+generic.download = Изтеглете пакета от командния ред:
 
 [tool]
 hours = %d часа
@@ -1020,7 +1021,7 @@ pulls.title_desc_one = иска да слее %[1]d подаване от 
 pulls.showing_specified_commit_range = Показани са само промените между %[1]s..%[2]s
 pulls.merged_title_desc_one = сля %[1]d подаване от %[2]s в %[3]s %[4]s
 pulls.no_merge_access = Не сте упълномощени за сливане на тази заявка за сливане.
-activity.navbar.code_frequency = Честота на кода
+activity.navbar.code_frequency = Честота на промените
 activity.git_stats_pushed_1 = е изтласкал
 activity.git_stats_push_to_branch = към %s и
 contributors.contribution_type.commits = Подавания
@@ -1183,6 +1184,15 @@ diff.hide_file_tree = Скриване на файловото дърво
 tag.ahead.target = в %s след този маркер
 diff.file_image_width = Широчина
 activity.unresolved_conv_label = Отворено
+invisible_runes_line = `Този ред съдържа невидими Уникод знаци`
+code.desc = Достъп до програмния код, файловете, подаванията и клоновете.
+settings.branches.update_default_branch = Обновяване на стандартния клон
+settings.default_branch_desc = Изберете стандартен клон за хранилището, за заявки за сливане и подавания на код:
+settings.transfer.button = Прехвърляне на притежанието
+settings.transfer.modal.title = Прехвърляне на притежанието
+ambiguous_runes_line = `Този ред съдържа двусмислени Уникод знаци`
+ambiguous_character = `%[1]c [U+%04[1]X] може да бъде объркан с %[2]c [U+%04[2]X]`
+invisible_runes_header = `Този файл съдържа невидими Уникод знаци`
 
 [modal]
 confirm = Потвърждаване
@@ -1279,6 +1289,7 @@ members.member = Участник
 members.private_helper = Да е видим
 teams.no_desc = Този екип няма описание
 settings.delete_org_desc = Тази организация ще бъде изтрита перманентно. Продължаване?
+open_dashboard = Отваряне на таблото
 
 [install]
 admin_password = Парола
@@ -1378,6 +1389,7 @@ followers.title.few = Последователи
 followers.title.one = Последовател
 following.title.one = Следван
 following.title.few = Следвани
+public_activity.visibility_hint.self_public = Вашата дейност е видима за всички, с изключение на взаимодействията в частни пространства. Конфигуриране.
 
 [home]
 filter = Други филтри
@@ -1544,6 +1556,8 @@ push_tag = изтласка маркер %[3]s към %[3]s#%[2]s`
 reject_pull_request = `предложи промени за %[3]s#%[2]s`
 compare_branch = Сравняване
+compare_commits_general = Сравняване на подавания
+compare_commits = Сравнете %d подавания
 
 [auth]
 tab_openid = OpenID
@@ -1572,6 +1586,12 @@ tab_signin = Влизане
 tab_signup = Регистриране
 password_pwned = Паролата, която сте избрали, е в списък с откраднати пароли, разкрити преди това при публични пробиви на данни. Моля, опитайте отново с различна парола.
 confirmation_mail_sent_prompt = Ново ел. писмо за потвърждение е изпратено до %s. За да завършите процеса на регистрация, моля, проверете входящата си кутия и последвайте предоставената връзка в рамките на следващите %s. Ако адресът за ел. поща е неправилен, можете да влезете и да поискате друго ел. писмо за потвърждение да бъде изпратено на различен адрес.
+hint_login = Вече имате акаунт? Влезте!
+hint_register = Нуждаете се от акаунт? Регистрирайте се.
+sign_up_button = Регистрирайте се.
+back_to_sign_in = Назад към Вход
+sign_in_openid = Продължаване с OpenID
+send_reset_mail = Изпращане на ел. писмо за възстановяване
 
 [aria]
 footer.software = Относно този софтуер
@@ -1582,7 +1602,7 @@ footer = Долен колонтитул
 install = Лесен за инсталиране
 lightweight = Лек
 license = Отворен код
-install_desc = Просто стартирайте двоичния файл за вашата платформа, използвайте Docker, или го получете пакетирано.
+install_desc = Просто стартирайте двоичния файл за вашата платформа, използвайте Docker, или го получете пакетиран.
 app_desc = Безпроблемна Git услуга със самостоятелен хостинг
 platform = Междуплатформен
 lightweight_desc = Forgejo има ниски минимални изисквания и може да работи на икономичен Raspberry Pi. Спестете енергията на вашата машина!
@@ -1670,6 +1690,7 @@ contributors.what = приноси
 recent_commits.what = скорошни подавания
 component_loading = Зареждане на %s...
 component_loading_info = Това може да отнеме известно време…
+code_frequency.what = честота на промените
 
 [projects]
 type-1.display_name = Индивидуален проект
diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
index 9ca8c6b387..4fa19b80f2 100644
--- a/options/locale/locale_cs-CZ.ini
+++ b/options/locale/locale_cs-CZ.ini
@@ -842,8 +842,8 @@ add_key=Přidat klíč
 ssh_desc=Tyto veřejné klíče SSH jsou propojeny s vaším účtem. Odpovídající soukromé klíče umožní plný přístup k vašim repozitářům. Klíče SSH, které byly ověřeny, mohou být použity pro ověření Git commitů podepsaných přes SSH.
 principal_desc=Tyto SSH Principal certifikáty jsou přidruženy k vašemu účtu a umožňují plný přístup do vašich repozitářů.
 gpg_desc=Tyto veřejné klíče GPG jsou propojeny s vaším účtem a používají se k ověření vašich commitů. Uložte je na bezpečné místo, jelikož umožňují podepsat commity vaší identitou.
-ssh_helper=Potřebujete pomoct? Podívejte se do příručky GitHubu na to vytvoření vlastních klíčů SSH nebo vyřešte běžné problémy, se kterými se můžete potkat při použití SSH.
-gpg_helper=Potřebujete pomoct? Podívejte se do příručky GitHubu o GPG.
+ssh_helper=Potřebujete pomoct? Podívejte se do příručky, jak vytvořit vlastní klíče SSH nebo vyřešte běžné problémy, se kterými se můžete potkat při použití SSH.
+gpg_helper=Potřebujete pomoct? Podívejte se do příručky o GPG.
 add_new_key=Přidat klíč SSH
 add_new_gpg_key=Přidat klíč GPG
 key_content_ssh_placeholder=Začíná s „ssh-ed25519“, „ssh-rsa“, „ecdsa-sha2-nistp256“, „ecdsa-sha2-nistp384“, „ecdsa-sha2-nistp521“, „sk-ecdsa-sha2-nistp256@openssh.com“ nebo „sk-ssh-ed25519@openssh.com“
@@ -1427,7 +1427,7 @@ commitstatus.failure=Chyba
 commitstatus.pending=Čekající
 commitstatus.success=Úspěch
 
-ext_issues=Přístup k externím problémům
+ext_issues=Externí problémy
 ext_issues.desc=Odkaz na externí systém problémů.
 
 projects=Projekty
@@ -1608,9 +1608,9 @@ issues.no_content=K dispozici není žádný popis.
 issues.close=Zavřít problém
 issues.comment_pull_merged_at=sloučený commit %[1]s do %[2]s %[3]s
 issues.comment_manually_pull_merged_at=ručně sloučený commit %[1]s do %[2]s %[3]s
-issues.close_comment_issue=Okomentovat a zavřít
+issues.close_comment_issue=Zavřít s komentářem
 issues.reopen_issue=Znovu otevřít
-issues.reopen_comment_issue=Okomentovat a znovu otevřít
+issues.reopen_comment_issue=Znovu otevřít s komentářem
 issues.create_comment=Okomentovat
 issues.closed_at=`uzavřel/a tento problém %[2]s`
 issues.reopened_at=`znovu otevřel/a tento problém %[2]s`
@@ -1995,7 +1995,7 @@ signing.wont_sign.commitssigned=Sloučení nebude podepsáno, protože všechny
 signing.wont_sign.approved=Sloučení nebude podepsáno, protože požadavek na natažení není schválen.
 signing.wont_sign.not_signed_in=Nejste přihlášeni.
 
-ext_wiki=Přístup k externí Wiki
+ext_wiki=Externí wiki
 ext_wiki.desc=Odkaz do externí Wiki.
 
 wiki=Wiki
@@ -2436,7 +2436,7 @@ settings.protect_branch_name_pattern=Vzor jména chráněné větve
 settings.protect_branch_name_pattern_desc=Vzory názvů chráněných větví. Pro vzorovou syntaxi viz dokumentace. Příklady: main, release/**
 settings.protect_patterns=Vzory
 settings.protect_protected_file_patterns=Vzory chráněných souborů (oddělené středníkem „;“)
-settings.protect_protected_file_patterns_desc=Chráněné soubory, které nemají povoleno být měněny přímo, i když uživatel má právo přidávat, upravovat nebo mazat soubory v této větvi. Více vzorů lze oddělit pomocí středníku („;“). Podívejte se na github.com/gobwas/glob dokumentaci pro syntaxi vzoru. Příklady: .drone.yml, /docs/**/*.txt.
+settings.protect_protected_file_patterns_desc=Chráněné soubory, které nemají povoleno být měněny přímo, i když uživatel má právo přidávat, upravovat nebo mazat soubory v této větvi. Více vzorů lze oddělit pomocí středníku („;“). Podívejte se na dokumentaci %[2]s pro syntaxi vzoru. Příklady: .drone.yml, /docs/**/*.txt.
 settings.protect_unprotected_file_patterns=Vzory nechráněných souborů (oddělené středníkem „;“)
 settings.protect_unprotected_file_patterns_desc=Nechráněné soubory, které je možné měnit přímo, pokud má uživatel právo zápisu, čímž se obejde omezení push. Více vzorů lze oddělit pomocí středníku („;“). Podívejte se na %[2]s dokumentaci pro syntaxi vzoru. Příklady: .drone.yml, /docs/**/*.txt.
 settings.add_protected_branch=Zapnout ochranu
@@ -3822,7 +3822,7 @@ management=Správa tajných klíčů
 [actions]
 actions=Akce
 
-unit.desc=Spravovat integrované pipeliny CI/CD pomocí funkce Forgejo Actions
+unit.desc=Spravovat integrované pipeliny CI/CD pomocí funkce Forgejo Actions.
 
 status.unknown=Neznámý
 status.waiting=Čekání
@@ -3987,4 +3987,24 @@ eib = EiB
 
 
 [translation_meta]
-test = diky vsem za pomoc :)
\ No newline at end of file
+test = diky vsem za pomoc :)
+
+[repo.permissions]
+pulls.write = Zapisovat: Zavírat žádosti o sloučení a spravovat metadata jako štítky, milníky, zpracovatele, data dokončení a závislosti.
+packages.write = Zapisovat: Zveřejňovat a mazat balíčky připojené k repozitáři.
+projects.read = Číst: Přístup k projektovým nástěnkám repozitáře.
+code.write = Zapisovat: Odesílat změny do repozitáře, vytvářet větve a značky.
+issues.write = Zapisovat: Zavírat problémy a spravovat metadata jako štítky, milníky, zpracovatele, data dokončení a závislosti.
+pulls.read = Číst: Číst a vytvářet žádosti o sloučení.
+releases.read = Číst: Zobrazovat a stahovat vydání.
+releases.write = Zapisovat: Zveřejňovat, upravovat a mazat vydání a jejich soubory.
+wiki.read = Číst: Číst integrovanou wiki a její historii.
+wiki.write = Zapisovat: Vytvářet, aktualizovat a mazat stránky v integrované wiki.
+projects.write = Zapisovat: Vytvářet projekty a sloupce a upravovat je.
+packages.read = Číst: Zobrazovat a stahovat balíčky připojené k repozitáři.
+actions.read = Číst: Zobrazovat integrované pipeliny CI/CD a jejich protokoly.
+actions.write = Zapisovat: Ručně spouštět, restartovat, rušit nebo schvalovat čekající pipeliny CI/CD.
+ext_wiki = Přístup k odkazu v externí wiki. Oprávnění jsou spravována externě.
+code.read = Číst: Přístup a klonování kódu v repozitáři.
+issues.read = Číst: Číst a vytvářet problémy a komentáře.
+ext_issues = Přístup k odkazu v externím sledovacím systému problémů. Oprávnění jsou spravována externě.
\ No newline at end of file
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
index 39b3596aa7..b112ec82c3 100644
--- a/options/locale/locale_de-DE.ini
+++ b/options/locale/locale_de-DE.ini
@@ -1420,7 +1420,7 @@ commitstatus.failure=Fehler
 commitstatus.pending=Ausstehend
 commitstatus.success=Erfolg
 
-ext_issues=Zugriff auf Externe Issues
+ext_issues=Externe Issues
 ext_issues.desc=Link zu externem Issuetracker.
 
 projects=Projekte
@@ -1601,9 +1601,9 @@ issues.no_content=Keine Beschreibung angegeben.
 issues.close=Issue schließen
 issues.comment_pull_merged_at=hat Commit %[1]s in %[2]s %[3]s zusammengeführt
 issues.comment_manually_pull_merged_at=hat Commit %[1]s in %[2]s %[3]s manuell zusammengeführt
-issues.close_comment_issue=Kommentieren und schließen
+issues.close_comment_issue=Mit Kommentar schließen
 issues.reopen_issue=Wieder öffnen
-issues.reopen_comment_issue=Kommentieren und wieder öffnen
+issues.reopen_comment_issue=Mit Kommentar wieder öffnen
 issues.create_comment=Kommentieren
 issues.closed_at=`hat diesen Issue %[2]s geschlossen`
 issues.reopened_at=`hat dieses Issue %[2]s wieder geöffnet`
@@ -1984,7 +1984,7 @@ signing.wont_sign.commitssigned=Der Merge-Commit wird nicht signiert werden, da
 signing.wont_sign.approved=Der Merge-Commit wird nicht signiert werden, da der Pull-Request nicht genehmigt wurde.
 signing.wont_sign.not_signed_in=Du bist nicht eingeloggt.
 
-ext_wiki=Zugriff auf externes Wiki
+ext_wiki=Externes Wiki
 ext_wiki.desc=Verweis auf externes Wiki.
 
 wiki=Wiki
@@ -3792,7 +3792,7 @@ management=Secrets verwalten
 [actions]
 actions=Actions
 
-unit.desc=Integrierte CI/CD-Pipelines mit Forgejo-Actions verwalten
+unit.desc=Integrierte CI/CD-Pipelines mit Forgejo-Actions verwalten.
 
 status.unknown=Unbekannt
 status.waiting=Wartend
@@ -3964,4 +3964,24 @@ eib = EiB
 
 
 [translation_meta]
-test = ok
\ No newline at end of file
+test = ok
+
+[repo.permissions]
+code.write = Schreiben: In das Repository pushen, Branches und Tags erstellen.
+code.read = Lesen: Zugriff auf das Repository und Klonen.
+issues.read = Lesen: Issues und Kommentare lesen und erstellen.
+issues.write = Schreiben: Issues schließen und Metadaten wie Labels, Meilensteine, Zuweisungen, Fälligkeitsdaten und Abhängigkeiten verwalten.
+pulls.read = Lesen: Pull-Requests lesen und erstellen.
+releases.read = Lesen: Releases ansehen und herunterladen.
+releases.write = Schreiben: Releases und ihre Assets veröffentlichen, bearbeiten und löschen.
+wiki.read = Read: Das integrierte Wiki und seine Historie lesen.
+wiki.write = Schreiben: Seiten im integrierten Wiki erstellen, aktualisieren und löschen.
+projects.read = Lesen: Zugriff auf Projektboards des Repositories.
+projects.write = Schreiben: Projekte und Spalten erstellen und bearbeiten.
+packages.read = Lesen: Pakete dieses Repositories betrachten und herunterladen.
+packages.write = Schreiben: Pakete dieses Repositories veröffentlichen und löschen.
+actions.read = Lesen: Integrierte CI/CD-Pipelines und ihre Logs betrachten.
+actions.write = Schreiben: Ausstehende CI/CD-Pipelines manuell auslösen, neustarten, abbrechen oder genehmigen.
+ext_issues = Zugriff auf den Link zu einem externen Issue-Tracker. Die Berechtigungen werden extern verwaltet.
+ext_wiki = Zugriff auf den Link zu einem externen Wiki. Die Berechtigungen werden extern verwaltet.
+pulls.write = Schreiben: Pull-Requests schließen und Metadaten wie Labels, Meilensteine, Zuweisungen, Fälligkeitsdaten und Abhängigkeiten verwalten.
\ No newline at end of file
diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini
index 55478dacf2..2df8dce95d 100644
--- a/options/locale/locale_el-GR.ini
+++ b/options/locale/locale_el-GR.ini
@@ -51,7 +51,7 @@ webauthn_error_empty=Πρέπει να ορίσετε ένα όνομα για 
 webauthn_error_timeout=Το χρονικό όριο έφτασε πριν το κλειδί να διαβαστεί. Παρακαλώ ανανεώστε τη σελίδα και προσπαθήστε ξανά.
 webauthn_reload=Ανανέωση
 
-repository=Αποθετήριο
+repository=Repository
 organization=Οργανισμός
 mirror=Αντίγραφο
 new_repo=Νέο αποθετήριο
@@ -129,7 +129,7 @@ archived=Αρχειοθετήθηκε
 
 concept_system_global=Γενικό
 concept_user_individual=Ατομικό
-concept_code_repository=Αποθετήριο
+concept_code_repository=Repository
 concept_user_organization=Οργανισμός
 
 show_timestamps=Εμφάνιση χρονοσημάνσεων
@@ -160,11 +160,11 @@ invalid_data = Τα δεδομένα δεν είναι έγκυρα: %v
 test = Τεστ
 copy_generic = Αντιγραφή στο πρόχειρο
 error413 = Έχετε εξαντλήσει τους διαθέσιμους πόρους σας.
-new_repo.link = Νέο αποθετήριο
+new_repo.link = Νέο repository
 new_migrate.link = Νέα μεταφορά
 new_org.link = Νέος οργανισμός
 new_migrate.title = Νέα μεταφορά
-new_repo.title = Νέο αποθετήριο
+new_repo.title = Νέο repository
 new_org.title = Νέος οργανισμός
 
 [aria]
@@ -504,8 +504,8 @@ reset_password.text=Εφόσον το αίτημα δημιουργήθηκε α
 
 register_success=Η εγγραφή ολοκληρώθηκε επιτυχώς
 
-issue_assigned.pull=Ο/Η @%[1]s σας έχει αναθέσει στο pull request %[2]s στο αποθετήριο %[3]s.
-issue_assigned.issue=Ο/Η @%[1]s σας ανέθεσε το ζήτημα %[2]s στο αποθετήριο %[3]s.
+issue_assigned.pull=Ο/Η @%[1]s σας έχει αναθέσει στο pull request %[2]s στο repository %[3]s.
+issue_assigned.issue=Ο/Η @%[1]s σας ανέθεσε το ζήτημα %[2]s στο repository %[3]s.
 
 issue.x_mentioned_you=Ο/Η @%s σας ανέφερε:
 issue.action.force_push=Ο/Η %[1]s έκανε force-push το %[2]s από %[3]s σε %[4]s.
@@ -530,13 +530,13 @@ release.downloads=Λήψεις:
 release.download.zip=Πηγαίος Κώδικας (ZIP)
 release.download.targz=Πηγαίος Κώδικας (TAR.GZ)
 
-repo.transfer.subject_to=Ο/Η %s θα ήθελε να μεταφέρει το αποθετήριο «%s» σε %s
-repo.transfer.subject_to_you=Ο/Η %s θα ήθελε να σας μεταφέρει το αποθετήριο «%s»
+repo.transfer.subject_to=Ο/Η %s θα ήθελε να μεταφέρει το repository «%s» στο %s
+repo.transfer.subject_to_you=Ο/Η %s θα ήθελε να σας μεταφέρει το repository «%s»
 repo.transfer.to_you=εσάς
 repo.transfer.body=Για να αποδεχτείτε ή να απορρίψετε το αίτημα αυτό, επισκεφθείτε το %s ή απλά αγνοήστε το.
 
 repo.collaborator.added.subject=Ο/Η %s σας πρόσθεσε στο %s ως συνεργάτη
-repo.collaborator.added.text=Είστε πλέον συνεργάτης στο αποθετήριο:
+repo.collaborator.added.text=Είστε πλέον συνεργάτης στο repository:
 
 team_invite.subject=Ο/Η %[1]s σας προσκάλεσε να συμμετέχετε στον οργανισμό %[2]s
 team_invite.text_1=Ο/Η %[1]s σας προσκάλεσε να συμμετέχετε στην ομάδα %[2]s του οργανισμού %[3]s.
@@ -615,10 +615,10 @@ username_change_not_local_user=Δεν επιτρέπεται στους μη τ
 username_has_not_been_changed=Το όνομα χρήστη δεν άλλαξε
 repo_name_been_taken=Το όνομα του αποθετηρίου χρησιμοποιείται ήδη.
 repository_force_private=Η επιλογή Μόνο Ιδιωτικά είναι ενεργοποιημένη: τα ιδιωτικά αποθετήρια δεν μπορούν να δημοσιευθούν.
-repository_files_already_exist=Αρχεία υπάρχουν ήδη για αυτό το αποθετήριο. Επικοινωνήστε με το διαχειριστή του συστήματος.
-repository_files_already_exist.adopt=Αρχεία υπάρχουν ήδη για αυτό το αποθετήριο και μπορούν να Υιοθετηθούν μόνο.
-repository_files_already_exist.delete=Τα αρχεία υπάρχουν ήδη για αυτόν το αποθετήριο. Πρέπει να τα διαγράψετε.
-repository_files_already_exist.adopt_or_delete=Τα αρχεία υπάρχουν ήδη για αυτόν το αποθετήριο. Είτε υιοθετήστε τα είτε διαγράψτε τα.
+repository_files_already_exist=Αρχεία υπάρχουν ήδη για αυτό το repository. Επικοινωνήστε με το διαχειριστή του συστήματος.
+repository_files_already_exist.adopt=Αρχεία υπάρχουν ήδη για αυτό το repository και μπορούν μόνο να υιοθετηθούν.
+repository_files_already_exist.delete=Τα αρχεία υπάρχουν ήδη για αυτόν το repository. Πρέπει να τα διαγράψετε.
+repository_files_already_exist.adopt_or_delete=Υπάρχουν ήδη τα αρχεία για αυτό το repository. Πρέπει να τα υιοθετήσετε ή να τα διαγράψετε.
 visit_rate_limit=Συναντήθηκε το όριο ρυθμού κατά την απομακρυσμένη πρόσβαση.
 2fa_auth_required=Απαιτήθηκε ταυτοποίηση δύο παραγόντων κατά την απομακρυσμένη πρόσβαση.
 org_name_been_taken=Το όνομα του οργανισμού χρησιμοποιείται ήδη.
@@ -925,7 +925,7 @@ access_token_deletion_cancel_action=Άκυρο
 access_token_deletion_confirm_action=Διαγραφή
 access_token_deletion_desc=Η διαγραφή ενός διακριτικού θα ανακαλέσει οριστικά την πρόσβαση στο λογαριασμό σας για εφαρμογές που το χρησιμοποιούν. Συνέχεια;
 delete_token_success=Το διακριτικό έχει διαγραφεί. Οι εφαρμογές που το χρησιμοποιούν δεν έχουν πλέον πρόσβαση στο λογαριασμό σας.
-repo_and_org_access=Πρόσβαση στο Αποθετήριο και Οργανισμό
+repo_and_org_access=Πρόσβαση στο repository και οργανισμό
 permissions_public_only=Δημόσια μόνο
 permissions_access_all=Όλα (δημόσια, ιδιωτικά, και περιορισμένα)
 select_permissions=Επιλογή δικαιωμάτων
@@ -1005,7 +1005,7 @@ remove_account_link_success=Ο συνδεδεμένος λογαριασμός 
 hooks.desc=Προσθήκη webhooks που θα ενεργοποιούνται για όλα τα αποθετήρια που σας ανήκουν.
 
 orgs_none=Δεν είστε μέλος σε κάποιο οργανισμό.
-repos_none=Δεν σας ανήκει κανένα κάποιο αποθετήριο.
+repos_none=Δεν υπάρχει κάποιο repository που σας ανήκει.
 
 delete_account=Διαγραφή του λογαριασμού σας
 delete_prompt=Αυτή η ενέργεια θα διαγράψει μόνιμα το λογαριασμό σας. ΔΕΝ ΘΑ ΜΠΟΡΕΙ να επανέλθει.
@@ -1047,7 +1047,7 @@ language.localization_project = Βοηθήστε μας να μεταφράσο
 language.description = Από εδώ και στο εξής, αυτή η γλώσσα θα χρησιμοποιείται από προεπιλογή για τον λογαριασμό σας.
 
 [repo]
-new_repo_helper=Ένα αποθετήριο περιέχει όλα τα αρχεία έργου, συμπεριλαμβανομένου του ιστορικού εκδόσεων. Ήδη φιλοξενείται αλλού; Μετεγκατάσταση αποθετηρίου.
+new_repo_helper=Ένα repository περιέχει όλα τα αρχεία έργου, συμπεριλαμβανομένου του ιστορικού εκδόσεων. Έχετε ήδη ένα που φιλοξενείται κάπου αλλού; Μεταφορά αποθετηρίου.
 owner=Ιδιοκτήτης
 owner_helper=Ορισμένοι οργανισμοί ενδέχεται να μην εμφανίζονται στο αναπτυσσόμενο μενού λόγω του μέγιστου αριθμού αποθετηρίων.
 repo_name=Όνομα αποθετηρίου
@@ -1055,7 +1055,7 @@ repo_name_helper=Τα καλά ονόματα αποθετηρίων χρησι
 repo_size=Μέγεθος Αποθετηρίου
 template=Πρότυπο
 template_select=Επιλέξτε ένα πρότυπο
-template_helper=Μετατροπή σε πρότυπο αποθετήριο
+template_helper=Μετατροπή σε πρότυπο repository
 template_description=Τα πρότυπα αποθετήρια επιτρέπουν στους χρήστες να δημιουργήσουν νέα αποθετήρια με την ίδια δομή, αρχεία και προαιρετικές ρυθμίσεις.
 visibility=Ορατότητα
 visibility_description=Μόνο ο ιδιοκτήτης ή τα μέλη του οργανισμού εάν έχουν δικαιώματα, θα είναι σε θέση να το δουν.
@@ -1070,7 +1070,7 @@ fork_to_different_account=Fork σε διαφορετικό λογαριασμό
 fork_visibility_helper=Η ορατότητα ενός fork αποθετηρίου δεν μπορεί να αλλάξει.
 fork_branch=Κλάδος που θα κλωνοποιηθεί στο fork
 all_branches=Όλοι οι κλάδοι
-fork_no_valid_owners=Αυτό το αποθετήριο δεν μπορεί να γίνει fork επειδή δεν υπάρχουν έγκυροι ιδιοκτήτες.
+fork_no_valid_owners=Αυτό το repository δεν μπορεί να γίνει fork, επειδή δεν υπάρχουν έγκυροι ιδιοκτήτες.
 use_template=Χρήση αυτού του πρότυπου
 clone_in_vsc=Κλωνοποίηση στο VS Code
 download_zip=Λήψη ZIP
@@ -1120,7 +1120,7 @@ mirror_password_blank_placeholder=(Μη ορισμένο)
 mirror_password_help=Αλλάξτε το όνομα χρήστη για να διαγράψετε έναν αποθηκευμένο κωδικό πρόσβασης.
 watchers=Παρατηρητές
 stargazers=Θαυμαστές
-stars_remove_warning=Αυτό θα αφαιρέσει όλα τα αστέρια από αυτό το αποθετήριο.
+stars_remove_warning=Αυτό θα αφαιρέσει όλα τα αστέρια από αυτό το repository.
 forks=Forks
 reactions_more=και %d περισσότερα
 unit_disabled=Ο διαχειριστής του ιστότοπου έχει απενεργοποιήσει αυτήν την ενότητα αποθετηρίου.
@@ -1129,7 +1129,7 @@ adopt_search=Εισάγετε όνομα χρήστη για αναζήτηση
 adopt_preexisting_label=Υιοθέτηση αρχείων
 adopt_preexisting=Υιοθετήστε τα προϋπάρχοντα αρχεία
 adopt_preexisting_content=Δημιουργία αποθετηρίου από %s
-adopt_preexisting_success=Υιοθετήθηκαν αρχεία και δημιουργήθηκε το αποθετήριο από %s
+adopt_preexisting_success=Υιοθετήθηκαν αρχεία και δημιουργήθηκε το repository από %s
 delete_preexisting_label=Διαγραφή
 delete_preexisting=Διαγραφή αρχείων που προϋπήρχαν
 delete_preexisting_content=Διαγραφή αρχείων στο %s
@@ -1159,17 +1159,17 @@ desc.archived=Αρχειοθετημένο
 template.items=Αντικείμενα προτύπου
 template.git_content=Περιεχόμενο Git (Προεπιλεγμένος κλάδος)
 template.git_hooks=Git hooks
-template.git_hooks_tooltip=Δεν θα μπορέσετε να αφαιρέσετε ή να τροποποιήσετε τα Git hook αφού τα έχετε προσθέσει. Επιλέξτε την ρύθμιση αυτή μόνο αν εμπιστεύεστε το πρότυπο αποθετήριο.
+template.git_hooks_tooltip=Δεν θα μπορέσετε να αφαιρέσετε ή να τροποποιήσετε τα Git hook αφού τα έχετε προσθέσει. Επιλέξτε την ρύθμιση αυτή μόνο αν εμπιστεύεστε το πρότυπο repository.
 template.webhooks=Webhooks
 template.topics=Θέματα
 template.avatar=Εικόνα
 template.issue_labels=Ταμπέλες ζητημάτων
 template.one_item=Πρέπει να επιλέξετε τουλάχιστον ένα αντικείμενο στο πρότυπο
-template.invalid=Πρέπει να επιλέξετε ένα πρότυπο αποθετήριο
+template.invalid=Πρέπει να επιλέξετε ένα πρότυπο repository
 
 archive.title=Αυτό το αποθετήρειο αρχειοθετήθηκε. Μπορείτε να προβάλετε αρχεία και να τα κλωνοποιήσετε, αλλά δεν μπορείτε να ωθήσετε ή να ανοίξετε ζητήματα ή pull requests.
-archive.title_date=Αυτό το αποθετήριο έχει αρχειοθετηθεί στο %s. Μπορείτε να προβάλετε αρχεία και να κλωνοποιήσετε, αλλά δεν μπορείτε να ωθήσετε ή να ανοίξετε ζητήματα ή pull requests.
-archive.issue.nocomment=Αυτό το αποθετήριο αρχειοθετήθηκε. Δεν μπορείτε να σχολιάσετε σε ζητήματα.
+archive.title_date=Αυτό το repository αρχειοθετήθηκε στις %s. Μπορείτε να δείτε τα αρχεία του και να το κλωνοποιήσετε, αλλά δεν μπορείτε να κάνετε push, να ανοίξετε ζητήματα ή pull requests.
+archive.issue.nocomment=Αυτό το repository έχει αρχειοθετηθεί. Δεν μπορείτε να σχολιάσετε σε ζητήματα.
 archive.pull.nocomment=Αυτό το repo αρχειοθετήθηκε. Δεν μπορείτε να σχολιάσετε στα pull requests.
 
 form.reach_limit_of_creation_1=Έχετε ήδη συμπληρώσει το όριο του %d αποθετηρίου.
@@ -1180,7 +1180,7 @@ form.name_pattern_not_allowed=Το μοτίβο «%s» δεν επιτρέπετ
 need_auth=Εξουσιοδότηση
 migrate_options=Ρυθμίσεις μεταφοράς
 migrate_service=Υπηρεσία Μεταφοράς
-migrate_options_mirror_helper=Αυτό το αποθετήριο θα είναι είδωλο
+migrate_options_mirror_helper=Αυτό το repository θα είναι είδωλο
 migrate_options_lfs=Μεταφορά αρχείων LFS
 migrate_options_lfs_endpoint.label=Άκρο LFS
 migrate_options_lfs_endpoint.description=Η μεταφορά θα προσπαθήσει να χρησιμοποιήσει το Git remote για να καθορίσει τον διακομιστή LFS. Μπορείτε επίσης να καθορίσετε ένα δικό σας endpoint αν τα δεδομένα LFS του αποθετηρίου αποθηκεύονται κάπου αλλού.
@@ -1233,10 +1233,10 @@ migrate.cancel_migrating_confirm=Θέλετε να ακυρώσετε αυτή 
 mirror_from=είδωλο του
 forked_from=forked από
 generated_from=παραγμένο από
-fork_from_self=Δεν μπορείτε να κάνετε fork σε ένα αποθετήριο που κατέχετε.
-fork_guest_user=Συνδεθείτε για να κάνετε fork αυτό το αποθετήριο.
-watch_guest_user=Συνδεθείτε για να παρακολουθήσετε αυτό το αποθετήριο.
-star_guest_user=Συνδεθείτε για να δώσετε ένα αστέρι σε αυτό το αποθετήριο.
+fork_from_self=Δεν μπορείτε να κάνετε fork ένα repository που σας ανήκει.
+fork_guest_user=Συνδεθείτε για να κάνετε fork αυτό το repository.
+watch_guest_user=Συνδεθείτε για να παρακολουθήσετε αυτό το repository.
+star_guest_user=Συνδεθείτε για να δώσετε ένα αστέρι σε αυτό το repository.
 unwatch=Παύση ακολούθησης
 watch=Παρακολούθηση
 unstar=Αφαίρεση αστεριού
@@ -1248,11 +1248,11 @@ more_operations=Περισσότερες λειτουργίες
 no_desc=Χωρίς περιγραφή
 quick_guide=Γρήγορος οδηγός
 clone_this_repo=Κλωνοποίηση αυτού του αποθετηρίου
-cite_this_repo=Αναφορά σε αυτό το αποθετήριο
+cite_this_repo=Αναφορά σε αυτό το repository
 create_new_repo_command=Δημιουργία νέου αποθετηρίου στη γραμμή εντολών
 push_exist_repo=Προώθηση ενός υπάρχοντος αποθετηρίου από τη γραμμή εντολών
-empty_message=Αυτό το αποθετήριο δεν έχει περιεχόμενο.
-broken_message=Τα δεδομένα Git που διέπουν αυτό το αποθετήριο δεν μπορούν να διαβαστούν. Επικοινωνήστε με το διαχειριστή ή διαγράψτε αυτό το αποθετήριο.
+empty_message=Αυτό το repository δεν έχει περιεχόμενο.
+broken_message=Τα δεδομένα Git που διέπουν αυτό το αποθετήριο δεν μπορούν να διαβαστούν. Επικοινωνήστε με το διαχειριστή ή διαγράψτε αυτό το repository.
 
 code=Κώδικας
 code.desc=Πρόσβαση στον πηγαίο κώδικα, αρχεία, υποβολές και κλάδους.
@@ -1330,7 +1330,7 @@ editor.cannot_edit_non_text_files=Τα δυαδικά αρχεία δεν μπο
 editor.edit_this_file=Επεξεργασία αρχείου
 editor.this_file_locked=Το αρχείο είναι κλειδωμένο
 editor.must_be_on_a_branch=Πρέπει να βρίσκεστε σε έναν κλάδο για να κάνετε ή να προτείνετε αλλαγές σε αυτό το αρχείο.
-editor.fork_before_edit=Πρέπει να κάνετε fork αυτό το αποθετήριο για να κάνετε ή να προτείνετε αλλαγές σε αυτό το αρχείο.
+editor.fork_before_edit=Πρέπει να κάνετε fork αυτό το repository για να κάνετε ή να προτείνετε αλλαγές σε αυτό το αρχείο.
 editor.delete_this_file=Διαγραφή αρχείου
 editor.must_have_write_access=Πρέπει να έχετε πρόσβαση εγγραφής για να κάνετε ή να προτείνετε αλλαγές σε αυτό το αρχείο.
 editor.file_delete_success=Το αρχείο «%s» έχει διαγραφεί.
@@ -1359,15 +1359,15 @@ editor.new_branch_name_desc=Όνομα νέου κλάδου…
 editor.cancel=Ακύρωση
 editor.filename_cannot_be_empty=Το όνομα αρχείου δεν μπορεί να είναι κενό.
 editor.filename_is_invalid=Το όνομα αρχείου δεν είναι έγκυρο: "%s".
-editor.branch_does_not_exist=Ο κλάδος "%s" δεν υπάρχει σε αυτό το αποθετήριο.
-editor.branch_already_exists=Ο κλάδος «%s» υπάρχει ήδη σε αυτό το αποθετήριο.
-editor.directory_is_a_file=Το όνομα φακέλου «%s» χρησιμοποιείται ήδη ως όνομα αρχείου σε αυτό το αποθετήριο.
+editor.branch_does_not_exist=Ο κλάδος "%s" δεν υπάρχει σε αυτό το repository.
+editor.branch_already_exists=Ο κλάδος «%s» υπάρχει ήδη σε αυτό το repository.
+editor.directory_is_a_file=Το όνομα φακέλου «%s» χρησιμοποιείται ήδη ως όνομα αρχείου σε αυτό το repository.
 editor.file_is_a_symlink=`Το «%s» είναι συμβολικός σύνδεσμος. Οι συμβολικοί σύνδεσμοι δεν μπορούν να επεξεργαστούν στην ενσωματωμένη εφαρμογή`
-editor.filename_is_a_directory=Το όνομα αρχείου «%s» χρησιμοποιείται ήδη ως όνομα φακέλου σε αυτό το αποθετήριο.
-editor.file_editing_no_longer_exists=Το αρχείο «%s», το οποίο επεξεργάζεστε, δεν υπάρχει πλέον σε αυτό το αποθετήριο.
-editor.file_deleting_no_longer_exists=Το αρχείο «%s», το οποίο διαγράφεται, δεν υπάρχει πλέον σε αυτό το αποθετήριο.
+editor.filename_is_a_directory=Το όνομα αρχείου «%s» χρησιμοποιείται ήδη ως όνομα φακέλου σε αυτό το repository.
+editor.file_editing_no_longer_exists=Το αρχείο «%s», το οποίο επεξεργάζεστε, δεν υπάρχει πλέον σε αυτό το repository.
+editor.file_deleting_no_longer_exists=Το αρχείο «%s», το οποίο διαγράφεται, δεν υπάρχει πλέον σε αυτό το repository.
 editor.file_changed_while_editing=Προέκυψαν κάποιες αλλαγές στα περιεχόμενα του αρχείου από τότε που ξεκινήσατε να τα επεξεργάζεστε. Κάντε κλικ εδώ για να τα δείτε ή ξανακάντε μία υποβολή των αλλαγών σας για να τις αντικαταστήσετε.
-editor.file_already_exists=Υπάρχει ήδη ένα αρχείο με το όνομα «%s» σε αυτό το αποθετήριο.
+editor.file_already_exists=Υπάρχει ήδη ένα αρχείο με το όνομα «%s» σε αυτό το repository.
 editor.commit_empty_file_header=Υποβολή ενός κενού αρχείου
 editor.commit_empty_file_text=Το αρχείο που πρόκειται να υποβληθεί είναι κενό. Συνέχεια;
 editor.no_changes_to_show=Δεν υπάρχουν αλλαγές για εμφάνιση.
@@ -1620,13 +1620,13 @@ issues.author_helper=Αυτός ο χρήστης είναι ο συγγραφέ
 issues.role.owner=Ιδιοκτήτης
 issues.role.owner_helper=Αυτός ο χρήστης είναι ο ιδιοκτήτης αυτού του αποθετηρίου.
 issues.role.member=Μέλος
-issues.role.member_helper=Αυτός ο χρήστης είναι μέλος του οργανισμού, του οποίου ανήκει το αποθετήριο.
+issues.role.member_helper=Αυτός ο χρήστης είναι μέλος του οργανισμού, του οποίου ανήκει το repository.
 issues.role.collaborator=Συνεργάτης
-issues.role.collaborator_helper=Ο χρήστης έλαβε πρόσκληση συνεργασίας στο αποθετήριο.
+issues.role.collaborator_helper=Ο χρήστης έλαβε πρόσκληση συνεργασίας στο repository.
 issues.role.first_time_contributor=Συντελεστής για πρώτη φορά
-issues.role.first_time_contributor_helper=Αυτή είναι η πρώτη συνεισφορά αυτού του χρήστη στο αποθετήριο.
+issues.role.first_time_contributor_helper=Αυτή είναι η πρώτη συνεισφορά αυτού του χρήστη στο repository.
 issues.role.contributor=Συντελεστής
-issues.role.contributor_helper=Αυτός ο χρήστης έχει προηγούμενές υποβολές (commits) στο αποθετήριο.
+issues.role.contributor_helper=Αυτός ο χρήστης έχει προηγούμενές υποβολές (commits) στο repository.
 issues.re_request_review=Επαναίτηση ανασκόπησης
 issues.is_stale=Έχουν υπάρξει αλλαγές σε αυτό το PR από αυτή την αναθεώρηση
 issues.remove_request_review=Αφαίρεση αιτήματος αναθεώρησης
@@ -1678,7 +1678,7 @@ issues.unlock_comment=: ξεκλείδωσε αυτή τη συνομιλία %s
 issues.lock_confirm=Κλείδωμα
 issues.unlock_confirm=Ξεκλείδωμα
 issues.lock.notice_1=- Άλλοι χρήστες δεν μπορούν να αφήσουν νέα σχόλια σε αυτό το ζήτημα.
-issues.lock.notice_2=- Εσείς και άλλοι συνεργάτες που έχουν πρόσβαση στο αποθετήριο θα μπορείτε ακόμα να αφήσετε σχόλια που θα είναι ορατά σε άλλους.
+issues.lock.notice_2=- Εσείς, μαζί με τους συνεργάτες σας που έχουν πρόσβαση στο repository, θα μπορείτε ακόμα να αφήσετε σχόλια που θα μπορούν να βλέπουν και άλλοι.
 issues.lock.notice_3=- Θα μπορείτε να ξεκλειδώσετε αυτό το ζήτημα πιο μετά.
 issues.unlock.notice_1=- Όλοι θα βρίσκονται πάλι σε θέση να αφήσουν σχόλιο σε αυτό το ζήτημα.
 issues.unlock.notice_2=- Θα μπορείτε πάντα να ξανακλειδώσετε αυτό το ζήτημα πιο μετά.
@@ -1759,7 +1759,7 @@ issues.dependency.add_error_dep_issue_not_exist=Εξαρτώμενο ζήτημ
 issues.dependency.add_error_dep_not_exist=Δεν υπάρχει η Εξάρτηση.
 issues.dependency.add_error_dep_exists=Η Εξάρτηση υπάρχει ήδη.
 issues.dependency.add_error_cannot_create_circular=Δεν μπορείτε να δημιουργήσετε μια εξάρτηση με δύο ζητήματα που μπλοκάρουν το ένα το άλλο.
-issues.dependency.add_error_dep_not_same_repo=Και τα δύο ζητήματα πρέπει να βρίσκονται στο ίδιο αποθετήριο.
+issues.dependency.add_error_dep_not_same_repo=Και τα δύο ζητήματα πρέπει να βρίσκονται στο ίδιο repository.
 issues.review.self.approval=Δεν μπορείτε να εγκρίνετε το δικό σας pull request.
 issues.review.self.rejection=Δεν μπορείτε να ζητήσετε αλλαγές στο δικό σας pull request.
 issues.review.approve=ενέκρινε τις αλλαγές %s
@@ -1922,7 +1922,7 @@ pulls.closed_at=`έκλεισε αυτό το pull request %[2]s`
 pulls.cmd_instruction_hint=Προβολή οδηγιών γραμμής εντολών
 pulls.cmd_instruction_checkout_title=Έλεγχος
-pulls.cmd_instruction_checkout_desc=Από το αποθετήριο του έργου σας, ελέγξτε έναν νέο κλάδο και δοκιμάστε τις αλλαγές.
+pulls.cmd_instruction_checkout_desc=Από το repository του έργου σας, ελέγξτε έναν νέο κλάδο και δοκιμάστε τις αλλαγές.
 pulls.cmd_instruction_merge_title=Συγχώνευση
 pulls.cmd_instruction_merge_desc=Συγχώνευση των αλλαγών και ενημέρωση στο Gitea.
 pulls.clear_merge_message=Εκκαθάριση μηνύματος συγχώνευσης
@@ -2101,8 +2101,8 @@ search.code_no_results=Δεν βρέθηκε πηγαίος κώδικας πο
 search.code_search_unavailable=Η αναζήτηση κώδικα δεν είναι διαθέσιμη αυτή τη στιγμή. Παρακαλώ επικοινωνήστε με το διαχειριστή.
 
 settings=Ρυθμίσεις
-settings.desc=Στις Ρυθμίσεις μπορείτε να διαχειριστείτε τις ρυθμίσεις για το αποθετήριο
-settings.options=Αποθετήριο
+settings.desc=Στις Ρυθμίσεις μπορείτε να διαχειριστείτε τις ρυθμίσεις για το repository
+settings.options=Repository
 settings.collaboration=Συνεργάτες
 settings.collaboration.admin=Διαχειριστής
 settings.collaboration.write=Εγγραφή
@@ -2113,18 +2113,18 @@ settings.hooks=Webhooks
 settings.githooks=Git hooks
 settings.basic_settings=Βασικές ρυθμίσεις
 settings.mirror_settings=Ρυθμίσεις ειδώλου
-settings.mirror_settings.docs=Ρυθμίστε τον αυτόματο συγχρονισμό των υποβολών, ετικετών και κλάδων του αποθετηρίου σας σε ένα άλλο αποθετήριο.
-settings.mirror_settings.docs.disabled_pull_mirror.instructions=Ρυθμίστε τον αυτόματο συγχρονισμό των υποβολών, ετικετών και κλάδων του έργου σας με ένα άλλο αποθετήριο. Τα είδωλα τύπου λήψης έχουν απενεργοποιηθεί από τον διαχειριστή σας.
-settings.mirror_settings.docs.disabled_push_mirror.instructions=Ρυθμίστε την αυτόματη λήψη υποβολών, ετικετών και κλάδων από ένα άλλο αποθετήριο.
+settings.mirror_settings.docs=Ρυθμίστε τον αυτόματο συγχρονισμό των commit, ετικετών και κλάδων του αποθετηρίου σας σε ένα άλλο repository.
+settings.mirror_settings.docs.disabled_pull_mirror.instructions=Ρυθμίστε τον αυτόματο συγχρονισμό των commit, ετικετών και κλάδων του έργου σας με ένα άλλο repository. Τα είδωλα τύπου λήψης έχουν απενεργοποιηθεί από τον διαχειριστή σας.
+settings.mirror_settings.docs.disabled_push_mirror.instructions=Ρυθμίστε την αυτόματη λήψη υποβολών, ετικετών και κλάδων από ένα άλλο repository.
 settings.mirror_settings.docs.disabled_push_mirror.pull_mirror_warning=Αυτή τη στιγμή, αυτό μπορεί να γίνει μόνο στο μενού "Νέα Μεταφορά". Για περισσότερες πληροφορίες, συμβουλευτείτε το:
 settings.mirror_settings.docs.disabled_push_mirror.info=Τα είδωλα ώθησης έχουν απενεργοποιηθεί από το διαχειριστή σας.
-settings.mirror_settings.docs.no_new_mirrors=Το αποθετήριο σας αντιγράφει τις αλλαγές προς ή από ένα άλλο αποθετήριο. Λάβετε υπόψη ότι δεν μπορείτε να δημιουργήσετε νέα είδωλα αυτή τη στιγμή.
+settings.mirror_settings.docs.no_new_mirrors=Το repository σας αντιγράφει τις αλλαγές προς ή από ένα άλλο repository. Λάβετε υπόψη ότι δεν μπορείτε να δημιουργήσετε νέα είδωλα αυτή τη στιγμή.
 settings.mirror_settings.docs.can_still_use=Αν και δεν μπορείτε να τροποποιήσετε τα υπάρχοντα είδωλα ή να δημιουργήσετε νέα, μπορείτε να χρησιμοποιείται ακόμα το υπάρχων είδωλο.
 settings.mirror_settings.docs.pull_mirror_instructions=Για να ορίσετε έναν είδωλο έλξης, παρακαλούμε συμβουλευθείτε:
 settings.mirror_settings.docs.more_information_if_disabled=Μπορείτε να μάθετε περισσότερα για τα είδωλα ώθησης και έλξης εδώ:
 settings.mirror_settings.docs.doc_link_title=Πώς μπορώ να αντιγράψω αποθετήρια;
 settings.mirror_settings.docs.doc_link_pull_section=το κεφάλαιο "Pulling from a remote repository" της τεκμηρίωσης.
-settings.mirror_settings.docs.pulling_remote_title=Έλξη από ένα απομακρυσμένο αποθετήριο
+settings.mirror_settings.docs.pulling_remote_title=Pull από ένα απομακρυσμένο repository
 settings.mirror_settings.mirrored_repository=Είδωλο αποθετηρίου
 settings.mirror_settings.direction=Κατεύθυνση
 settings.mirror_settings.direction.pull=Pull
@@ -2188,33 +2188,33 @@ settings.reindex_button=Προσθήκη στην ουρά Reindex
 settings.reindex_requested=Αιτήθηκε reindex
 settings.admin_enable_close_issues_via_commit_in_any_branch=Κλείσιμο ενός ζητήματος μέσω μιας υποβολής που έγινε σε έναν μη προεπιλεγμένο κλάδο
 settings.danger_zone=Ζώνη κινδύνου
-settings.new_owner_has_same_repo=Ο νέος ιδιοκτήτης έχει ήδη ένα αποθετήριο με το ίδιο όνομα. Παρακαλώ επιλέξτε ένα άλλο όνομα.
-settings.convert=Μετατροπή σε κανονικό αποθετήριο
-settings.convert_desc=Μπορείτε να μετατρέψετε αυτόν το είδωλο σε κανονικό αποθετήριο. Αυτό δεν μπορεί να αναιρεθεί.
-settings.convert_notices_1=Αυτή η λειτουργία θα μετατρέψει το είδωλο σε ένα κανονικό αποθετήριο και δεν μπορεί να αναιρεθεί.
+settings.new_owner_has_same_repo=Ο νέος ιδιοκτήτης έχει ήδη ένα repository με το ίδιο όνομα. Παρακαλώ επιλέξτε ένα άλλο όνομα.
+settings.convert=Μετατροπή σε κανονικό repository
+settings.convert_desc=Μπορείτε να μετατρέψετε αυτόν το είδωλο σε κανονικό repository. Αυτό δεν μπορεί να αναιρεθεί.
+settings.convert_notices_1=Αυτή η λειτουργία θα μετατρέψει το είδωλο σε ένα κανονικό repository και δεν μπορεί να αναιρεθεί.
 settings.convert_confirm=Μετατροπή αποθετηρίου
-settings.convert_succeed=Το είδωλο έχει μετατραπεί σε κανονικό αποθετήριο.
-settings.convert_fork=Μετατροπή σε κανονικό αποθετήριο
-settings.convert_fork_desc=Μπορείτε να μετατρέψετε αυτό το fork σε κανονικό αποθετήριο. Αυτό δεν μπορεί να αναιρεθεί.
-settings.convert_fork_notices_1=Αυτή η λειτουργία θα μετατρέψει το fork σε ένα κανονικό αποθετήριο και δεν μπορεί να αναιρεθεί.
+settings.convert_succeed=Το είδωλο έχει μετατραπεί σε κανονικό repository.
+settings.convert_fork=Μετατροπή σε κανονικό repository
+settings.convert_fork_desc=Μπορείτε να μετατρέψετε αυτό το fork σε κανονικό repository. Αυτό δεν μπορεί να αναιρεθεί.
+settings.convert_fork_notices_1=Αυτή η λειτουργία θα μετατρέψει το fork σε ένα κανονικό repository και δεν μπορεί να αναιρεθεί.
 settings.convert_fork_confirm=Μετατροπή αποθετηρίου
-settings.convert_fork_succeed=Το fork έχει μετατραπεί σε κανονικό αποθετήριο.
+settings.convert_fork_succeed=Το fork έχει μετατραπεί σε κανονικό repository.
 settings.transfer.title=Μεταβίβαση ιδιοκτησίας
 settings.transfer.rejected=Η μεταβίβαση του αποθετηρίου απορρίφθηκε.
 settings.transfer.success=Η μεταβίβαση του αποθετηρίου ήταν επιτυχής.
 settings.transfer_abort=Ακύρωση μεταβίβασης
 settings.transfer_abort_invalid=Δεν μπορείτε να ακυρώσετε μια ανύπαρκτη μεταβίβαση αποθετηρίου.
 settings.transfer_abort_success=Η μεταφορά αποθετηρίου στο %s ακυρώθηκε με επιτυχία.
-settings.transfer_desc=Μεταβιβάστε αυτό το αποθετήριο σε έναν χρήστη ή σε έναν οργανισμό για τον οποίο έχετε δικαιώματα διαχειριστή.
+settings.transfer_desc=Μεταβιβάστε αυτό το repository σε έναν χρήστη ή σε έναν οργανισμό για τον οποίο έχετε δικαιώματα διαχειριστή.
 settings.transfer_form_title=Εισάγετε το όνομα του αποθετηρίου ως επιβεβαίωση:
-settings.transfer_in_progress=Αυτή τη στιγμή υπάρχει μια εν εξελίξει μεταβίβαση. Παρακαλούμε ακυρώστε την αν θέλετε να μεταβιβάσετε αυτό το αποθετήριο σε άλλο χρήστη.
-settings.transfer_notices_1=- Θα χάσετε την πρόσβαση στο αποθετήριο αν το μεταβιβάσετε σε έναν μεμονωμένο χρήστη.
-settings.transfer_notices_2=- Θα διατηρήσετε την πρόσβαση στο αποθετήριο αν το μεταβιβάσετε σε έναν οργανισμό που είστε (συν)ιδιοκτήτης.
-settings.transfer_notices_3=- Εάν το αποθετήριο είναι ιδιωτικό και μεταβιβάζεται σε μεμονωμένο χρήστη, αυτή η ενέργεια εξασφαλίζει ότι ο χρήστης έχει τουλάχιστον άδεια ανάγνωσης (και αλλάζει τα δικαιώματα εάν είναι απαραίτητο).
+settings.transfer_in_progress=Αυτή τη στιγμή υπάρχει μια εν εξελίξει μεταβίβαση. Παρακαλούμε ακυρώστε την αν θέλετε να μεταβιβάσετε αυτό το repository σε άλλο χρήστη.
+settings.transfer_notices_1=- Θα χάσετε την πρόσβαση στο repository αν το μεταβιβάσετε σε έναν μεμονωμένο χρήστη.
+settings.transfer_notices_2=- Θα διατηρήσετε την πρόσβαση στο repository αν το μεταβιβάσετε σε έναν οργανισμό που είστε (συν)ιδιοκτήτης.
+settings.transfer_notices_3=- Εάν το repository είναι ιδιωτικό και μεταβιβάζεται σε μεμονωμένο χρήστη, αυτή η ενέργεια εξασφαλίζει ότι ο χρήστης έχει τουλάχιστον άδεια ανάγνωσης (και αλλάζει τα δικαιώματα εάν είναι απαραίτητο).
 settings.transfer_owner=Νέος ιδιοκτήτης
 settings.transfer_perform=Εκτέλεση μεταφοράς
-settings.transfer_started=`Αυτό το αποθετήριο έχει επισημανθεί για μεταφορά και αναμένει επιβεβαίωση από το "%s"`
-settings.transfer_succeed=Το αποθετήριο έχει μεταφερθεί.
+settings.transfer_started=`Αυτό το repository έχει επισημανθεί για μεταφορά και αναμένει επιβεβαίωση από το "%s"`
+settings.transfer_succeed=Το repository έχει μεταφερθεί.
 settings.signing_settings=Ρυθμίσεις επαλήθευσης υπογραφών
 settings.trust_model=Μοντέλο εμπιστοσύνης υπογραφών
 settings.trust_model.default=Προεπιλεγμένο μοντέλο εμπιστοσύνης
@@ -2236,33 +2236,33 @@ settings.wiki_deletion_success=Τα δεδομένα wiki του αποθετη
 settings.delete=Διαγραφή αυτόυ του αποθετηρίου
 settings.delete_desc=Η διαγραφή ενός αποθετηρίου είναι μόνιμη και δεν μπορεί να αναιρεθεί.
 settings.delete_notices_1=- Αυτή η ενέργεια ΔΕΝ ΜΠΟΡΕΙ να αναιρεθεί.
-settings.delete_notices_2=- Αυτή η ενέργεια θα διαγράψει μόνιμα το αποθετήριο %s μαζί με τον κώδικα, τα ζητημάτα, τα σχόλια, τα δεδομένα των wiki και τις ρυθμίσεις συνεργατών που βρίσκονται μέσα σε αυτό.
+settings.delete_notices_2=- Αυτή η ενέργεια θα διαγράψει μόνιμα το repository %s μαζί με τον κώδικα, τα ζητημάτα, τα σχόλια, τα δεδομένα των wiki και τις ρυθμίσεις συνεργατών που βρίσκονται μέσα σε αυτό.
 settings.delete_notices_fork_1=- Τα Forks αυτού του αποθετηρίου θα γίνουν ανεξάρτητα μετά τη διαγραφή.
-settings.deletion_success=Το αποθετήριο έχει διαγραφεί.
+settings.deletion_success=Το repository έχει διαγραφεί.
 settings.update_settings_success=Οι ρυθμίσεις του αποθετηρίου έχουν ενημερωθεί.
-settings.update_settings_no_unit=Το αποθετήριο θα πρέπει να επιτρέπει τουλάχιστον κάποιο είδος αλληλεπίδρασης.
+settings.update_settings_no_unit=Το repository θα πρέπει να επιτρέπει τουλάχιστον κάποιο είδος αλληλεπίδρασης.
 settings.confirm_delete=Διαγραφή αποθετηρίου
 settings.add_collaborator=Προσθήκη συνεργάτη
 settings.add_collaborator_success=Ο συνεργάτης προστέθηκε.
 settings.add_collaborator_inactive_user=Δεν είναι δυνατή η προσθήκη ενός ανενεργού χρήστη ως συνεργάτη.
 settings.add_collaborator_owner=Δεν είναι δυνατή η προσθήκη ενός ιδιοκτήτη σαν συνεργάτη.
-settings.add_collaborator_duplicate=Ο συνεργάτης έχει ήδη προστεθεί σε αυτό το αποθετήριο.
+settings.add_collaborator_duplicate=Ο συνεργάτης έχει ήδη προστεθεί σε αυτό το repository.
 settings.delete_collaborator=Κατάργηση
 settings.collaborator_deletion=Κατάργηση συνεργάτη
-settings.collaborator_deletion_desc=Η κατάργηση ενός συνεργάτη θα αφαιρέσει και την πρόσβασή του στο αποθετήριο. Είστε βέβαιοι;
+settings.collaborator_deletion_desc=Η κατάργηση ενός συνεργάτη θα αφαιρέσει και την πρόσβασή του στο repository. Είστε βέβαιοι;
 settings.remove_collaborator_success=Ο συνεργάτης έχει καταργηθεί.
 settings.search_user_placeholder=Αναζήτηση χρήστη…
 settings.org_not_allowed_to_be_collaborator=Δεν μπορείτε να προσθέσετε έναν οργανισμό ως συνεργάτη.
-settings.change_team_access_not_allowed=Η αλλαγή της πρόσβασης ομάδας για το αποθετήριο έχει περιοριστεί στον ιδιοκτήτη του οργανισμού
-settings.team_not_in_organization=Η ομάδα δεν είναι στον ίδιο οργανισμό με το αποθετήριο
+settings.change_team_access_not_allowed=Η αλλαγή της πρόσβασης ομάδας για το repository έχει περιοριστεί στον ιδιοκτήτη του οργανισμού
+settings.team_not_in_organization=Η ομάδα δεν είναι στον ίδιο οργανισμό με το repository
 settings.teams=Ομάδες
 settings.add_team=Προσθήκη ομάδας
-settings.add_team_duplicate=Η ομάδα έχει ήδη το αποθετήριο
-settings.add_team_success=Η ομάδα έχει πλέον πρόσβαση στο αποθετήριο.
+settings.add_team_duplicate=Η ομάδα έχει ήδη το repository
+settings.add_team_success=Η ομάδα έχει πλέον πρόσβαση στο repository.
 settings.search_team=Αναζήτηση Ομάδας…
-settings.change_team_permission_tip=Τα δικαιώματα της ομάδας έχουν οριστεί στη σελίδα ρυθμίσεων της ομάδας και δεν μπορούν να αλλάξουν ανά αποθετήριο
+settings.change_team_permission_tip=Τα δικαιώματα της ομάδας έχουν οριστεί στη σελίδα ρυθμίσεων της ομάδας και δεν μπορούν να αλλάξουν ανά repository
 settings.delete_team_tip=Αυτή η ομάδα έχει πρόσβαση σε όλα τα αποθετήρια και δεν μπορεί να αφαιρεθεί
-settings.remove_team_success=Έχει αφαιρεθεί η πρόσβαση της ομάδας στο αποθετήριο.
+settings.remove_team_success=Έχει αφαιρεθεί η πρόσβαση της ομάδας στο repository.
 settings.add_webhook=Προσθήκη webhook
 settings.add_webhook.invalid_channel_name=Το όνομα του καναλιού Webhook δεν μπορεί να είναι κενό και δεν μπορεί να περιέχει μόνο έναν χαρακτήρα #.
 settings.hooks_desc=Τα Webhooks κάνουν αυτόματα αιτήσεις HTTP POST σε ένα διακομιστή όταν ενεργοποιούνται ορισμένα γεγονότα στο Forgejo. Διαβάστε περισσότερα στον οδηγό webhooks.
@@ -2305,15 +2305,15 @@ settings.event_create_desc=Ο κλάδος ή η ετικέτα δημιουργ
 settings.event_delete=Διαγραφή
 settings.event_delete_desc=Ο κλάδος ή η ετικέτα διαγράφηκε.
 settings.event_fork=Fork
-settings.event_fork_desc=Το αποθετήριο έγινε fork.
+settings.event_fork_desc=Το repository έγινε fork.
 settings.event_wiki=Wiki
 settings.event_wiki_desc=Η σελίδα Wiki δημιουργήθηκε, μετονομάστηκε, επεξεργάστηκε ή διαγράφηκε.
 settings.event_release=Κυκλοφορία
 settings.event_release_desc=Η έκδοση δημοσιεύτηκε, ενημερώθηκε ή διαγράφηκε από ένα αποθετήριο.
 settings.event_push=Push
-settings.event_push_desc=Git push σε ένα αποθετήριο.
-settings.event_repository=Αποθετήριο
-settings.event_repository_desc=Το αποθετήριο δημιουργήθηκε ή διαγράφηκε.
+settings.event_push_desc=Git push σε ένα repository.
+settings.event_repository=Repository
+settings.event_repository_desc=Το repository δημιουργήθηκε ή διαγράφηκε.
 settings.event_header_issue=Συμβάντα ζητημάτων
 settings.event_issues=Ζητήματα
 settings.event_issues_desc=Το ζήτημα άνοιξε, έκλεισε, ανοίχθηκε εκ νέου ή επεξεργάστηκε.
@@ -2345,7 +2345,7 @@ settings.event_pull_request_review_request_desc=Ζητήθηκε η αξιολό
 settings.event_pull_request_approvals=Εγκρίσεις pull request
 settings.event_pull_request_merge=Συγχώνευση pull request
 settings.event_package=Πακέτο
-settings.event_package_desc=Το πακέτο δημιουργήθηκε ή διαγράφηκε σε ένα αποθετήριο.
+settings.event_package_desc=Το πακέτο δημιουργήθηκε ή διαγράφηκε σε ένα repository.
 settings.branch_filter=Φίλτρο κλάδου
 settings.branch_filter_desc=Λίστα επιτρεπόμενων κλάδων για ωθήσεις, δημιουργία κλάδων και γεγονότα διαγραφής κλάδων, που ορίζονται ως μοτίβο glob. Εάν είναι κενό ή *, αναφέρονται συμβάντα για όλους τους κλάδους. Δείτε τη τεκμηρίωση%[2]s για σύνταξη. Παραδείγματα: master, {master,release*}.
 settings.authorization_header=Κεφαλίδα authorization
@@ -2361,7 +2361,7 @@ settings.hook_type=Είδος hook
 settings.slack_token=Διακριτικό
 settings.slack_domain=Domain
 settings.slack_channel=Κανάλι
-settings.add_web_hook_desc=Ενσωμάτωσε το %s στο αποθετήριο σας.
+settings.add_web_hook_desc=Ενσωμάτωσε το %s στο repository σας.
 settings.web_hook_name_gitea=Gitea
 settings.web_hook_name_forgejo = Forgejo
 settings.web_hook_name_gogs=Gogs
@@ -2381,9 +2381,9 @@ settings.packagist_api_token=Διακριτικό API
 settings.packagist_package_url=URL πακέτων Packagist
 settings.deploy_keys=Κλειδιά διάθεσης
 settings.add_deploy_key=Προσθήκη κλειδιού διάθεσης
-settings.deploy_key_desc=Τα κλειδιά διάθεσης έχουν πρόσβαση μόνο-ανάγνωσης στο αποθετήριο.
+settings.deploy_key_desc=Τα κλειδιά διάθεσης έχουν πρόσβαση μόνο-ανάγνωσης στο repository.
 settings.is_writable=Ενεργοποίηση πρόσβασης εγγραφής
-settings.is_writable_info=Επιτρέψτε σε αυτό το κλειδί διάθεσης να ωθήσει στο αποθετήριο.
+settings.is_writable_info=Επιτρέψτε σε αυτό το κλειδί διάθεσης να ωθήσει στο repository.
 settings.no_deploy_keys=Δεν υπάρχουν ακόμα κλειδιά διάθεσης.
 settings.title=Τίτλος
 settings.deploy_key_content=Περιεχόμενο
@@ -2391,7 +2391,7 @@ settings.key_been_used=Ένα κλειδί διάθεσης με το ίδιο 
 settings.key_name_used=Ένα κλειδί διάθεσης με το ίδιο όνομα υπάρχει ήδη.
 settings.add_key_success=Το κλειδί διάθεσης «%s» προστέθηκε.
 settings.deploy_key_deletion=Αφαίρεση κλειδιού διάθεσης
-settings.deploy_key_deletion_desc=Η κατάργηση ενός κλειδί διάθεσης θα ανακαλέσει την πρόσβασή του σε αυτό το αποθετήριο. Συνέχεια;
+settings.deploy_key_deletion_desc=Η κατάργηση ενός κλειδί διάθεσης θα ανακαλέσει την πρόσβασή του σε αυτό το repository. Συνέχεια;
 settings.deploy_key_deletion_success=Το κλειδί διάθεσης έχει αφαιρεθεί.
 settings.branches=Κλάδοι
 settings.protected_branch=Προστασία κλάδου
@@ -2424,7 +2424,7 @@ settings.protect_check_status_contexts=Ενεργοποίηση ελέγχου 
 settings.protect_status_check_patterns=Μοτίβα ελέγχου κατάστασης:
 settings.protect_status_check_patterns_desc=Ορίστε μοτίβα για να καθορίσετε ποιοι έλεγχοι κατάστασης πρέπει να περάσουν πριν οι κλάδοι να μπορούν να συγχωνευτούν σε έναν κλάδο που ταιριάζει με αυτόν τον κανόνα. Κάθε γραμμή καθορίζει ένα μοτίβο. Τα μοτίβα δεν μπορούν να είναι κενά.
 settings.protect_check_status_contexts_desc=Απαιτείται έλεγχος κατάστασης για να περάσει το pull request πριν από τη συγχώνευση. Επιλέξτε ποιοι έλεγχοι κατάστασης πρέπει να περάσουν πριν κλάδοι μπορούν να συγχωνευτούν σε έναν κλάδο που ταιριάζει με αυτόν τον κανόνα. Όταν είναι ενεργοποιημένο, οι υποβολές πρέπει πρώτα να γίνονται push σε άλλο κλάδο, στη συνέχεια, να συγχωνεύονται ή γίνονται push απευθείας σε ένα κλάδο που ταιριάζει με αυτόν τον κανόνα, αφού έχουν ολοκληρωθεί οι έλεγχοι κατάστασης. Αν δεν επιλεχθεί κανένα πλαίσιο, η τελευταία υποβολή πρέπει να είναι επιτυχής ανεξάρτητα από το πλαίσιο.
-settings.protect_check_status_contexts_list=Έλεγχοι κατάστασης που βρέθηκαν την τελευταία εβδομάδα για αυτό το αποθετήριο
+settings.protect_check_status_contexts_list=Έλεγχοι κατάστασης που βρέθηκαν την τελευταία εβδομάδα για αυτό το repository
 settings.protect_status_check_matched=Ταιριάζει
 settings.protect_invalid_status_check_pattern=Μη έγκυρο μοτίβο ελέγχου κατάστασης: "%s".
 settings.protect_no_valid_status_check_patterns=Μη έγκυρα μοτίβα ελέγχου κατάστασης.
@@ -2486,20 +2486,20 @@ settings.matrix.message_type=Είδος μηνύματος
 settings.archive.button=Αρχειοθέτηση αποθετηρίου
 settings.archive.header=Αρχειοθέτηση αποθετηρίου
 settings.archive.text=Η αρχειοθέτηση του αποθετηρίου θα το αλλάξει σε μόνο για ανάγνωση. Δε θα φαίνεται στον αρχικό πίνακα. Κανείς (ακόμα και εσείς!) δε θα μπορεί να κάνει νέες υποβολές, ή να ανοίξει ζητήματα ή pull request.
-settings.archive.success=Το αποθετήριο αρχειοθετήθηκε με επιτυχία.
+settings.archive.success=Το repository αρχειοθετήθηκε με επιτυχία.
 settings.archive.error=Παρουσιάστηκε σφάλμα κατά την προσπάθεια αρχειοθέτησης του αποθετηρίου. Δείτε το αρχείο καταγραφής για περισσότερες λεπτομέρειες.
 settings.archive.error_ismirror=Δε μπορείτε να αρχειοθετήσετε ένα είδωλο αποθετηρίου.
-settings.archive.branchsettings_unavailable=Οι ρυθμίσεις του κλάδου δεν είναι διαθέσιμες αν το αποθετήριο είναι αρχειοθετημένο.
-settings.archive.tagsettings_unavailable=Οι ρυθμίσεις της ετικέτας δεν είναι διαθέσιμες αν το αποθετήριο είναι αρχειοθετημένο.
+settings.archive.branchsettings_unavailable=Οι ρυθμίσεις του κλάδου δεν είναι διαθέσιμες αν το repository είναι αρχειοθετημένο.
+settings.archive.tagsettings_unavailable=Οι ρυθμίσεις της ετικέτας δεν είναι διαθέσιμες αν το repository είναι αρχειοθετημένο.
 settings.unarchive.button=Αναίρεση αρχειοθέτησης αποθετηρίου
 settings.unarchive.header=Απο-Αρχειοθέτηση του αποθετηρίου
 settings.unarchive.text=Η απο-αρχειοθέτηση του αποθετηρίου θα αποκαταστήσει την ικανότητά του να λαμβάνει υποβολές και ωθήσεις, καθώς και νέα ζητήματα και pull-requests.
-settings.unarchive.success=Το αποθετήριο απο-αρχειοθετήθηκε με επιτυχία.
+settings.unarchive.success=Το repository απο-αρχειοθετήθηκε με επιτυχία.
 settings.unarchive.error=Παρουσιάστηκε σφάλμα κατά την προσπάθεια απο-αρχειοθέτησης του αποθετηρίου. Δείτε τις καταγραφές για περισσότερες λεπτομέρειες.
 settings.update_avatar_success=Η εικόνα του αποθετηρίου έχει ενημερωθεί.
 settings.lfs=LFS
-settings.lfs_filelist=Αρχεία LFS σε αυτό το αποθετήριο
-settings.lfs_no_lfs_files=Δεν υπάρχουν αρχεία LFS σε αυτό το αποθετήριο
+settings.lfs_filelist=Αρχεία LFS σε αυτό το repository
+settings.lfs_no_lfs_files=Δεν υπάρχουν αρχεία LFS σε αυτό το repository
 settings.lfs_findcommits=Εύρεση υποβολών
 settings.lfs_lfs_file_no_commits=Δεν βρέθηκαν υποβολές για αυτό το αρχείο LFS
 settings.lfs_noattribute=Αυτή η διαδρομή δεν έχει λειτουργία κλειδώματος στον προεπιλεγμένο κλάδο
@@ -2518,7 +2518,7 @@ settings.lfs_force_unlock=Εξαγκαναστικό ξεκλείδωμα
 settings.lfs_pointers.found=Βρέθηκαν %d δείκτης(ες) blob - %d συσχετίστηκαν, %d δεν συσχετίστηκαν (%d λείπουν από το χώρο αποθήκευσης)
 settings.lfs_pointers.sha=Blob hash
 settings.lfs_pointers.oid=OID
-settings.lfs_pointers.inRepo=Στο αποθετήριο
+settings.lfs_pointers.inRepo=Στο repository
 settings.lfs_pointers.exists=Υπάρχει στο χώρο αποθήκευσης
 settings.lfs_pointers.accessible=Προσβάσιμο στον χρήστη
 settings.lfs_pointers.associateAccessible=Συσχετισμός προσιτών %d OID
@@ -2621,7 +2621,7 @@ release.delete_tag=Διαγραφή ετικέτας
 release.deletion=Διαγραφή κυκλοφορίας
 release.deletion_desc=Διαγράφοντας μια κυκλοφορία, αυτή αφαιρείται μόνο από το Gitea. Δε θα επηρεάσει την ετικέτα Git, τα περιεχόμενα του αποθετηρίου σας ή το ιστορικό της. Συνέχεια;
 release.deletion_success=Η κυκλοφορία έχει διαγραφεί.
-release.deletion_tag_desc=Θα διαγράψει αυτή την ετικέτα από το αποθετήριο. Τα περιεχόμενα του αποθετηρίου και το ιστορικό παραμένουν αμετάβλητα. Συνέχεια;
+release.deletion_tag_desc=Θα διαγράψει αυτή την ετικέτα από το repository. Τα περιεχόμενα του repository και το ιστορικό δεν θα πειραχτούν. Να γίνει συνέχεια;
 release.deletion_tag_success=Η ετικέτα έχει διαγραφεί.
 release.tag_name_already_exist=Υπάρχει ήδη μια έκδοση με αυτό το όνομα ετικέτας.
 release.tag_name_invalid=Το όνομα της ετικέτας δεν είναι έγκυρο.
@@ -2646,7 +2646,7 @@ branch.delete_branch_has_new_commits=Ο κλάδος «%s» δεν μπορεί
 branch.create_branch=Δημιουργία κλάδου %s
 branch.create_from=`από το «%s»`
 branch.create_success=Ο κλάδος «%s» δημιουργήθηκε.
-branch.branch_already_exists=Ο κλάδος «%s» υπάρχει ήδη σε αυτό το αποθετήριο.
+branch.branch_already_exists=Ο κλάδος «%s» υπάρχει ήδη σε αυτό το repository.
 branch.branch_name_conflict=Το όνομα του κλάδου «%s» συγκρούεται με το ήδη υπάρχον κλάδο «%s».
 branch.tag_collision=Ο κλάδος «%s» δεν μπορεί να δημιουργηθεί επειδή μια ετικέτα με το ίδιο όνομα υπάρχει ήδη στο αποθετήριο.
 branch.deleted_by=Διαγράφηκε από %s
@@ -2691,7 +2691,7 @@ error.csv.invalid_field_count=Δεν είναι δυνατή η απόδοση 
 commits.renamed_from = Μετονομάστηκε από %σ
 settings.wiki_rename_branch_main_desc = Ο κλάδος, ο οποίος χρησιμοποιείται εσωτερικά από το wiki, θα μετονομαστεί (μόνιμα και μη αναστράψιμα) σε «%s».
 issues.comment.blocked_by_user = Δεν μπορείτε να αφήσετε σχόλιο σε αυτό το ζήτημα, επειδή ο κάτοχος του αποθετηρίου ή το άτομο που δημιούργησε το ζήτημα σας έχει αποκλείσει.
-pulls.blocked_by_user = Δεν μπορείτε να δημιουργήσετε pull request σε αυτό το αποθετήριο, επειδή ο κάτοχος του αποθετηρίου σας έχει αποκλείσει.
+pulls.blocked_by_user = Δεν μπορείτε να δημιουργήσετε pull request σε αυτό το repository, επειδή ο κάτοχος του repository σας έχει αποκλείσει.
 pulls.made_using_agit = AGit
 wiki.cancel = Ακύρωση
 settings.units.add_more = Προσθήκη μονάδων...
@@ -2710,13 +2710,13 @@ rss.must_be_on_branch = Για να αποκτήσετε ένα RSS feed, πρέ
 clone_in_vscodium = Κλωνοποίηση στο VSCodium
 editor.invalid_commit_mail = Αυτή η διεύθυνση email δεν είναι έγκυρη για την δημιουργία μίας υποβολής.
 pulls.nothing_to_compare_have_tag = Ο επιλεγμένος κλάδος/tag είναι όμοιος.
-issues.blocked_by_user = Δεν μπορείτε να δημιουργήσετε ζητήματα σε αυτό το αποθετήριο, επειδή ο κάτοχος του αποθετηρίου σας έχει αποκλείσει.
+issues.blocked_by_user = Δεν μπορείτε να δημιουργήσετε ζητήματα σε αυτό το repository, επειδή ο κάτοχος του repository σας έχει αποκλείσει.
 pulls.agit_explanation = Δημιουργημένο μέσω του AGit. Το AGit επιτρέπει σε συνεισφέροντες να προτείνουν αλλαγές χρησιμοποιώντας την εντολή «git push», χωρίς την δημιουργία fork ή έναν νέο κλάδο.
 activity.navbar.recent_commits = Πρόσφατες υποβολές
 settings.wiki_globally_editable = Να επιτρέπεται η επεξεργασία του wiki σε όλους
 admin.manage_flags = Διαχείριση σημάνσεων
-admin.enabled_flags = Το αποθετήριο έχει τις εξής σημάνσεις:
-settings.mirror_settings.pushed_repository = Προοριζόμενο αποθετήριο
+admin.enabled_flags = Το repository έχει τις εξής σημάνσεις:
+settings.mirror_settings.pushed_repository = Προοριζόμενο repository
 admin.flags_replaced = Οι σημάνσεις του αποθετηρίου αντικαταστάθηκαν
 activity.navbar.code_frequency = Συχνότητα κώδικα
 settings.wiki_branch_rename_success = Το όνομα κλάδου wiki του αποθετηρίου κανονικοποιήθηκε επιτυχώς.
@@ -2767,7 +2767,7 @@ editor.commit_id_not_matching = Το αρχείο άλλαξε όσο το επ
 settings.sourcehut_builds.visibility = Ορατότητα εργασιών
 object_format = Μορφή αντικειμένων («object format»)
 settings.ignore_stale_approvals_desc = Οι εγκρίσεις, οι οποίες αναφέρονται σε παλαιότερες υποβολές, δεν θα προσμετρούνται στο σύνολο των απαιτούμενων εγκρίσεων του pull request. Εφόσον αυτές οι εγκρίσεις έχουν ήδη ανακληθεί, τότε αυτή η ρύθμιση δεν θα παίξει κάποιον ρόλο.
-settings.archive.mirrors_unavailable = Οι λειτουργίες ειδώλου δεν είναι διαθέσιμες εφόσον το αποθετήριο έχει αρχειοθετηθεί.
+settings.archive.mirrors_unavailable = Οι λειτουργίες ειδώλου δεν είναι διαθέσιμες εφόσον το repository έχει αρχειοθετηθεί.
 settings.web_hook_name_sourcehut_builds = SourceHut Builds
 settings.enforce_on_admins = Εφαρμογή κανόνα σε διαχειριστές του αποθετηρίου
 object_format_helper = Η μορφή αντικειμένων («object format») του αποθετηρίου. Δεν θα μπορείτε να το αλλάξετε μεταγενέστερα. Η πιο συμβατή μορφή είναι η SHA1.
@@ -2805,7 +2805,7 @@ release.type_attachment = Συνημμένο
 activity.published_prerelease_label = Προδημοσίευση
 activity.published_tag_label = Ετικέτα
 settings.pull_mirror_sync_quota_exceeded = Έχετε υπερβεί τους διαθέσιμους πόρους σας, για αυτό δεν θα γίνει λήψη των πιο πρόσφατων αλλαγών.
-settings.transfer_quota_exceeded = Ο νέος ιδιοκτήτης (%s) έχει υπερβεί τους διαθέσιμους πόρους του. Το αποθετήριο δεν μπορεί να μεταφερθεί.
+settings.transfer_quota_exceeded = Ο νέος ιδιοκτήτης (%s) έχει υπερβεί τους διαθέσιμους πόρους του. Το repository δεν μπορεί να μεταφερθεί.
 release.asset_name = Όνομα αρχείου
 release.asset_external_url = Εξωτερικό URL
 release.invalid_external_url = Μη έγκυρο εξωτερικό URL: «%s»
@@ -2901,7 +2901,7 @@ teams.join=Συμμετοχή
 teams.leave=Αποχώρηση
 teams.leave.detail=Σίγουρα θέλετε να αποχωρήσετε από την ομάδα %s;
 teams.can_create_org_repo=Δημιουργία αποθετηρίων
-teams.can_create_org_repo_helper=Τα μέλη μπορούν να δημιουργήσουν νέα αποθετήρια στον οργανισμό. Ο δημιουργός θα αποκτήσει πρόσβαση διαχειριστή στο νέο αποθετήριο.
+teams.can_create_org_repo_helper=Τα μέλη μπορούν να δημιουργήσουν νέα αποθετήρια στον οργανισμό. Ο δημιουργός θα αποκτήσει πρόσβαση διαχειριστή στο νέο repository.
 teams.none_access=Καμία πρόσβαση
 teams.none_access_helper=Τα μέλη δεν μπορούν να δουν ή να κάνουν οποιαδήποτε άλλη ενέργεια σε αυτή τη μονάδα.
 teams.general_access=Γενική πρόσβαση
@@ -2922,7 +2922,7 @@ teams.add_team_member=Προσθήκη μέλους ομάδας
 teams.invite_team_member=Πρόσκληση στην ομάδα %s
 teams.invite_team_member.list=Εκκρεμείς προσκλήσεις
 teams.delete_team_title=Διαγραφή ομάδας
-teams.delete_team_desc=Η διαγραφή μιας ομάδας ανακαλεί τη πρόσβαση στο αποθετήριο από τα μέλη της. Συνέχεια;
+teams.delete_team_desc=Η διαγραφή μιας ομάδας ανακαλεί τη πρόσβαση στο repository από τα μέλη της. Συνέχεια;
 teams.delete_team_success=Η ομάδα έχει διαγραφεί.
 teams.read_permission_desc=Αυτή η ομάδα χορηγεί πρόσβαση Ανάγνωσης: τα μέλη μπορούν να δουν και να κλωνοποιήσουν τα αποθετήρια της ομάδας.
 teams.write_permission_desc=Αυτή η ομάδα χορηγεί πρόσβαση Εγγραφής: τα μέλη μπορούν να διαβάσουν και να κάνουν push στα αποθετήρια της ομάδας.
@@ -2934,9 +2934,9 @@ teams.remove_all_repos_title=Αφαίρεση όλων των αποθετηρί
 teams.remove_all_repos_desc=Αυτό θα αφαιρέσει όλα τα αποθετήρια από την ομάδα.
 teams.add_all_repos_title=Προσθήκη όλων των αποθετηρίων
 teams.add_all_repos_desc=Αυτό θα προσθέσει όλα τα αποθετήρια του οργανισμού στην ομάδα.
-teams.add_nonexistent_repo=Το αποθετήριο που προσπαθείτε να προσθέσετε δεν υπάρχει, παρακαλώ δημιουργήστε το πρώτα.
+teams.add_nonexistent_repo=Το repository που προσπαθείτε να προσθέσετε δεν υπάρχει, παρακαλώ δημιουργήστε το πρώτα.
 teams.add_duplicate_users=Ο χρήστης είναι ήδη μέλος της ομάδας.
-teams.repos.none=Αυτή η ομάδα δεν έχει πρόσβαση σε κανένα αποθετήριο.
+teams.repos.none=Αυτή η ομάδα δεν έχει πρόσβαση σε κανένα repository.
 teams.members.none=Δεν υπάρχουν μέλη σε αυτήν την ομάδα.
 teams.specific_repositories=Συγκεκριμένα αποθετήρια
 teams.specific_repositories_helper=Τα μέλη θα έχουν πρόσβαση μόνο σε αποθετήρια που προστίθενται ρητά στην ομάδα. Επιλέγοντας το δεν θα θα αφαιρεθούν αυτόματα τα αποθετήρια που έχουν ήδη προστεθεί με το Όλα τα αποθετήρια.
@@ -3154,7 +3154,7 @@ packages.creator=Δημιουργός
 packages.name=Όνομα
 packages.version=Έκδοση
 packages.type=Τύπος
-packages.repository=Αποθετήριο
+packages.repository=Repository
 packages.size=Μέγεθος
 packages.published=Δημοσιευμένα
 
@@ -3473,7 +3473,7 @@ notices.inverse_selection=Αντιστροφή επιλογής
 notices.delete_selected=Διαγραφή επιλεγμένων
 notices.delete_all=Διαγραφή όλων των ειδοποιήσεων
 notices.type=Τύπος
-notices.type_1=Αποθετήριο
+notices.type_1=Repository
 notices.type_2=Εργασία
 notices.desc=Περιγραφή
 notices.op=Λειτ.
@@ -3511,7 +3511,7 @@ users.organization_creation.description = Να επιτρέπεται η δημ
 
 [action]
 create_repo=δημιούργησε το αποθετήριο %s
-rename_repo=μετονόμασε το αποθετήριο από %[1]s σε %[3]s
+rename_repo=μετονόμασε το repository από %[1]s σε %[3]s
 commit_repo=έκανε push στο %[3]s του %[4]s
 create_issue=`άνοιξε το ζήτημα %[3]s#%[2]s`
 close_issue=`έκλεισε το ζήτημα %[3]s#%[2]s`
@@ -3523,7 +3523,7 @@ comment_issue=`άφησε σχόλιο στο ζήτημα %[3]s
 comment_pull=`σχολίασε στο pull request %[3]s#%[2]s`
 merge_pull_request=`συγχώνευσε το pull request %[3]s#%[2]s`
 auto_merge_pull_request=`αυτόματη συγχώνευση του pull request %[3]s#%[2]s`
-transfer_repo=μετέφερε το αποθετήριο %s σε %s
+transfer_repo=μετέφερε το repository %s σε %s
 push_tag=ώθησε την ετικέτα %[3]s σε %[4]s
 delete_tag=διέγραψε την ετικέτα %[2]s από %[3]s
 delete_branch=διέγραψε το κλάδο %[2]s από %[3]s
@@ -3603,7 +3603,7 @@ title=Πακέτα
 desc=Διαχείριση πακέτων μητρώου.
 empty=Δεν υπάρχουν πακέτα ακόμα.
 empty.documentation=Για περισσότερες πληροφορίες σχετικά με το μητρώο πακέτων, συμβουλευτείτε τον οδηγό.
-empty.repo=Μήπως ανεβάσατε ένα πακέτο, αλλά δεν εμφανίζεται εδώ; Πηγαίνετε στις ρυθμίσεις πακέτων και συνδέστε το σε αυτό το αποθετήριο.
+empty.repo=Μήπως ανεβάσατε ένα πακέτο, αλλά δεν εμφανίζεται εδώ; Πηγαίνετε στις ρυθμίσεις πακέτων και συνδέστε το σε αυτό το repository.
 registry.documentation=Για περισσότερες πληροφορίες σχετικά με το μητρώο %s, συμβουλευτείτε τον οδηγό.
 filter.type=Τύπος
 filter.type.all=Όλα
@@ -3644,10 +3644,10 @@ composer.registry=Ρυθμίστε αυτό το μητρώο στο αρχεί
 composer.install=Για να εγκαταστήσετε το πακέτο χρησιμοποιώντας το Composer, εκτελέστε την ακόλουθη εντολή:
 composer.dependencies=Εξαρτήσεις
 composer.dependencies.development=Εξαρτήσεις Ανάπτυξης
-conan.details.repository=Αποθετήριο
+conan.details.repository=Repository
 conan.registry=Ρυθμίστε αυτό το μητρώο από τη γραμμή εντολών:
 conan.install=Για να εγκαταστήσετε το πακέτο χρησιμοποιώντας το Conan, εκτελέστε την ακόλουθη εντολή:
-conda.registry=Ρυθμίστε αυτό το μητρώο ως αποθετήριο Conda στο αρχείο .condarc:
+conda.registry=Ρυθμίστε αυτό το μητρώο ως repository Conda στο αρχείο .condarc:
 conda.install=Για να εγκαταστήσετε το πακέτο χρησιμοποιώντας το Conda, εκτελέστε την ακόλουθη εντολή:
 container.details.type=Τύπος Εικόνας
 container.details.platform=Πλατφόρμα
@@ -3705,8 +3705,8 @@ swift.registry=Ρυθμίστε αυτό το μητρώο από τη γραμ
 swift.install=Προσθέστε το πακέτο στο αρχείο Package.swift:
 swift.install2=και εκτελέστε την ακόλουθη εντολή:
 vagrant.install=Για προσθήκη ενός κυτίου Vagrant, εκτελέστε την ακόλουθη εντολή:
-settings.link=Σύνδεση αυτού του πακέτου με ένα αποθετήριο
-settings.link.description=Εάν συνδέσετε ένα πακέτο με ένα αποθετήριο, το πακέτο περιλαμβάνεται στη λίστα πακέτων του αποθετηρίου.
+settings.link=Σύνδεση αυτού του πακέτου με ένα repository
+settings.link.description=Εάν συνδέσετε ένα πακέτο με ένα repository, το πακέτο περιλαμβάνεται στη λίστα πακέτων του repository.
 settings.link.select=Επιλογή Αποθετηρίου
 settings.link.button=Ενημέρωση Συνδέσμου Αποθετηρίου
 settings.link.success=Ο σύνδεσμος αποθετηρίου ενημερώθηκε επιτυχώς.
@@ -3718,7 +3718,7 @@ settings.delete.success=Το πακέτο έχει διαγραφεί.
 settings.delete.error=Αποτυχία διαγραφής του πακέτου.
 owner.settings.cargo.title=Ευρετήριο μητρώου Cargo
 owner.settings.cargo.initialize=Αρχικοποίηση ευρετηρίου
-owner.settings.cargo.initialize.description=Απαιτείται ένα ειδικό αποθετήριο ευρετηρίου Git για τη χρήση του μητρώου Cargo. Χρησιμοποιώντας αυτή την επιλογή θα δημιουργηθεί ξανά το αποθετήριο και θα ρυθμιστεί αυτόματα.
+owner.settings.cargo.initialize.description=Απαιτείται ένα ειδικό repository ευρετηρίου Git για τη χρήση του μητρώου Cargo. Χρησιμοποιώντας αυτή την επιλογή θα δημιουργηθεί ξανά το repository και θα ρυθμιστεί αυτόματα.
 owner.settings.cargo.initialize.error=Αποτυχία αρχικοποίησης ευρετηρίου Cargo: %v
 owner.settings.cargo.initialize.success=Ο ευρετήριο Cargo δημιουργήθηκε με επιτυχία.
 owner.settings.cargo.rebuild=Ανανέωση ευρετηρίου
@@ -3811,7 +3811,7 @@ runners.task_list=Πρόσφατες εργασίες στον εκτελεστ
 runners.task_list.no_tasks=Δεν υπάρχει καμία εργασία ακόμα.
 runners.task_list.run=Εκτέλεση
 runners.task_list.status=Κατάσταση
-runners.task_list.repository=Αποθετήριο
+runners.task_list.repository=Repository
 runners.task_list.commit=Υποβολή
 runners.task_list.done_at=Ολοκλήρωσε Στις
 runners.edit_runner=Επεξεργασία Εκτελεστή
diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini
index 643a61b456..75ee89b545 100644
--- a/options/locale/locale_fi-FI.ini
+++ b/options/locale/locale_fi-FI.ini
@@ -147,6 +147,11 @@ value = Arvo
 rerun = Suorita uudelleen
 filter.clear = Tyhjennä suodattimet
 invalid_data = Virheellistä dataa: %v
+new_repo.title = Uusi repositorio
+new_org.title = Uusi organisaatio
+new_org.link = Uusi organisaatio
+new_repo.link = Uusi repositorio
+new_migrate.link = Uusi siirto
 
 [aria]
 footer.links = Linkit
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
index 656ead34e1..0df97ec31b 100644
--- a/options/locale/locale_fr-FR.ini
+++ b/options/locale/locale_fr-FR.ini
@@ -207,7 +207,7 @@ string.desc=Z - A
 
 [error]
 occurred=Une erreur s’est produite
-report_message=Si vous pensez qu'il s'agit d'un bug Forgejo, veuillez consulter notre board Codeberg ou ouvrir un nouveau ticket si nécessaire.
+report_message=Si vous pensez qu'il s'agit d'un bug Forgejo, veuillez consulter les tickets de Codeberg ou ouvrir un nouveau ticket si nécessaire.
 missing_csrf=Requête incorrecte : aucun jeton CSRF présent
 invalid_csrf=Requête incorrecte : jeton CSRF invalide
 not_found=La cible n'a pu être trouvée.
@@ -223,7 +223,7 @@ platform_desc=Forgejo est confirmé fonctionner sur des systèmes d'exploitation
 lightweight=Léger
 lightweight_desc=Forgejo utilise peu de ressources. Il peut même tourner sur un Raspberry Pi très bon marché. Économisez l'énergie de vos serveurs !
 license=Open Source
-license_desc=Toutes les sources sont sur Forgejo ! Rejoignez-nous et contribuez à rendre ce projet encore meilleur !
+license_desc=Toutes les sources sont sur Forgejo ! Rejoignez-nous et contribuez à rendre ce projet encore meilleur. Ne craignez pas de devenir un·e contributeur·trice !
 
 [install]
 install=Installation
@@ -558,6 +558,11 @@ removed_security_key.subject = Une clé de sécurité a été supprimée
 totp_disabled.subject = TOTP a été désactivé
 removed_security_key.no_2fa = Il n'y a plus de méthodes 2FA configurées ce qui signifie qu'il n'est plus nécessaire d'utiliser 2FA pour se connecter à votre compte.
 account_security_caution.text_1 = Si vous êtes à l’origine de cette action, vous pouvez ignorer ce courriel.
+totp_enrolled.text_1.no_webauthn = Vous venez d'activer TOTP pour votre compte. Cela signifie que pour toutes les prochaines connexions à votre compte, vous devrez utiliser TOTP comme méthode 2FA.
+totp_enrolled.subject = Vous avez activé TOTP comme méthode 2FA
+totp_enrolled.text_1.has_webauthn = Vous venez d'activer TOTP pour votre compte. Cela signifie que pour toutes les prochaines connexions à votre compte, vous pouvez utiliser TOTP comme méthode 2FA ou l'une de vos clés de sécurité.
+removed_security_key.text_1 = La clé de sécurité « %[1]s » vient d'être supprimée de votre compte.
+account_security_caution.text_2 = S'il ne s'agissait pas de vous, votre compte est compromis. Veuillez contacter les administrateurs du site.
 
 [modal]
 yes=Oui
@@ -823,7 +828,7 @@ add_new_email=Ajouter une nouvelle adresse e-mail
 add_new_openid=Ajouter une nouvelle URI OpenID
 add_email=Ajouter une adresse courriel
 add_openid=Ajouter une URI OpenID
-add_email_confirmation_sent=Un e-mail de confirmation a été envoyé à "%s". Veuillez vérifier votre boîte de réception dans les %s suivants pour confirmer votre adresse e-mail.
+add_email_confirmation_sent=Un courriel de confirmation a été envoyé à « %s ». Pour confirmer votre adresse de courriel, veuillez vérifier votre boîte de réception et suivre le lien indiqué dans les prochains %s.
 add_email_success=La nouvelle adresse e-mail a été ajoutée.
 email_preference_set_success=L'e-mail de préférence a été défini avec succès.
 add_openid_success=La nouvelle adresse OpenID a été ajoutée.
@@ -1042,6 +1047,8 @@ pronouns = Pronoms
 pronouns_unspecified = Non spécifiés
 language.title = Langue par défaut
 keep_activity_private.description = Vous seul pourrez voir votre activité publique, ainsi que les administrateurs de l'instance.
+language.localization_project = Aidez-nous à traduire Forgejo dans votre langue ! En savoir plus.
+language.description = Cette langue sera enregistrée dans votre compte et utilisée comme langue par défaut après votre connexion.
 
 [repo]
 new_repo_helper=Un dépôt contient tous les fichiers d’un projet, ainsi que l’historique de leurs modifications. Vous avez déjà ça ailleurs ? Migrez-le ici.
@@ -1421,7 +1428,7 @@ commitstatus.failure=Échec
 commitstatus.pending=En attente
 commitstatus.success=Succès
 
-ext_issues=Accès aux tickets externes
+ext_issues=Tickets externes
 ext_issues.desc=Lien vers un gestionnaire de tickets externe.
 
 projects=Projets
@@ -1602,9 +1609,9 @@ issues.no_content=Sans contenu.
 issues.close=Fermer le ticket
 issues.comment_pull_merged_at=a fusionné la révision %[1]s dans %[2]s %[3]s
 issues.comment_manually_pull_merged_at=a fusionné manuellement la révision %[1]s dans %[2]s %[3]s
-issues.close_comment_issue=Commenter et fermer
+issues.close_comment_issue=Fermer avec le commentaire
 issues.reopen_issue=Rouvrir
-issues.reopen_comment_issue=Commenter et réouvrir
+issues.reopen_comment_issue=Réouvrir avec le commentaire
 issues.create_comment=Commenter
 issues.closed_at=`a fermé ce ticket %[2]s.`
 issues.reopened_at=`a réouvert ce ticket %[2]s.`
@@ -1993,7 +2000,7 @@ signing.wont_sign.commitssigned=La fusion ne sera pas signée car ses révisions
 signing.wont_sign.approved=La fusion ne sera pas signée car la demande d'ajout n'a pas été approuvée.
 signing.wont_sign.not_signed_in=Vous n'êtes pas connecté.
 
-ext_wiki=Accès au wiki externe
+ext_wiki=Wiki externe
 ext_wiki.desc=Lier un wiki externe.
 
 wiki=Wiki
@@ -2418,14 +2425,14 @@ settings.protect_enable_merge_desc=Toute personne ayant un accès en écriture s
 settings.protect_whitelist_committers=Liste blanche des soumissions (push)
 settings.protect_whitelist_committers_desc=Seuls les utilisateurs ou les équipes autorisés pourront soumettre sur cette branche (sans forcer).
 settings.protect_whitelist_deploy_keys=Mettez les clés de déploiement sur liste blanche avec accès en écriture pour soumettre.
-settings.protect_whitelist_users=Utilisateurs sur liste blanche :
+settings.protect_whitelist_users=Utilisateurs sur liste blanche pour pousser
 settings.protect_whitelist_search_users=Rechercher des utilisateurs…
-settings.protect_whitelist_teams=Équipes sur liste blanche :
+settings.protect_whitelist_teams=Équipes sur liste blanche pour pousser
 settings.protect_whitelist_search_teams=Rechercher des équipes…
 settings.protect_merge_whitelist_committers=Activer la liste blanche pour la fusion
 settings.protect_merge_whitelist_committers_desc=N'autoriser que les utilisateurs et les équipes en liste blanche d'appliquer les demandes de fusion sur cette branche.
-settings.protect_merge_whitelist_users=Utilisateurs en liste blanche de fusion :
-settings.protect_merge_whitelist_teams=Équipes en liste blanche de fusion :
+settings.protect_merge_whitelist_users=Utilisateurs en liste blanche pour fusionner
+settings.protect_merge_whitelist_teams=Équipes en liste blanche pour fusionner
 settings.protect_check_status_contexts=Activer le contrôle de status
 settings.protect_status_check_patterns=Motifs de vérification des statuts :
 settings.protect_status_check_patterns_desc=Entrez des motifs pour spécifier quelles vérifications doivent réussir avant que des branches puissent être fusionnées. Un motif par ligne. Un motif ne peut être vide.
@@ -2434,12 +2441,12 @@ settings.protect_check_status_contexts_list=Contrôles qualité trouvés au cour
 settings.protect_status_check_matched=Correspondant
 settings.protect_invalid_status_check_pattern=Motif de vérification des statuts incorrect : « %s ».
 settings.protect_no_valid_status_check_patterns=Aucun motif de vérification des statuts valide.
-settings.protect_required_approvals=Minimum d'approbations requis :
+settings.protect_required_approvals=Approbations requises
 settings.protect_required_approvals_desc=Permet de fusionner les demandes d’ajout lorsque suffisamment d’évaluation sont positives.
 settings.protect_approvals_whitelist_enabled=Restreindre les approbations aux utilisateurs ou aux équipes en liste blanche
 settings.protect_approvals_whitelist_enabled_desc=Seuls les évaluations des utilisateurs ou des équipes suivantes compteront dans les approbations requises. Si laissé vide, les évaluations de toute personne ayant un accès en écriture seront comptabilisées à la place.
-settings.protect_approvals_whitelist_users=Évaluateurs autorisés :
-settings.protect_approvals_whitelist_teams=Équipes d’évaluateurs autorisés :
+settings.protect_approvals_whitelist_users=Évaluateurs autorisés
+settings.protect_approvals_whitelist_teams=Équipes d’évaluateurs autorisés
 settings.dismiss_stale_approvals=Révoquer automatiquement les approbations périmées
 settings.dismiss_stale_approvals_desc=Lorsque des nouvelles révisions changent le contenu de la demande d’ajout, les approbations existantes sont révoquées.
 settings.ignore_stale_approvals=Ignorer les approbations obsolètes
@@ -2449,9 +2456,9 @@ settings.require_signed_commits_desc=Rejeter les soumissions sur cette branche l
 settings.protect_branch_name_pattern=Motif de nom de branche protégé
 settings.protect_branch_name_pattern_desc=Motifs de nom de branche protégé. Consultez la documentation pour la syntaxe du motif. Exemples : main, release/**
 settings.protect_patterns=Motifs
-settings.protect_protected_file_patterns=Liste des fichiers et motifs protégés (séparés par un point virgule ";") :
-settings.protect_protected_file_patterns_desc=Les fichiers protégés ne peuvent être modifiés, même si l'utilisateur a le droit d'ajouter, éditer ou supprimer des fichiers dans cette branche. Plusieurs motifs peuvent être séparés par un point-virgule (";"). Veuillez voir github.com/gobwas/glob la documentation pour la syntaxe des motifs. Exemples : .drone.yml, /docs/**/*.txt.
-settings.protect_unprotected_file_patterns=Liste des fichiers et motifs exclus (séparés par un point virgule ";") :
+settings.protect_protected_file_patterns=Motifs de fichiers protégés (séparés par un point virgule ";")
+settings.protect_protected_file_patterns_desc=Les fichiers protégés ne peuvent être modifiés, même si l'utilisateur a le droit d'ajouter, éditer ou supprimer des fichiers dans cette branche. Plusieurs motifs peuvent être séparés par un point-virgule (";"). Veuillez voir %[2]s la documentation pour la syntaxe des motifs. Exemples : .drone.yml, /docs/**/*.txt.
+settings.protect_unprotected_file_patterns=Motifs de fichiers non protégés (séparés par un point virgule ";")
 settings.protect_unprotected_file_patterns_desc=Les fichiers non-protégés qui peuvent être modifiés si l'utilisateur a le droit d'écriture, prenant le pas sur les restrictions de push. Plusieurs motifs peuvent être séparés par un point-virgule (";"). Veuillez voir %[2]s la documentation pour la syntaxe des motifs. Exemples : .drone.yml, /docs/**/*.txt.
 settings.add_protected_branch=Activer la protection
 settings.delete_protected_branch=Désactiver la protection
@@ -2811,6 +2818,23 @@ settings.federation_following_repos = Les URL des dépôts suivis séparés par
 settings.federation_not_enabled = La fédération n'est pas activée pour votre instance.
 comments.edit.already_changed = Impossible de sauvegarder les changements du commentaire car son contenu a déjà été modifié par un autre utilisateur. Veuillez recharger la page et essayer de l'éditer à nouveau pour éviter d'écraser ses changements
 settings.federation_apapiurl = URL de fédération de ce dépôt. A copier-coller dans les paramètres de fédérations d'un autre dépôt comme URL d'un dépôt à suivre.
+mirror_denied_combination = Il n'est pas possible de combiner une authentification par clé publique et par mot de passe.
+mirror_public_key = Clé SSH publique
+mirror_use_ssh.text = Utiliser l'authentification SSH
+mirror_use_ssh.helper = Forgejo va créer un miroir du dépôt via Git sur SSH et créer une paire de clés pour vous lorsque vous sélectionnez cette option. Vous devez vous assurer que la clé publique générée est autorisée à pousser dans le dépôt de destination. Il n'est pas possible d'utiliser l'autorisation basée sur un mot de passe si vous choisissez cette option.
+no_eol.text = Pas d'EOL
+mirror_use_ssh.not_available = L'authentification par SSH n'est pas disponible.
+no_eol.tooltip = Ce fichier ne contient pas de caractère final de fin de ligne.
+release.type_attachment = Pièce jointe
+settings.transfer_quota_exceeded = Le nouvel utilisateur (%s) a dépassé son quota. Le dépôt n'a pas été transféré.
+settings.pull_mirror_sync_quota_exceeded = Quota dépassé, les modifications ne sont pas tirées.
+activity.commit = Activité de commit
+settings.mirror_settings.push_mirror.copy_public_key = Copier la clé publique
+release.asset_external_url = URL externe
+release.invalid_external_url = URL externe non valable : « %s »
+milestones.filter_sort.name = Nom
+settings.mirror_settings.push_mirror.none_ssh = Aucun
+settings.protect_new_rule = Créer une nouvelle règle de protection de branche
 
 [graphs]
 component_loading=Chargement de %s…
diff --git a/options/locale/locale_is-IS.ini b/options/locale/locale_is-IS.ini
index e34da348a5..0cb6c0f7ab 100644
--- a/options/locale/locale_is-IS.ini
+++ b/options/locale/locale_is-IS.ini
@@ -3,7 +3,7 @@ home=Forsíða
 dashboard=Stjórnborð
 explore=Vafra
 help=Hjálp
-sign_in=Skrá Inn
+sign_in=Skrá inn
 sign_in_or=eða
 sign_out=Skrá Út
 sign_up=Nýskráning
@@ -15,9 +15,9 @@ page=Síða
 template=Sniðmát
 language=Tungumál
 notifications=Tilkynningar
-active_stopwatch=Virk Tímamæling
+active_stopwatch=Virk tímamæling
 create_new=Skapa…
-user_profile_and_more=Notandasíða og Stillingar…
+user_profile_and_more=Notandasíða og stillingar…
 signed_in_as=Skráð(ur) inn sem
 toc=Efnisyfirlit
 licenses=Hugbúnaðarleyfi
@@ -111,6 +111,8 @@ concept_code_repository=Hugbúnaðarsafn
 
 name=Heiti
 value=Gildi
+sign_in_with_provider = Skrá inn með %s
+enable_javascript = Þessi síða krefst JavaScript.
 
 [aria]
 
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
index 0860176b18..f6fcd5135f 100644
--- a/options/locale/locale_it-IT.ini
+++ b/options/locale/locale_it-IT.ini
@@ -471,6 +471,11 @@ openid_signin_desc = Inserisci il tuo URI OpenID. Per esempio: alice.openid.exam
 password_pwned = La password che hai scelto è in un elenco di password rubate precedentemente esposte a violazioni di dati pubblici. Riprova con una password diversa e valuta di modificare questa password anche altrove.
 tab_signup = Registrati
 tab_signin = Accedi
+back_to_sign_in = Torna alla schermata d'accesso
+sign_in_openid = Procedi con OpenID
+hint_login = Hai già un'utenza? Accedi!
+hint_register = Non hai un'utenza? Registrati ora.
+sign_up_button = Registrati ora.
 
 [mail]
 view_it_on=Visualizza su %s
@@ -539,6 +544,21 @@ activate_email.title = %s, verifica il tuo indirizzo email
 admin.new_user.text = Clicca qui per gestire questo utente dal pannello di amministrazione.
 team_invite.text_1 = %[1]s ti ha invitato a far parte del team %[2]s nell'organizzazione %[3]s.
 team_invite.text_3 = Nota: Questo invito è destinato a %[1]s. Se non ti aspettavi questo invito, puoi ignorare questa email.
+primary_mail_change.subject = La tua mail principale è stata cambiata
+removed_security_key.no_2fa = Non ci sono più altri metodi di autenticazione a due fattori configurati, ergo non c'è più bisogno di accedere alla tua utenza tramite tale autenticazione.
+primary_mail_change.text_1 = La mail principale della tua utenza è appena stata cambiata in %[1]s. Ciò significa che questo indirizzo di posta elettronica non riceverà più notifiche mail da quest'utenza.
+totp_disabled.subject = La TOTP è stata disabilitata
+totp_disabled.no_2fa = Non ci sono più altri metodi d'autenticazione a due fattori configurati, ergo non c'è più bisogno di accedere alla tua utenza con tale autenticazione.
+removed_security_key.subject = È stata rimossa una chiave di sicurezza
+removed_security_key.text_1 = La chiave di sicurezza "%[1]s" è appena stata rimossa dalla tua utenza.
+totp_disabled.text_1 = La password a tempo usa e getta (TOTP) della tua utenza è appena stata disabilitata.
+totp_enrolled.subject = Hai attivato la TOTP come metodo d'autenticazione a due fattori
+totp_enrolled.text_1.no_webauthn = Hai appena attivato la TOTP per la tua utenza. Ciò significa che dovrai usarla come metodo d'autenticazione a due fattori per tutti i tuoi accessi futuri.
+totp_enrolled.text_1.has_webauthn = Hai appena attivato la TOTP per la tua utenza. Ciò significa che dovrai usare come metodo d'autenticazione a due fattori per i tuoi accessi futuri tale TOTP o una delle tue chiavi di sicurezza.
+password_change.subject = La tua password è stata modificata
+password_change.text_1 = La password della tua utenza è appena stata modificata.
+account_security_caution.text_1 = Se sei statə tu, puoi ignorare questa mail.
+account_security_caution.text_2 = Se non sei statə tu, la tua utenza è compromessa. Contatta l'amministrazione del sito.
 
 
 [modal]
@@ -1022,6 +1042,8 @@ pronouns = Pronomi
 pronouns_custom = Personalizzato
 pronouns_unspecified = Non specificato
 language.title = Lingua predefinita
+language.description = Questa lingua verrà salvata nella tua utenza e verrà usata come predefinita ogni volta che farai l'accesso.
+language.localization_project = Aiutaci a tradurre Forgejo nella tua lingua! Più informazioni.
 
 [repo]
 owner=Proprietario
@@ -3863,6 +3885,7 @@ exact_tooltip = Includi solo i risultati che corrispondono esattamente al termin
 issue_kind = Cerca segnalazioni...
 pull_kind = Cerca richieste...
 exact = Esatto
+milestone_kind = Ricerca tappe...
 
 [munits.data]
 gib = GiB
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
index f53356ee71..fba7f37808 100644
--- a/options/locale/locale_ja-JP.ini
+++ b/options/locale/locale_ja-JP.ini
@@ -158,6 +158,13 @@ filter.not_template = テンプレートではない
 invalid_data = 無効なデータ: %v
 more_items = さらに表示
 copy_generic = クリップボードへコピー
+new_repo.title = 新しいリポジトリ
+new_migrate.title = 新しいマイグレーション
+new_org.title = 新しい組織
+new_repo.link = 新しいリポジトリ
+new_migrate.link = 新しいマイグレーション
+new_org.link = 新しい組織
+test = テスト
 
 [aria]
 navbar=ナビゲーションバー
diff --git a/options/locale/locale_lt.ini b/options/locale/locale_lt.ini
index 35f56fa4fd..b55a749cb2 100644
--- a/options/locale/locale_lt.ini
+++ b/options/locale/locale_lt.ini
@@ -159,6 +159,18 @@ fuzzy_tooltip = Įtraukti rezultatus, kurie taip pat labai atitinka paieškos te
 repo_kind = Ieškoti saugyklų...
 code_search_unavailable = Kodų paieška šiuo metu nepasiekiama. Kreipkis į svetainės administratorių.
 org_kind = Ieškoti organizacijų...
+union = Bendrinis
+code_search_by_git_grep = Dabartiniai kodo paieškos rezultatai pateikiami atliekant „git grep“. Rezultatai gali būti geresni, jei svetainės administratorius įjungs kodo indeksuotoją.
+package_kind = Ieškoti paketų...
+project_kind = Ieškoti projektų...
+commit_kind = Ieškoti įsipareigojimų...
+runner_kind = Ieškoti vykdyklių...
+no_results = Nerasta atitinkamų rezultatų.
+issue_kind = Ieškoti problemų...
+branch_kind = Ieškoti šakų...
+milestone_kind = Ieškoti gairių...
+pull_kind = Ieškoti sujungimų...
+keyword_search_unavailable = Ieškoti pagal raktažodį šiuo metu nepasiekiamas. Susisiekite su svetainės administratoriumi.
 
 [actions]
 workflow.disable = Išjungti darbo eigą
@@ -171,6 +183,9 @@ runs.empty_commit_message = (tuščias įsipareigojimo pranešimas)
 submodule = Pomodulis
 changed_filemode = %[1]s → %[2]s
 symbolic_link = Virtualusis aplankas
+directory = Katalogas
+executable_file = Vykdomasis failas
+normal_file = Įprastas failas
 
 [projects]
 deleted.display_name = Ištrintas projektas
@@ -182,4 +197,64 @@ type-3.display_name = Organizacijos projektas
 filepreview.truncated = Peržiūra buvo sutrumpinta
 
 [mail]
-reset_password.text = Jei tai buvote jūs, spustelėkite toliau esančią nuorodą, kad atkurtumėte savo paskyrą per %s:
\ No newline at end of file
+reset_password.text = Jei tai buvote jūs, spustelėkite toliau esančią nuorodą, kad atkurtumėte savo paskyrą per %s:
+
+[heatmap]
+contributions_one = įnašas
+contributions_few = įnašai
+less = Mažiau
+more = Daugiau
+number_of_contributions_in_the_last_12_months = %s įnašų per pastaruosius 12 mėnesių
+contributions_zero = Įnašų nėra
+contributions_format = {contributions} {year} {month} {day}
+
+[aria]
+navbar = Naršymo juosta
+footer = Puslapinė poraštė
+footer.software = Apie šią programinę įrangą
+footer.links = Nuorodos
+
+[editor]
+buttons.quote.tooltip = Cituoti tekstą
+buttons.code.tooltip = Pridėti kodą
+buttons.link.tooltip = Pridėti nuorodą
+buttons.heading.tooltip = Pridėti antraštę
+buttons.bold.tooltip = Pridėti pusjuodį tekstą
+buttons.italic.tooltip = Pridėti kursyvinį tekstą
+
+[error]
+network_error = Tinklo klaida
+server_internal = Vidinio serverio klaida
+
+[startpage]
+app_desc = Nesudėtinga, savarankiškai teikiama „Git“ paslauga
+install = Lengva įdiegti
+
+[install]
+path = Kelias
+err_admin_name_is_reserved = Administratoriaus naudotojo vardas netinkamas. Naudotojo vardas yra rezervuotas.
+enable_update_checker = Įjungti naujinimų tikrintuvą
+env_config_keys = Aplinkos konfigūracija
+db_title = Duomenų bazės nustatymai
+db_type = Duomenų bazės tipas
+user = Naudotojo vardas
+password = Slaptažodis
+db_name = Duomenų bazės pavadinimas
+db_schema = Schema
+ssl_mode = SSL
+host = Pagrindinis komputeris
+general_title = Bendrieji nustatymai
+email_title = El. pašto nustatymai
+federated_avatar_lookup.description = Ieškokite pseudoportretų naudojant „Libravatar“.
+db_schema_helper = Palikite tuščią, jei tai numatytoji duomenų bazė („public“).
+err_empty_admin_password = Administratoriaus slaptažodis negali būti tuščias.
+err_empty_admin_email = Administratoriaus el. paštas negali būti tuščias.
+
+[explore]
+go_to = Eiti į
+code = Kodas
+
+[auth]
+remember_me = Prisiminti šį įrenginį
+forgot_password_title = Pamirštas slaptažodis
+forgot_password = Pamiršote slaptažodį?
\ No newline at end of file
diff --git a/options/locale/locale_nb_NO.ini b/options/locale/locale_nb_NO.ini
index aae4ae788f..349d56ce13 100644
--- a/options/locale/locale_nb_NO.ini
+++ b/options/locale/locale_nb_NO.ini
@@ -23,4 +23,115 @@ language = Språk
 notifications = Varslinger
 create_new = Opprett…
 user_profile_and_more = Profil og innstillinger…
-signed_in_as = Logget inn som
\ No newline at end of file
+signed_in_as = Logget inn som
+confirm_delete_selected = Bekreft sletting av alle valgte elementer?
+dashboard = Dashbord
+download_logs = Last ned logger
+copy_hash = Kopier hash
+more_items = Flere elementer
+passcode = Adgangskode
+webauthn_insert_key = Skriv inn din sikkerhetsnøkkel
+webauthn_use_twofa = Bruk tofaktorkode fra din mobil
+organization = Organisasjon
+mirror = Speil
+new_mirror = Ny speiling
+repository = Repositorium
+new_project = Nytt prosjekt
+new_project_column = Ny kolonne
+webauthn_error = Klarte ikke lese sikkerhetsnøkkelen.
+webauthn_unsupported_browser = Nettleseren din støtter ikke WebAuthn.
+webauthn_error_unknown = En ukjent feil oppstod. Vennligst prøv igjen.
+webauthn_error_insecure = WebAuhn støtter kun sikre forbindelser. For testing over HTTP kan du bruke verten "localhost" eller "127.0.0.1"
+admin_panel = Nettsideadministrasjon
+settings = Innstillinger
+your_profile = Profil
+your_starred = Stjernemerket
+your_settings = Innstillinger
+new_repo.title = Nytt repositorium
+new_migrate.title = Ny migrasjon
+new_org.title = Ny organisasjon
+new_repo.link = Nytt repositorium
+new_migrate.link = Ny migrasjon
+new_org.link = Ny organisasjon
+all = Alle
+sources = Kilder
+mirrors = Speilinger
+activities = Aktiviteter
+rss_feed = RSS feed
+retry = Prøv igjen
+rerun = Kjør på nytt
+rerun_all = Kjør alle jobber på nytt
+save = Lagre
+cancel = Avbryt
+forks = Forks
+milestones = Milepæler
+ok = OK
+test = Test
+loading = Laster inn…
+error = Feil
+go_back = Gå tilbake
+never = Aldri
+invalid_data = Ugyldig data: %v
+unknown = Ukjent
+pin = Pin
+artifacts = Artefakter
+archived = Arkivert
+concept_system_global = Global
+add = Legg til
+add_all = Legg til alle
+remove = Fjern
+remove_all = Fjern alle
+remove_label_str = Fjern element "%s"
+edit = Rediger
+view = Vis
+enabled = Aktivert
+disabled = Deaktivert
+locked = Låst
+copy = Kopier
+copy_generic = Kopier til utklippstavlen
+copy_url = Kopier URL
+copy_content = Kopier innhold
+copy_success = Kopiert!
+copy_error = Kopiering mislyktes
+copy_type_unsupported = Denne filtypen kan ikke kopieres
+write = Skriv
+preview = Forhåndsvis
+concept_user_individual = Individuell
+concept_code_repository = Repositorium
+concept_user_organization = Organisasjon
+show_timestamps = Vis tidsstempler
+show_log_seconds = Vis sekunder
+show_full_screen = Vis fullskjerm
+name = Navn
+value = Verdi
+filter = Filter
+filter.clear = Tøm filtre
+filter.is_archived = Arkivert
+filter.not_archived = Ikke arkivert
+filter.is_mirror = Speilinger
+filter.not_mirror = Ikke speilinger
+filter.is_template = Maler
+filter.not_template = Ikke maler
+filter.public = Offentlig
+filter.private = Privat
+explore = Utforsk
+active_stopwatch = Aktiv tidsregistrering
+home = Hjem
+help = Hjelp
+logo = Logo
+sign_in = Logg inn
+sign_in_with_provider = Logg inn med %s
+sign_in_or = eller
+sign_out = Logg ut
+sign_up = Opprett konto
+confirm_delete_artifact = Er du sikker på at du vil slette artefakten "%s" ?
+
+[search]
+search = Søk...
+type_tooltip = Søketype
+fuzzy = Fuzzy
+union = Union
+
+[auth]
+verify = Bekreft
+sign_up_button = Opprett konto nå.
\ No newline at end of file
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
index 0938d4099c..e13b1341c4 100644
--- a/options/locale/locale_ru-RU.ini
+++ b/options/locale/locale_ru-RU.ini
@@ -1406,7 +1406,7 @@ commitstatus.failure=Неудача
 commitstatus.pending=Ожидание
 commitstatus.success=Успешно
 
-ext_issues=Доступ ко внешним задачам
+ext_issues=Внешние задачи
 ext_issues.desc=Ссылка на внешнюю систему отслеживания задач.
 
 projects=Проекты
@@ -1587,9 +1587,9 @@ issues.no_content=Описание отсутствует.
 issues.close=Закрыть задачу
 issues.comment_pull_merged_at=коммит %[1]s был добавлен в %[2]s %[3]s
 issues.comment_manually_pull_merged_at=коммит %[1]s был вручную добавлен в %[2]s %[3]s
-issues.close_comment_issue=Прокомментировать и закрыть
+issues.close_comment_issue=Закрыть комментарием
 issues.reopen_issue=Открыть снова
-issues.reopen_comment_issue=Прокомментировать и открыть снова
+issues.reopen_comment_issue=Открыть снова комментарием
 issues.create_comment=Комментировать
 issues.closed_at=`задача была закрыта %[2]s`
 issues.reopened_at=`задача была открыта снова %[2]s`
@@ -1964,7 +1964,7 @@ signing.wont_sign.commitssigned=Слияние не будет подписан
 signing.wont_sign.approved=Слияние не будет подписано, так как запрос на слияние не одобрен.
 signing.wont_sign.not_signed_in=Вы не вошли в систему.
 
-ext_wiki=Доступ ко внешней вики
+ext_wiki=Внешняя вики
 ext_wiki.desc=Ссылка на внешнюю вики.
 
 wiki=Вики
@@ -3332,7 +3332,7 @@ config.allow_only_external_registration=Регистрация только че
 config.enable_openid_signup=Саморегистрация через OpenID
 config.enable_openid_signin=Вход через OpenID
 config.show_registration_button=Кнопка регистрации
-config.require_sign_in_view=Для просмотра содержимого необходима авторизация
+config.require_sign_in_view=Требовать авторизацию для просмотра содержимого
 config.mail_notify=Уведомления по эл. почте
 config.enable_captcha=CAPTCHA
 config.active_code_lives=Срок действия кода активации учётной записи
@@ -3963,4 +3963,8 @@ filepreview.lines = Строки с %[1]d по %[2]d в %[3]s
 filepreview.truncated = Предпросмотр был обрезан
 
 [translation_meta]
-test = хи-хи!
\ No newline at end of file
+test = хи-хи!
+
+[repo.permissions]
+code.write = Запись: отправка изменений в репозиторий, создание веток и тегов.
+code.read = Чтение: доступ к исходному коду репозитория и клонированию.
\ No newline at end of file
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 1873b11478..7a1a77c3e5 100644
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -1427,7 +1427,7 @@ commitstatus.failure=失败
 commitstatus.pending=待定
 commitstatus.success=成功
 
-ext_issues=访问外部工单
+ext_issues=外部工单
 ext_issues.desc=链接到外部工单跟踪系统。
 
 projects=项目
@@ -1608,9 +1608,9 @@ issues.no_content=没有提供说明。
 issues.close=关闭工单
 issues.comment_pull_merged_at=已合并提交 %[1]s 到 %[2]s %[3]s
 issues.comment_manually_pull_merged_at=手动合并提交 %[1]s 到 %[2]s %[3]s
-issues.close_comment_issue=评论并关闭
+issues.close_comment_issue=关闭评论
 issues.reopen_issue=重新开启
-issues.reopen_comment_issue=评论并重新开启
+issues.reopen_comment_issue=重新打开评论
 issues.create_comment=评论
 issues.closed_at=`于 %[2]s 关闭此工单`
 issues.reopened_at=`重新打开此问题 %[2]s`
@@ -1999,7 +1999,7 @@ signing.wont_sign.commitssigned=合并将不会被签名，因为所有相关的
 signing.wont_sign.approved=合并将不会被签名，因为合并请求未被批准。
 signing.wont_sign.not_signed_in=您还没有登录。
 
-ext_wiki=访问外部百科
+ext_wiki=外部百科
 ext_wiki.desc=链接到外部 wiki。
 
 wiki=百科
@@ -2330,7 +2330,7 @@ settings.event_repository_desc=创建或删除仓库
 settings.event_header_issue=工单事件
 settings.event_issues=工单
 settings.event_issues_desc=工单已打开、已关闭、已重新打开或已编辑。
-settings.event_issue_assign=工单已分配
+settings.event_issue_assign=工单已指派
 settings.event_issue_assign_desc=工单已被指派或取消指派。
 settings.event_issue_label=工单已分类
 settings.event_issue_label_desc=工单标签被更新或清除。
@@ -3818,7 +3818,7 @@ management=密钥管理
 [actions]
 actions=Actions
 
-unit.desc=使用 Forgejo Actions 管理集成的 CI/CD 管道
+unit.desc=使用 Forgejo Actions 管理集成的 CI/CD 管道。
 
 status.unknown=未知
 status.waiting=等待中
@@ -3980,4 +3980,24 @@ filepreview.lines = %[3]s 中的第 %[1]d 到 %[2]d 行
 filepreview.truncated = 预览已被截断
 
 [translation_meta]
-test = 好的
\ No newline at end of file
+test = 好的
+
+[repo.permissions]
+code.write = 写入：推送到仓库，创建分支和标签。
+code.read = 读取：访问并克隆仓库的代码。
+actions.read = 读取：查看集成的 CI/CD 管道及其日志。
+issues.write = 写入：关闭工单并管理元数据，如标签、里程碑、指派成员、截止日期和依赖。
+releases.write = 写入：发布、编辑和删除版本发布及其资产。
+issues.read = 读取：阅读并创建工单和评论。
+pulls.read = 读取：阅读并创建合并请求。
+releases.read = 读取：查看并下载版本发布。
+wiki.read = 读取：阅读集成的百科及其历史。
+wiki.write = 写入：在集成的百科中创建、更新和删除页面。
+projects.read = 读取：访问仓库项目看板。
+packages.read = 读取：查看并下载指派给仓库的软件包。
+packages.write = 写入：发布并删除指派给仓库的软件包。
+actions.write = 写入：手动触发、重启、取消或批准待处理的 CI/CD 管道。
+ext_issues = 访问外部工单系统的链接。权限由外部管理。
+ext_wiki = 访问外部百科的链接。权限由外部管理。
+projects.write = 写入：创建项目和列并进行编辑。
+pulls.write = 写入：关闭合并请求并管理元数据，如标签、里程碑、指派成员、截止日期和依赖。
\ No newline at end of file

From 1fa09d16210f825ea5aee5d87294c957d405a108 Mon Sep 17 00:00:00 2001
From: Otto Richter 
Date: Sat, 28 Sep 2024 03:39:19 +0200
Subject: [PATCH 051/443] Split Git package installation

---
 .../composite/apt-install-from/action.yaml    | 29 +++++++++++
 .forgejo/workflows/testing.yml                | 50 ++++++-------------
 2 files changed, 44 insertions(+), 35 deletions(-)
 create mode 100644 .forgejo/workflows/composite/apt-install-from/action.yaml

diff --git a/.forgejo/workflows/composite/apt-install-from/action.yaml b/.forgejo/workflows/composite/apt-install-from/action.yaml
new file mode 100644
index 0000000000..615e7cb184
--- /dev/null
+++ b/.forgejo/workflows/composite/apt-install-from/action.yaml
@@ -0,0 +1,29 @@
+inputs:
+  packages:
+    description: 'Packages to install'
+    required: true
+  release:
+    description: 'Release to install from'
+    default: testing
+
+runs:
+  using: "composite"
+  steps:
+    - name: setup apt package source
+      run: |
+        export DEBIAN_FRONTEND=noninteractive
+        echo "deb http://deb.debian.org/debian/ ${RELEASE} main" > "/etc/apt/sources.list.d/${RELEASE}.list"
+      env:
+        RELEASE: ${{inputs.release}}
+    - name: install packages
+      run: |
+        apt-get update -qq
+        apt-get -q install -qq -y ${PACKAGES}
+      env:
+        PACKAGES: ${{inputs.packages}}
+    - name: remove temporary package list to prevent using it in other steps
+      run: |
+        rm "/etc/apt/sources.list.d/${RELEASE}.list"
+        apt-get update -qq
+      env:
+        RELEASE: ${{inputs.release}}
diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml
index 5f7a1e351a..8c1e6d06f8 100644
--- a/.forgejo/workflows/testing.yml
+++ b/.forgejo/workflows/testing.yml
@@ -60,13 +60,9 @@ jobs:
       - uses: https://code.forgejo.org/actions/checkout@v3
       - uses: ./.forgejo/workflows/composite/setup-env
       - name: install git >= 2.42
-        run: |
-          export DEBIAN_FRONTEND=noninteractive
-          echo deb http://deb.debian.org/debian/ testing  main > /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
-          apt-get -q install -qq -y git
-          rm /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
+        uses: ./.forgejo/workflows/composite/apt-install-from
+        with:
+          packages: git
       - name: test release-notes-assistant.sh
         run: |
           apt-get -q install -qq -y jq
@@ -108,13 +104,9 @@ jobs:
       - uses: https://code.forgejo.org/actions/checkout@v3
       - uses: ./.forgejo/workflows/composite/setup-env
       - name: install git >= 2.42
-        run: |
-          export DEBIAN_FRONTEND=noninteractive
-          echo deb http://deb.debian.org/debian/ testing  main > /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
-          apt-get -q install -qq -y git
-          rm /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
+        uses: ./.forgejo/workflows/composite/apt-install-from
+        with:
+          packages: git
       - uses: ./.forgejo/workflows/composite/build-backend
       - run: |
           su forgejo -c 'make test-remote-cacher test-check'
@@ -143,13 +135,9 @@ jobs:
       - uses: https://code.forgejo.org/actions/checkout@v3
       - uses: ./.forgejo/workflows/composite/setup-env
       - name: install dependencies & git >= 2.42
-        run: |
-          export DEBIAN_FRONTEND=noninteractive
-          echo deb http://deb.debian.org/debian/ testing  main > /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
-          apt-get install --no-install-recommends -qq -y git git-lfs
-          rm /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
+        uses: ./.forgejo/workflows/composite/apt-install-from
+        with:
+          packages: git git-lfs
       - uses: ./.forgejo/workflows/composite/build-backend
       - run: |
           su forgejo -c 'make test-mysql-migration test-mysql'
@@ -179,13 +167,9 @@ jobs:
       - uses: https://code.forgejo.org/actions/checkout@v3
       - uses: ./.forgejo/workflows/composite/setup-env
       - name: install dependencies & git >= 2.42
-        run: |
-          export DEBIAN_FRONTEND=noninteractive
-          echo deb http://deb.debian.org/debian/ testing  main > /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
-          apt-get install --no-install-recommends -qq -y git git-lfs
-          rm /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
+        uses: ./.forgejo/workflows/composite/apt-install-from
+        with:
+          packages: git git-lfs
       - uses: ./.forgejo/workflows/composite/build-backend
       - run: |
           su forgejo -c 'make test-pgsql-migration test-pgsql'
@@ -204,13 +188,9 @@ jobs:
       - uses: https://code.forgejo.org/actions/checkout@v3
       - uses: ./.forgejo/workflows/composite/setup-env
       - name: install dependencies & git >= 2.42
-        run: |
-          export DEBIAN_FRONTEND=noninteractive
-          echo deb http://deb.debian.org/debian/ testing  main > /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
-          apt-get install --no-install-recommends -qq -y git git-lfs
-          rm /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
+        uses: ./.forgejo/workflows/composite/apt-install-from
+        with:
+          packages: git git-lfs
       - uses: ./.forgejo/workflows/composite/build-backend
       - run: |
           su forgejo -c 'make test-sqlite-migration test-sqlite'

From 5b17c1d6ebc39ab20327a502bea5bbc39a456846 Mon Sep 17 00:00:00 2001
From: Dirk 
Date: Sun, 29 Sep 2024 00:29:01 +0200
Subject: [PATCH 052/443] make sqlite3 the default database

---
 custom/conf/app.example.ini | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index 2eff51fe98..7eb4f1c655 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -349,16 +349,25 @@ RUN_USER = ; git
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
-;; Database to use. Either "mysql", "postgres", "mssql" or "sqlite3".
+;; Database to use. Either "sqlite3", "mySQL", "postgres" or "mssql".
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; SQLite Configuration
+;;
+DB_TYPE = sqlite3
+;PATH= ; defaults to data/forgejo.db
+;SQLITE_TIMEOUT = ; Query timeout defaults to: 500
+;SQLITE_JOURNAL_MODE = ; defaults to sqlite database default (often DELETE), can be used to enable WAL mode. https://www.sqlite.org/pragma.html#pragma_journal_mode
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; MySQL Configuration
 ;;
-DB_TYPE = mysql
-HOST = 127.0.0.1:3306 ; can use socket e.g. /var/run/mysqld/mysqld.sock
-NAME = gitea
-USER = root
+;DB_TYPE = mysql
+;HOST = 127.0.0.1:3306 ; can use socket e.g. /var/run/mysqld/mysqld.sock
+;NAME = gitea
+;USER = root
 ;PASSWD = ;Use PASSWD = `your password` for quoting if you use special characters in the password.
 ;SSL_MODE = false ; either "false" (default), "true", or "skip-verify"
 ;CHARSET_COLLATION = ; Empty as default, Gitea will try to find a case-sensitive collation. Don't change it unless you clearly know what you need.
@@ -377,15 +386,6 @@ USER = root
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
-;; SQLite Configuration
-;;
-;DB_TYPE = sqlite3
-;PATH= ; defaults to data/forgejo.db
-;SQLITE_TIMEOUT = ; Query timeout defaults to: 500
-;SQLITE_JOURNAL_MODE = ; defaults to sqlite database default (often DELETE), can be used to enable WAL mode. https://www.sqlite.org/pragma.html#pragma_journal_mode
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
 ;; MSSQL Configuration
 ;;
 ;DB_TYPE = mssql

From 8f0a05a7e47a1ed333bfdde01ee2e4d8580d39d0 Mon Sep 17 00:00:00 2001
From: ChristopherHX 
Date: Sun, 22 Sep 2024 13:01:09 +0200
Subject: [PATCH 053/443] Fix artifact v4 upload above 8MB (#31664)

Multiple chunks are uploaded with type "block" without using
"appendBlock" and eventually out of order for bigger uploads.
8MB seems to be the chunk size

This change parses the blockList uploaded after all blocks to get the
final artifact size and order them correctly before calculating the
sha256 checksum over all blocks

Fixes #31354

(cherry picked from commit b594cec2bda6f861effedb2e8e0a7ebba191c0e9)

Conflicts:
	routers/api/actions/artifactsv4.go
  conflict because of Refactor AppURL usage (#30885) 67c1a07285008cc00036a87cef966c3bd519a50c
    that was not cherry-picked in Forgejo
    the resolution consist of removing the extra ctx argument
---
 routers/api/actions/artifacts_chunks.go       |  50 +++++-
 routers/api/actions/artifactsv4.go            | 144 +++++++++++++-----
 .../api_actions_artifact_v4_test.go           | 130 ++++++++++++++++
 3 files changed, 285 insertions(+), 39 deletions(-)

diff --git a/routers/api/actions/artifacts_chunks.go b/routers/api/actions/artifacts_chunks.go
index b0c96585cb..cdb56584b8 100644
--- a/routers/api/actions/artifacts_chunks.go
+++ b/routers/api/actions/artifacts_chunks.go
@@ -123,6 +123,54 @@ func listChunksByRunID(st storage.ObjectStorage, runID int64) (map[int64][]*chun
 	return chunksMap, nil
 }
 
+func listChunksByRunIDV4(st storage.ObjectStorage, runID, artifactID int64, blist *BlockList) ([]*chunkFileItem, error) {
+	storageDir := fmt.Sprintf("tmpv4%d", runID)
+	var chunks []*chunkFileItem
+	chunkMap := map[string]*chunkFileItem{}
+	dummy := &chunkFileItem{}
+	for _, name := range blist.Latest {
+		chunkMap[name] = dummy
+	}
+	if err := st.IterateObjects(storageDir, func(fpath string, obj storage.Object) error {
+		baseName := filepath.Base(fpath)
+		if !strings.HasPrefix(baseName, "block-") {
+			return nil
+		}
+		// when read chunks from storage, it only contains storage dir and basename,
+		// no matter the subdirectory setting in storage config
+		item := chunkFileItem{Path: storageDir + "/" + baseName, ArtifactID: artifactID}
+		var size int64
+		var b64chunkName string
+		if _, err := fmt.Sscanf(baseName, "block-%d-%d-%s", &item.RunID, &size, &b64chunkName); err != nil {
+			return fmt.Errorf("parse content range error: %v", err)
+		}
+		rchunkName, err := base64.URLEncoding.DecodeString(b64chunkName)
+		if err != nil {
+			return fmt.Errorf("failed to parse chunkName: %v", err)
+		}
+		chunkName := string(rchunkName)
+		item.End = item.Start + size - 1
+		if _, ok := chunkMap[chunkName]; ok {
+			chunkMap[chunkName] = &item
+		}
+		return nil
+	}); err != nil {
+		return nil, err
+	}
+	for i, name := range blist.Latest {
+		chunk, ok := chunkMap[name]
+		if !ok || chunk.Path == "" {
+			return nil, fmt.Errorf("missing Chunk (%d/%d): %s", i, len(blist.Latest), name)
+		}
+		chunks = append(chunks, chunk)
+		if i > 0 {
+			chunk.Start = chunkMap[blist.Latest[i-1]].End + 1
+			chunk.End += chunk.Start
+		}
+	}
+	return chunks, nil
+}
+
 func mergeChunksForRun(ctx *ArtifactContext, st storage.ObjectStorage, runID int64, artifactName string) error {
 	// read all db artifacts by name
 	artifacts, err := db.Find[actions.ActionArtifact](ctx, actions.FindArtifactsOptions{
@@ -230,7 +278,7 @@ func mergeChunksForArtifact(ctx *ArtifactContext, chunks []*chunkFileItem, st st
 		rawChecksum := hash.Sum(nil)
 		actualChecksum := hex.EncodeToString(rawChecksum)
 		if !strings.HasSuffix(checksum, actualChecksum) {
-			return fmt.Errorf("update artifact error checksum is invalid")
+			return fmt.Errorf("update artifact error checksum is invalid %v vs %v", checksum, actualChecksum)
 		}
 	}
 
diff --git a/routers/api/actions/artifactsv4.go b/routers/api/actions/artifactsv4.go
index 7b2f9c4360..677e89da2f 100644
--- a/routers/api/actions/artifactsv4.go
+++ b/routers/api/actions/artifactsv4.go
@@ -24,8 +24,15 @@ package actions
 // PUT: http://localhost:3000/twirp/github.actions.results.api.v1.ArtifactService/UploadArtifact?sig=mO7y35r4GyjN7fwg0DTv3-Fv1NDXD84KLEgLpoPOtDI=&expires=2024-01-23+21%3A48%3A37.20833956+%2B0100+CET&artifactName=test&taskID=75&comp=block
 // 1.3. Continue Upload Zip Content to Blobstorage (unauthenticated request), repeat until everything is uploaded
 // PUT: http://localhost:3000/twirp/github.actions.results.api.v1.ArtifactService/UploadArtifact?sig=mO7y35r4GyjN7fwg0DTv3-Fv1NDXD84KLEgLpoPOtDI=&expires=2024-01-23+21%3A48%3A37.20833956+%2B0100+CET&artifactName=test&taskID=75&comp=appendBlock
-// 1.4. Unknown xml payload to Blobstorage (unauthenticated request), ignored for now
+// 1.4. BlockList xml payload to Blobstorage (unauthenticated request)
+// Files of about 800MB are parallel in parallel and / or out of order, this file is needed to enshure the correct order
 // PUT: http://localhost:3000/twirp/github.actions.results.api.v1.ArtifactService/UploadArtifact?sig=mO7y35r4GyjN7fwg0DTv3-Fv1NDXD84KLEgLpoPOtDI=&expires=2024-01-23+21%3A48%3A37.20833956+%2B0100+CET&artifactName=test&taskID=75&comp=blockList
+// Request
+// 
+// 
+// 	blockId1
+// 	blockId2
+// 
 // 1.5. FinalizeArtifact
 // Post: /twirp/github.actions.results.api.v1.ArtifactService/FinalizeArtifact
 // Request
@@ -82,6 +89,7 @@ import (
 	"crypto/hmac"
 	"crypto/sha256"
 	"encoding/base64"
+	"encoding/xml"
 	"fmt"
 	"io"
 	"net/http"
@@ -153,31 +161,34 @@ func ArtifactsV4Routes(prefix string) *web.Route {
 	return m
 }
 
-func (r artifactV4Routes) buildSignature(endp, expires, artifactName string, taskID int64) []byte {
+func (r artifactV4Routes) buildSignature(endp, expires, artifactName string, taskID, artifactID int64) []byte {
 	mac := hmac.New(sha256.New, setting.GetGeneralTokenSigningSecret())
 	mac.Write([]byte(endp))
 	mac.Write([]byte(expires))
 	mac.Write([]byte(artifactName))
 	mac.Write([]byte(fmt.Sprint(taskID)))
+	mac.Write([]byte(fmt.Sprint(artifactID)))
 	return mac.Sum(nil)
 }
 
-func (r artifactV4Routes) buildArtifactURL(endp, artifactName string, taskID int64) string {
+func (r artifactV4Routes) buildArtifactURL(endp, artifactName string, taskID, artifactID int64) string {
 	expires := time.Now().Add(60 * time.Minute).Format("2006-01-02 15:04:05.999999999 -0700 MST")
 	uploadURL := strings.TrimSuffix(setting.AppURL, "/") + strings.TrimSuffix(r.prefix, "/") +
-		"/" + endp + "?sig=" + base64.URLEncoding.EncodeToString(r.buildSignature(endp, expires, artifactName, taskID)) + "&expires=" + url.QueryEscape(expires) + "&artifactName=" + url.QueryEscape(artifactName) + "&taskID=" + fmt.Sprint(taskID)
+		"/" + endp + "?sig=" + base64.URLEncoding.EncodeToString(r.buildSignature(endp, expires, artifactName, taskID, artifactID)) + "&expires=" + url.QueryEscape(expires) + "&artifactName=" + url.QueryEscape(artifactName) + "&taskID=" + fmt.Sprint(taskID) + "&artifactID=" + fmt.Sprint(artifactID)
 	return uploadURL
 }
 
 func (r artifactV4Routes) verifySignature(ctx *ArtifactContext, endp string) (*actions.ActionTask, string, bool) {
 	rawTaskID := ctx.Req.URL.Query().Get("taskID")
+	rawArtifactID := ctx.Req.URL.Query().Get("artifactID")
 	sig := ctx.Req.URL.Query().Get("sig")
 	expires := ctx.Req.URL.Query().Get("expires")
 	artifactName := ctx.Req.URL.Query().Get("artifactName")
 	dsig, _ := base64.URLEncoding.DecodeString(sig)
 	taskID, _ := strconv.ParseInt(rawTaskID, 10, 64)
+	artifactID, _ := strconv.ParseInt(rawArtifactID, 10, 64)
 
-	expecedsig := r.buildSignature(endp, expires, artifactName, taskID)
+	expecedsig := r.buildSignature(endp, expires, artifactName, taskID, artifactID)
 	if !hmac.Equal(dsig, expecedsig) {
 		log.Error("Error unauthorized")
 		ctx.Error(http.StatusUnauthorized, "Error unauthorized")
@@ -272,6 +283,8 @@ func (r *artifactV4Routes) createArtifact(ctx *ArtifactContext) {
 		return
 	}
 	artifact.ContentEncoding = ArtifactV4ContentEncoding
+	artifact.FileSize = 0
+	artifact.FileCompressedSize = 0
 	if err := actions.UpdateArtifactByID(ctx, artifact.ID, artifact); err != nil {
 		log.Error("Error UpdateArtifactByID: %v", err)
 		ctx.Error(http.StatusInternalServerError, "Error UpdateArtifactByID")
@@ -280,7 +293,7 @@ func (r *artifactV4Routes) createArtifact(ctx *ArtifactContext) {
 
 	respData := CreateArtifactResponse{
 		Ok:              true,
-		SignedUploadUrl: r.buildArtifactURL("UploadArtifact", artifactName, ctx.ActionTask.ID),
+		SignedUploadUrl: r.buildArtifactURL("UploadArtifact", artifactName, ctx.ActionTask.ID, artifact.ID),
 	}
 	r.sendProtbufBody(ctx, &respData)
 }
@@ -306,38 +319,77 @@ func (r *artifactV4Routes) uploadArtifact(ctx *ArtifactContext) {
 	comp := ctx.Req.URL.Query().Get("comp")
 	switch comp {
 	case "block", "appendBlock":
-		// get artifact by name
-		artifact, err := r.getArtifactByName(ctx, task.Job.RunID, artifactName)
-		if err != nil {
-			log.Error("Error artifact not found: %v", err)
-			ctx.Error(http.StatusNotFound, "Error artifact not found")
-			return
-		}
+		blockid := ctx.Req.URL.Query().Get("blockid")
+		if blockid == "" {
+			// get artifact by name
+			artifact, err := r.getArtifactByName(ctx, task.Job.RunID, artifactName)
+			if err != nil {
+				log.Error("Error artifact not found: %v", err)
+				ctx.Error(http.StatusNotFound, "Error artifact not found")
+				return
+			}
 
-		if comp == "block" {
-			artifact.FileSize = 0
-			artifact.FileCompressedSize = 0
+			_, err = appendUploadChunk(r.fs, ctx, artifact, artifact.FileSize, ctx.Req.ContentLength, artifact.RunID)
+			if err != nil {
+				log.Error("Error runner api getting task: task is not running")
+				ctx.Error(http.StatusInternalServerError, "Error runner api getting task: task is not running")
+				return
+			}
+			artifact.FileCompressedSize += ctx.Req.ContentLength
+			artifact.FileSize += ctx.Req.ContentLength
+			if err := actions.UpdateArtifactByID(ctx, artifact.ID, artifact); err != nil {
+				log.Error("Error UpdateArtifactByID: %v", err)
+				ctx.Error(http.StatusInternalServerError, "Error UpdateArtifactByID")
+				return
+			}
+		} else {
+			_, err := r.fs.Save(fmt.Sprintf("tmpv4%d/block-%d-%d-%s", task.Job.RunID, task.Job.RunID, ctx.Req.ContentLength, base64.URLEncoding.EncodeToString([]byte(blockid))), ctx.Req.Body, -1)
+			if err != nil {
+				log.Error("Error runner api getting task: task is not running")
+				ctx.Error(http.StatusInternalServerError, "Error runner api getting task: task is not running")
+				return
+			}
 		}
-
-		_, err = appendUploadChunk(r.fs, ctx, artifact, artifact.FileSize, ctx.Req.ContentLength, artifact.RunID)
+		ctx.JSON(http.StatusCreated, "appended")
+	case "blocklist":
+		rawArtifactID := ctx.Req.URL.Query().Get("artifactID")
+		artifactID, _ := strconv.ParseInt(rawArtifactID, 10, 64)
+		_, err := r.fs.Save(fmt.Sprintf("tmpv4%d/%d-%d-blocklist", task.Job.RunID, task.Job.RunID, artifactID), ctx.Req.Body, -1)
 		if err != nil {
 			log.Error("Error runner api getting task: task is not running")
 			ctx.Error(http.StatusInternalServerError, "Error runner api getting task: task is not running")
 			return
 		}
-		artifact.FileCompressedSize += ctx.Req.ContentLength
-		artifact.FileSize += ctx.Req.ContentLength
-		if err := actions.UpdateArtifactByID(ctx, artifact.ID, artifact); err != nil {
-			log.Error("Error UpdateArtifactByID: %v", err)
-			ctx.Error(http.StatusInternalServerError, "Error UpdateArtifactByID")
-			return
-		}
-		ctx.JSON(http.StatusCreated, "appended")
-	case "blocklist":
 		ctx.JSON(http.StatusCreated, "created")
 	}
 }
 
+type BlockList struct {
+	Latest []string `xml:"Latest"`
+}
+
+type Latest struct {
+	Value string `xml:",chardata"`
+}
+
+func (r *artifactV4Routes) readBlockList(runID, artifactID int64) (*BlockList, error) {
+	blockListName := fmt.Sprintf("tmpv4%d/%d-%d-blocklist", runID, runID, artifactID)
+	s, err := r.fs.Open(blockListName)
+	if err != nil {
+		return nil, err
+	}
+
+	xdec := xml.NewDecoder(s)
+	blockList := &BlockList{}
+	err = xdec.Decode(blockList)
+
+	delerr := r.fs.Delete(blockListName)
+	if delerr != nil {
+		log.Warn("Failed to delete blockList %s: %v", blockListName, delerr)
+	}
+	return blockList, err
+}
+
 func (r *artifactV4Routes) finalizeArtifact(ctx *ArtifactContext) {
 	var req FinalizeArtifactRequest
 
@@ -356,18 +408,34 @@ func (r *artifactV4Routes) finalizeArtifact(ctx *ArtifactContext) {
 		ctx.Error(http.StatusNotFound, "Error artifact not found")
 		return
 	}
-	chunkMap, err := listChunksByRunID(r.fs, runID)
+
+	var chunks []*chunkFileItem
+	blockList, err := r.readBlockList(runID, artifact.ID)
 	if err != nil {
-		log.Error("Error merge chunks: %v", err)
-		ctx.Error(http.StatusInternalServerError, "Error merge chunks")
-		return
-	}
-	chunks, ok := chunkMap[artifact.ID]
-	if !ok {
-		log.Error("Error merge chunks")
-		ctx.Error(http.StatusInternalServerError, "Error merge chunks")
-		return
+		log.Warn("Failed to read BlockList, fallback to old behavior: %v", err)
+		chunkMap, err := listChunksByRunID(r.fs, runID)
+		if err != nil {
+			log.Error("Error merge chunks: %v", err)
+			ctx.Error(http.StatusInternalServerError, "Error merge chunks")
+			return
+		}
+		chunks, ok = chunkMap[artifact.ID]
+		if !ok {
+			log.Error("Error merge chunks")
+			ctx.Error(http.StatusInternalServerError, "Error merge chunks")
+			return
+		}
+	} else {
+		chunks, err = listChunksByRunIDV4(r.fs, runID, artifact.ID, blockList)
+		if err != nil {
+			log.Error("Error merge chunks: %v", err)
+			ctx.Error(http.StatusInternalServerError, "Error merge chunks")
+			return
+		}
+		artifact.FileSize = chunks[len(chunks)-1].End + 1
+		artifact.FileCompressedSize = chunks[len(chunks)-1].End + 1
 	}
+
 	checksum := ""
 	if req.Hash != nil {
 		checksum = req.Hash.Value
@@ -468,7 +536,7 @@ func (r *artifactV4Routes) getSignedArtifactURL(ctx *ArtifactContext) {
 		}
 	}
 	if respData.SignedUrl == "" {
-		respData.SignedUrl = r.buildArtifactURL("DownloadArtifact", artifactName, ctx.ActionTask.ID)
+		respData.SignedUrl = r.buildArtifactURL("DownloadArtifact", artifactName, ctx.ActionTask.ID, artifact.ID)
 	}
 	r.sendProtbufBody(ctx, &respData)
 }
diff --git a/tests/integration/api_actions_artifact_v4_test.go b/tests/integration/api_actions_artifact_v4_test.go
index b2c25a2e70..96668b1ddf 100644
--- a/tests/integration/api_actions_artifact_v4_test.go
+++ b/tests/integration/api_actions_artifact_v4_test.go
@@ -7,12 +7,14 @@ import (
 	"bytes"
 	"crypto/sha256"
 	"encoding/hex"
+	"encoding/xml"
 	"io"
 	"net/http"
 	"strings"
 	"testing"
 	"time"
 
+	"code.gitea.io/gitea/modules/storage"
 	"code.gitea.io/gitea/routers/api/actions"
 	actions_service "code.gitea.io/gitea/services/actions"
 	"code.gitea.io/gitea/tests"
@@ -175,6 +177,134 @@ func TestActionsArtifactV4UploadSingleFileWithRetentionDays(t *testing.T) {
 	assert.True(t, finalizeResp.Ok)
 }
 
+func TestActionsArtifactV4UploadSingleFileWithPotentialHarmfulBlockID(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	token, err := actions_service.CreateAuthorizationToken(48, 792, 193)
+	assert.NoError(t, err)
+
+	// acquire artifact upload url
+	req := NewRequestWithBody(t, "POST", "/twirp/github.actions.results.api.v1.ArtifactService/CreateArtifact", toProtoJSON(&actions.CreateArtifactRequest{
+		Version:                 4,
+		Name:                    "artifactWithPotentialHarmfulBlockID",
+		WorkflowRunBackendId:    "792",
+		WorkflowJobRunBackendId: "193",
+	})).AddTokenAuth(token)
+	resp := MakeRequest(t, req, http.StatusOK)
+	var uploadResp actions.CreateArtifactResponse
+	protojson.Unmarshal(resp.Body.Bytes(), &uploadResp)
+	assert.True(t, uploadResp.Ok)
+	assert.Contains(t, uploadResp.SignedUploadUrl, "/twirp/github.actions.results.api.v1.ArtifactService/UploadArtifact")
+
+	// get upload urls
+	idx := strings.Index(uploadResp.SignedUploadUrl, "/twirp/")
+	url := uploadResp.SignedUploadUrl[idx:] + "&comp=block&blockid=%2f..%2fmyfile"
+	blockListURL := uploadResp.SignedUploadUrl[idx:] + "&comp=blocklist"
+
+	// upload artifact chunk
+	body := strings.Repeat("A", 1024)
+	req = NewRequestWithBody(t, "PUT", url, strings.NewReader(body))
+	MakeRequest(t, req, http.StatusCreated)
+
+	// verify that the exploit didn't work
+	_, err = storage.Actions.Stat("myfile")
+	assert.Error(t, err)
+
+	// upload artifact blockList
+	blockList := &actions.BlockList{
+		Latest: []string{
+			"/../myfile",
+		},
+	}
+	rawBlockList, err := xml.Marshal(blockList)
+	assert.NoError(t, err)
+	req = NewRequestWithBody(t, "PUT", blockListURL, bytes.NewReader(rawBlockList))
+	MakeRequest(t, req, http.StatusCreated)
+
+	t.Logf("Create artifact confirm")
+
+	sha := sha256.Sum256([]byte(body))
+
+	// confirm artifact upload
+	req = NewRequestWithBody(t, "POST", "/twirp/github.actions.results.api.v1.ArtifactService/FinalizeArtifact", toProtoJSON(&actions.FinalizeArtifactRequest{
+		Name:                    "artifactWithPotentialHarmfulBlockID",
+		Size:                    1024,
+		Hash:                    wrapperspb.String("sha256:" + hex.EncodeToString(sha[:])),
+		WorkflowRunBackendId:    "792",
+		WorkflowJobRunBackendId: "193",
+	})).
+		AddTokenAuth(token)
+	resp = MakeRequest(t, req, http.StatusOK)
+	var finalizeResp actions.FinalizeArtifactResponse
+	protojson.Unmarshal(resp.Body.Bytes(), &finalizeResp)
+	assert.True(t, finalizeResp.Ok)
+}
+
+func TestActionsArtifactV4UploadSingleFileWithChunksOutOfOrder(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	token, err := actions_service.CreateAuthorizationToken(48, 792, 193)
+	assert.NoError(t, err)
+
+	// acquire artifact upload url
+	req := NewRequestWithBody(t, "POST", "/twirp/github.actions.results.api.v1.ArtifactService/CreateArtifact", toProtoJSON(&actions.CreateArtifactRequest{
+		Version:                 4,
+		Name:                    "artifactWithChunksOutOfOrder",
+		WorkflowRunBackendId:    "792",
+		WorkflowJobRunBackendId: "193",
+	})).AddTokenAuth(token)
+	resp := MakeRequest(t, req, http.StatusOK)
+	var uploadResp actions.CreateArtifactResponse
+	protojson.Unmarshal(resp.Body.Bytes(), &uploadResp)
+	assert.True(t, uploadResp.Ok)
+	assert.Contains(t, uploadResp.SignedUploadUrl, "/twirp/github.actions.results.api.v1.ArtifactService/UploadArtifact")
+
+	// get upload urls
+	idx := strings.Index(uploadResp.SignedUploadUrl, "/twirp/")
+	block1URL := uploadResp.SignedUploadUrl[idx:] + "&comp=block&blockid=block1"
+	block2URL := uploadResp.SignedUploadUrl[idx:] + "&comp=block&blockid=block2"
+	blockListURL := uploadResp.SignedUploadUrl[idx:] + "&comp=blocklist"
+
+	// upload artifact chunks
+	bodyb := strings.Repeat("B", 1024)
+	req = NewRequestWithBody(t, "PUT", block2URL, strings.NewReader(bodyb))
+	MakeRequest(t, req, http.StatusCreated)
+
+	bodya := strings.Repeat("A", 1024)
+	req = NewRequestWithBody(t, "PUT", block1URL, strings.NewReader(bodya))
+	MakeRequest(t, req, http.StatusCreated)
+
+	// upload artifact blockList
+	blockList := &actions.BlockList{
+		Latest: []string{
+			"block1",
+			"block2",
+		},
+	}
+	rawBlockList, err := xml.Marshal(blockList)
+	assert.NoError(t, err)
+	req = NewRequestWithBody(t, "PUT", blockListURL, bytes.NewReader(rawBlockList))
+	MakeRequest(t, req, http.StatusCreated)
+
+	t.Logf("Create artifact confirm")
+
+	sha := sha256.Sum256([]byte(bodya + bodyb))
+
+	// confirm artifact upload
+	req = NewRequestWithBody(t, "POST", "/twirp/github.actions.results.api.v1.ArtifactService/FinalizeArtifact", toProtoJSON(&actions.FinalizeArtifactRequest{
+		Name:                    "artifactWithChunksOutOfOrder",
+		Size:                    2048,
+		Hash:                    wrapperspb.String("sha256:" + hex.EncodeToString(sha[:])),
+		WorkflowRunBackendId:    "792",
+		WorkflowJobRunBackendId: "193",
+	})).
+		AddTokenAuth(token)
+	resp = MakeRequest(t, req, http.StatusOK)
+	var finalizeResp actions.FinalizeArtifactResponse
+	protojson.Unmarshal(resp.Body.Bytes(), &finalizeResp)
+	assert.True(t, finalizeResp.Ok)
+}
+
 func TestActionsArtifactV4DownloadSingle(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 

From a226064711899da07d6b1455a68ef758f2f3e7e0 Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Sun, 29 Sep 2024 09:58:47 +0200
Subject: [PATCH 054/443] Fix artifact v4 upload above 8MB (#31664) (fix lint
 errors)

---
 tests/integration/api_actions_artifact_v4_test.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/integration/api_actions_artifact_v4_test.go b/tests/integration/api_actions_artifact_v4_test.go
index 96668b1ddf..f55250f6c1 100644
--- a/tests/integration/api_actions_artifact_v4_test.go
+++ b/tests/integration/api_actions_artifact_v4_test.go
@@ -181,7 +181,7 @@ func TestActionsArtifactV4UploadSingleFileWithPotentialHarmfulBlockID(t *testing
 	defer tests.PrepareTestEnv(t)()
 
 	token, err := actions_service.CreateAuthorizationToken(48, 792, 193)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// acquire artifact upload url
 	req := NewRequestWithBody(t, "POST", "/twirp/github.actions.results.api.v1.ArtifactService/CreateArtifact", toProtoJSON(&actions.CreateArtifactRequest{
@@ -208,7 +208,7 @@ func TestActionsArtifactV4UploadSingleFileWithPotentialHarmfulBlockID(t *testing
 
 	// verify that the exploit didn't work
 	_, err = storage.Actions.Stat("myfile")
-	assert.Error(t, err)
+	require.Error(t, err)
 
 	// upload artifact blockList
 	blockList := &actions.BlockList{
@@ -217,7 +217,7 @@ func TestActionsArtifactV4UploadSingleFileWithPotentialHarmfulBlockID(t *testing
 		},
 	}
 	rawBlockList, err := xml.Marshal(blockList)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	req = NewRequestWithBody(t, "PUT", blockListURL, bytes.NewReader(rawBlockList))
 	MakeRequest(t, req, http.StatusCreated)
 
@@ -244,7 +244,7 @@ func TestActionsArtifactV4UploadSingleFileWithChunksOutOfOrder(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 
 	token, err := actions_service.CreateAuthorizationToken(48, 792, 193)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// acquire artifact upload url
 	req := NewRequestWithBody(t, "POST", "/twirp/github.actions.results.api.v1.ArtifactService/CreateArtifact", toProtoJSON(&actions.CreateArtifactRequest{
@@ -282,7 +282,7 @@ func TestActionsArtifactV4UploadSingleFileWithChunksOutOfOrder(t *testing.T) {
 		},
 	}
 	rawBlockList, err := xml.Marshal(blockList)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	req = NewRequestWithBody(t, "PUT", blockListURL, bytes.NewReader(rawBlockList))
 	MakeRequest(t, req, http.StatusCreated)
 

From 1d5f8e5488da48af763a04783376c57e37fa9198 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Sun, 29 Sep 2024 08:03:13 +0000
Subject: [PATCH 055/443] Update dependency vue to v3.5.10

---
 package-lock.json | 108 +++++++++++++++++++++++-----------------------
 package.json      |   2 +-
 2 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b6edb9d5a5..7ba9c262f2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -51,7 +51,7 @@
         "tributejs": "5.1.3",
         "uint8-to-base64": "0.2.0",
         "vanilla-colorful": "0.7.2",
-        "vue": "3.5.8",
+        "vue": "3.5.10",
         "vue-chartjs": "5.3.1",
         "vue-loader": "17.4.2",
         "vue3-calendar-heatmap": "2.0.5",
@@ -5028,39 +5028,39 @@
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.5.8",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.8.tgz",
-      "integrity": "sha512-Uzlxp91EPjfbpeO5KtC0KnXPkuTfGsNDeaKQJxQN718uz+RqDYarEf7UhQJGK+ZYloD2taUbHTI2J4WrUaZQNA==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.10.tgz",
+      "integrity": "sha512-iXWlk+Cg/ag7gLvY0SfVucU8Kh2CjysYZjhhP70w9qI4MvSox4frrP+vDGvtQuzIcgD8+sxM6lZvCtdxGunTAA==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.25.3",
-        "@vue/shared": "3.5.8",
+        "@vue/shared": "3.5.10",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.2.0"
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.5.8",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.8.tgz",
-      "integrity": "sha512-GUNHWvoDSbSa5ZSHT9SnV5WkStWfzJwwTd6NMGzilOE/HM5j+9EB9zGXdtu/fCNEmctBqMs6C9SvVPpVPuk1Eg==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.10.tgz",
+      "integrity": "sha512-DyxHC6qPcktwYGKOIy3XqnHRrrXyWR2u91AjP+nLkADko380srsC2DC3s7Y1Rk6YfOlxOlvEQKa9XXmLI+W4ZA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-core": "3.5.8",
-        "@vue/shared": "3.5.8"
+        "@vue/compiler-core": "3.5.10",
+        "@vue/shared": "3.5.10"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.8",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.8.tgz",
-      "integrity": "sha512-taYpngQtSysrvO9GULaOSwcG5q821zCoIQBtQQSx7Uf7DxpR6CIHR90toPr9QfDD2mqHQPCSgoWBvJu0yV9zjg==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.10.tgz",
+      "integrity": "sha512-to8E1BgpakV7224ZCm8gz1ZRSyjNCAWEplwFMWKlzCdP9DkMKhRRwt0WkCjY7jkzi/Vz3xgbpeig5Pnbly4Tow==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.25.3",
-        "@vue/compiler-core": "3.5.8",
-        "@vue/compiler-dom": "3.5.8",
-        "@vue/compiler-ssr": "3.5.8",
-        "@vue/shared": "3.5.8",
+        "@vue/compiler-core": "3.5.10",
+        "@vue/compiler-dom": "3.5.10",
+        "@vue/compiler-ssr": "3.5.10",
+        "@vue/shared": "3.5.10",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.30.11",
         "postcss": "^8.4.47",
@@ -5077,63 +5077,63 @@
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.8",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.8.tgz",
-      "integrity": "sha512-W96PtryNsNG9u0ZnN5Q5j27Z/feGrFV6zy9q5tzJVyJaLiwYxvC0ek4IXClZygyhjm+XKM7WD9pdKi/wIRVC/Q==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.10.tgz",
+      "integrity": "sha512-hxP4Y3KImqdtyUKXDRSxKSRkSm1H9fCvhojEYrnaoWhE4w/y8vwWhnosJoPPe2AXm5sU7CSbYYAgkt2ZPhDz+A==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.8",
-        "@vue/shared": "3.5.8"
+        "@vue/compiler-dom": "3.5.10",
+        "@vue/shared": "3.5.10"
       }
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.5.8",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.8.tgz",
-      "integrity": "sha512-mlgUyFHLCUZcAYkqvzYnlBRCh0t5ZQfLYit7nukn1GR96gc48Bp4B7OIcSfVSvlG1k3BPfD+p22gi1t2n9tsXg==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.10.tgz",
+      "integrity": "sha512-kW08v06F6xPSHhid9DJ9YjOGmwNDOsJJQk0ax21wKaUYzzuJGEuoKNU2Ujux8FLMrP7CFJJKsHhXN9l2WOVi2g==",
       "license": "MIT",
       "dependencies": {
-        "@vue/shared": "3.5.8"
+        "@vue/shared": "3.5.10"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.5.8",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.8.tgz",
-      "integrity": "sha512-fJuPelh64agZ8vKkZgp5iCkPaEqFJsYzxLk9vSC0X3G8ppknclNDr61gDc45yBGTaN5Xqc1qZWU3/NoaBMHcjQ==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.10.tgz",
+      "integrity": "sha512-9Q86I5Qq3swSkFfzrZ+iqEy7Vla325M7S7xc1NwKnRm/qoi1Dauz0rT6mTMmscqx4qz0EDJ1wjB+A36k7rl8mA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.8",
-        "@vue/shared": "3.5.8"
+        "@vue/reactivity": "3.5.10",
+        "@vue/shared": "3.5.10"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.5.8",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.8.tgz",
-      "integrity": "sha512-DpAUz+PKjTZPUOB6zJgkxVI3GuYc2iWZiNeeHQUw53kdrparSTG6HeXUrYDjaam8dVsCdvQxDz6ZWxnyjccUjQ==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.10.tgz",
+      "integrity": "sha512-t3x7ht5qF8ZRi1H4fZqFzyY2j+GTMTDxRheT+i8M9Ph0oepUxoadmbwlFwMoW7RYCpNQLpP2Yx3feKs+fyBdpA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.8",
-        "@vue/runtime-core": "3.5.8",
-        "@vue/shared": "3.5.8",
+        "@vue/reactivity": "3.5.10",
+        "@vue/runtime-core": "3.5.10",
+        "@vue/shared": "3.5.10",
         "csstype": "^3.1.3"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.5.8",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.8.tgz",
-      "integrity": "sha512-7AmC9/mEeV9mmXNVyUIm1a1AjUhyeeGNbkLh39J00E7iPeGks8OGRB5blJiMmvqSh8SkaS7jkLWSpXtxUCeagA==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.10.tgz",
+      "integrity": "sha512-IVE97tt2kGKwHNq9yVO0xdh1IvYfZCShvDSy46JIh5OQxP1/EXSpoDqetVmyIzL7CYOWnnmMkVqd7YK2QSWkdw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-ssr": "3.5.8",
-        "@vue/shared": "3.5.8"
+        "@vue/compiler-ssr": "3.5.10",
+        "@vue/shared": "3.5.10"
       },
       "peerDependencies": {
-        "vue": "3.5.8"
+        "vue": "3.5.10"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.5.8",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.8.tgz",
-      "integrity": "sha512-mJleSWbAGySd2RJdX1RBtcrUBX6snyOc0qHpgk3lGi4l9/P/3ny3ELqFWqYdkXIwwNN/kdm8nD9ky8o6l/Lx2A==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.10.tgz",
+      "integrity": "sha512-VkkBhU97Ki+XJ0xvl4C9YJsIZ2uIlQ7HqPpZOS3m9VCvmROPaChZU6DexdMJqvz9tbgG+4EtFVrSuailUq5KGQ==",
       "license": "MIT"
     },
     "node_modules/@vue/test-utils": {
@@ -16270,16 +16270,16 @@
       "license": "MIT"
     },
     "node_modules/vue": {
-      "version": "3.5.8",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.8.tgz",
-      "integrity": "sha512-hvuvuCy51nP/1fSRvrrIqTLSvrSyz2Pq+KQ8S8SXCxTWVE0nMaOnSDnSOxV1eYmGfvK7mqiwvd1C59CEEz7dAQ==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.10.tgz",
+      "integrity": "sha512-Vy2kmJwHPlouC/tSnIgXVg03SG+9wSqT1xu1Vehc+ChsXsRd7jLkKgMltVEFOzUdBr3uFwBCG+41LJtfAcBRng==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.8",
-        "@vue/compiler-sfc": "3.5.8",
-        "@vue/runtime-dom": "3.5.8",
-        "@vue/server-renderer": "3.5.8",
-        "@vue/shared": "3.5.8"
+        "@vue/compiler-dom": "3.5.10",
+        "@vue/compiler-sfc": "3.5.10",
+        "@vue/runtime-dom": "3.5.10",
+        "@vue/server-renderer": "3.5.10",
+        "@vue/shared": "3.5.10"
       },
       "peerDependencies": {
         "typescript": "*"
diff --git a/package.json b/package.json
index 24e3bd3eb9..d3d88bfd3f 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "tributejs": "5.1.3",
     "uint8-to-base64": "0.2.0",
     "vanilla-colorful": "0.7.2",
-    "vue": "3.5.8",
+    "vue": "3.5.10",
     "vue-chartjs": "5.3.1",
     "vue-loader": "17.4.2",
     "vue3-calendar-heatmap": "2.0.5",

From ff65d34f03f8596d3981461b0c95dbb684fb51b6 Mon Sep 17 00:00:00 2001
From: cloudchamb3r 
Date: Tue, 24 Sep 2024 02:09:57 +0900
Subject: [PATCH 056/443] Fix Bug in Issue/pulls list (#32081)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix #32080

## After
### for opened issues
Screenshot 2024-09-19 at 6 29 31 PM

### for closed issues
Screenshot 2024-09-19 at 6 29 37 PM

### for all issues
Screenshot 2024-09-20 at 12 07 12 PM

(cherry picked from commit e1f0598c8f5af5ac95f5e13b74fbab99506762db)
---
 routers/web/repo/issue.go                | 1 +
 templates/repo/issue/filter_actions.tmpl | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
index 01fd1e2725..5d13ccc97c 100644
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@@ -476,6 +476,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt
 	ctx.Data["PosterID"] = posterID
 	ctx.Data["IsFuzzy"] = isFuzzy
 	ctx.Data["Keyword"] = keyword
+	ctx.Data["IsShowClosed"] = isShowClosed
 	switch {
 	case isShowClosed.Value():
 		ctx.Data["State"] = "closed"
diff --git a/templates/repo/issue/filter_actions.tmpl b/templates/repo/issue/filter_actions.tmpl
index a341448bcc..58b1ef8ecd 100644
--- a/templates/repo/issue/filter_actions.tmpl
+++ b/templates/repo/issue/filter_actions.tmpl
@@ -1,9 +1,9 @@
 

 	{{if not .Repository.IsArchived}}
 		
-		{{if .IsShowClosed}}
+		{{if and .IsShowClosed.Has .IsShowClosed.Value}}
 			
-		{{else}}
+		{{else if and .IsShowClosed.Has (not .IsShowClosed.Value)}}
 			
 		{{end}}
 		{{if $.IsRepoAdmin}}

From 65b313626181b0e9fa4a763cd750a2df12fb5459 Mon Sep 17 00:00:00 2001
From: Lunny Xiao 
Date: Tue, 24 Sep 2024 09:30:05 +0800
Subject: [PATCH 057/443] Fix panic when cloning with wrong ssh format.
 (#32076)

(cherry picked from commit 3f2d8f873035b614b4cdb447d8e16f5af82cefe8)
---
 cmd/serv.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/cmd/serv.go b/cmd/serv.go
index 0e3006b36b..db67e36fa3 100644
--- a/cmd/serv.go
+++ b/cmd/serv.go
@@ -147,6 +147,12 @@ func runServ(c *cli.Context) error {
 		return nil
 	}
 
+	defer func() {
+		if err := recover(); err != nil {
+			_ = fail(ctx, "Internal Server Error", "Panic: %v\n%s", err, log.Stack(2))
+		}
+	}()
+
 	keys := strings.Split(c.Args().First(), "-")
 	if len(keys) != 2 || keys[0] != "key" {
 		return fail(ctx, "Key ID format error", "Invalid key argument: %s", c.Args().First())
@@ -193,10 +199,7 @@ func runServ(c *cli.Context) error {
 	}
 
 	verb := words[0]
-	repoPath := words[1]
-	if repoPath[0] == '/' {
-		repoPath = repoPath[1:]
-	}
+	repoPath := strings.TrimPrefix(words[1], "/")
 
 	var lfsVerb string
 	if verb == lfsAuthenticateVerb {

From 30b8b45e5e17f709198d58a1d7ea2448728bd9e4 Mon Sep 17 00:00:00 2001
From: Kemal Zebari <60799661+kemzeb@users.noreply.github.com>
Date: Mon, 23 Sep 2024 20:38:08 -0700
Subject: [PATCH 058/443] Truncate commit message during Discord webhook push
 events (#31970)

Resolves #31668.

(cherry picked from commit aadbe0488f454b9f7f5a56765f4530f9d1e2c6ec)
---
 services/webhook/discord.go      | 11 +++++++++--
 services/webhook/discord_test.go | 14 ++++++++++++++
 services/webhook/general_test.go | 10 +++++++++-
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/services/webhook/discord.go b/services/webhook/discord.go
index b342b45690..af1dd79927 100644
--- a/services/webhook/discord.go
+++ b/services/webhook/discord.go
@@ -12,6 +12,7 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
+	"unicode/utf8"
 
 	webhook_model "code.gitea.io/gitea/models/webhook"
 	"code.gitea.io/gitea/modules/git"
@@ -179,8 +180,14 @@ func (d discordConvertor) Push(p *api.PushPayload) (DiscordPayload, error) {
 	var text string
 	// for each commit, generate attachment text
 	for i, commit := range p.Commits {
-		text += fmt.Sprintf("[%s](%s) %s - %s", commit.ID[:7], commit.URL,
-			strings.TrimRight(commit.Message, "\r\n"), commit.Author.Name)
+		// limit the commit message display to just the summary, otherwise it would be hard to read
+		message := strings.TrimRight(strings.SplitN(commit.Message, "\n", 1)[0], "\r")
+
+		// a limit of 50 is set because GitHub does the same
+		if utf8.RuneCountInString(message) > 50 {
+			message = fmt.Sprintf("%.47s...", message)
+		}
+		text += fmt.Sprintf("[%s](%s) %s - %s", commit.ID[:7], commit.URL, message, commit.Author.Name)
 		// add linebreak to each commit but the last
 		if i < len(p.Commits)-1 {
 			text += "\n"
diff --git a/services/webhook/discord_test.go b/services/webhook/discord_test.go
index 73be143f46..cc5ec8a3e0 100644
--- a/services/webhook/discord_test.go
+++ b/services/webhook/discord_test.go
@@ -80,6 +80,20 @@ func TestDiscordPayload(t *testing.T) {
 		assert.Equal(t, p.Sender.AvatarURL, pl.Embeds[0].Author.IconURL)
 	})
 
+	t.Run("PushWithLongCommitMessage", func(t *testing.T) {
+		p := pushTestMultilineCommitMessagePayload()
+
+		pl, err := dc.Push(p)
+		require.NoError(t, err)
+
+		assert.Len(t, pl.Embeds, 1)
+		assert.Equal(t, "[test/repo:test] 2 new commits", pl.Embeds[0].Title)
+		assert.Equal(t, "[2020558](http://localhost:3000/test/repo/commit/2020558fe2e34debb818a514715839cabd25e778) This is a commit summary ⚠️⚠️⚠️⚠️ containing 你好... - user1\n[2020558](http://localhost:3000/test/repo/commit/2020558fe2e34debb818a514715839cabd25e778) This is a commit summary ⚠️⚠️⚠️⚠️ containing 你好... - user1", pl.Embeds[0].Description)
+		assert.Equal(t, p.Sender.UserName, pl.Embeds[0].Author.Name)
+		assert.Equal(t, setting.AppURL+p.Sender.UserName, pl.Embeds[0].Author.URL)
+		assert.Equal(t, p.Sender.AvatarURL, pl.Embeds[0].Author.IconURL)
+	})
+
 	t.Run("Issue", func(t *testing.T) {
 		p := issueTestPayload()
 
diff --git a/services/webhook/general_test.go b/services/webhook/general_test.go
index 5b9bfdc1b2..2d991f8300 100644
--- a/services/webhook/general_test.go
+++ b/services/webhook/general_test.go
@@ -64,9 +64,17 @@ func forkTestPayload() *api.ForkPayload {
 }
 
 func pushTestPayload() *api.PushPayload {
+	return pushTestPayloadWithCommitMessage("commit message")
+}
+
+func pushTestMultilineCommitMessagePayload() *api.PushPayload {
+	return pushTestPayloadWithCommitMessage("This is a commit summary ⚠️⚠️⚠️⚠️ containing 你好 ⚠️⚠️️\n\nThis is the message body.")
+}
+
+func pushTestPayloadWithCommitMessage(message string) *api.PushPayload {
 	commit := &api.PayloadCommit{
 		ID:      "2020558fe2e34debb818a514715839cabd25e778",
-		Message: "commit message",
+		Message: message,
 		URL:     "http://localhost:3000/test/repo/commit/2020558fe2e34debb818a514715839cabd25e778",
 		Author: &api.PayloadUser{
 			Name:     "user1",

From 5ccf79d05c8ba36c8db61d0461ffb238dddd9146 Mon Sep 17 00:00:00 2001
From: Lunny Xiao 
Date: Tue, 24 Sep 2024 15:12:06 +0800
Subject: [PATCH 059/443] Include collaboration repositories on dashboard
 source/forks/mirrors list (#31946)

Fix #13489

In the original implementation, only `All` will display your owned and
collaborated repositories. For other filters like `Source`, `Mirrors`
and etc. will only display your owned repositories.

This PR removed the limitations. Now except `collbrations`, other
filters will always display your owned and collaborated repositories.

(cherry picked from commit 4947bec8360c152daca23e120eae1732d3848492)
---
 web_src/js/components/DashboardRepoList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue
index 69a8ced47d..e5874133b1 100644
--- a/web_src/js/components/DashboardRepoList.vue
+++ b/web_src/js/components/DashboardRepoList.vue
@@ -78,7 +78,6 @@ const sfc = {
     searchURL() {
       return `${this.subUrl}/repo/search?sort=updated&order=desc&uid=${this.uid}&team_id=${this.teamId}&q=${this.searchQuery
       }&page=${this.page}&limit=${this.searchLimit}&mode=${this.repoTypes[this.reposFilter].searchMode
-      }${this.reposFilter !== 'all' ? '&exclusive=1' : ''
       }${this.archivedFilter === 'archived' ? '&archived=true' : ''}${this.archivedFilter === 'unarchived' ? '&archived=false' : ''
       }${this.privateFilter === 'private' ? '&is_private=true' : ''}${this.privateFilter === 'public' ? '&is_private=false' : ''
       }`;

From b496317b5a2aea970bc94ccf6fcde35cd417ec20 Mon Sep 17 00:00:00 2001
From: Lunny Xiao 
Date: Tue, 24 Sep 2024 15:42:08 +0800
Subject: [PATCH 060/443] Fix bug when deleting a migrated branch (#32075)

After migrating a repository with pull request, the branch is missed and
after the pull request merged, the branch cannot be deleted.

(cherry picked from commit 5a8568459d22e57cac506465463660526ca6a08f)

Conflicts:
	services/repository/branch.go
  conflict because of [GITEA] Fix typo in formatting error e71b5a038ecfd80630c98752472c2719b0e9659f
---
 services/repository/branch.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/services/repository/branch.go b/services/repository/branch.go
index 27e50e5ced..f0e7120926 100644
--- a/services/repository/branch.go
+++ b/services/repository/branch.go
@@ -430,13 +430,12 @@ func DeleteBranch(ctx context.Context, doer *user_model.User, repo *repo_model.R
 	}
 
 	rawBranch, err := git_model.GetBranch(ctx, repo.ID, branchName)
-	if err != nil {
+	if err != nil && !git_model.IsErrBranchNotExist(err) {
 		return fmt.Errorf("GetBranch: %v", err)
 	}
 
-	if rawBranch.IsDeleted {
-		return nil
-	}
+	// database branch record not exist or it's a deleted branch
+	notExist := git_model.IsErrBranchNotExist(err) || rawBranch.IsDeleted
 
 	commit, err := gitRepo.GetBranchCommit(branchName)
 	if err != nil {
@@ -444,8 +443,10 @@ func DeleteBranch(ctx context.Context, doer *user_model.User, repo *repo_model.R
 	}
 
 	if err := db.WithTx(ctx, func(ctx context.Context) error {
-		if err := git_model.AddDeletedBranch(ctx, repo.ID, branchName, doer.ID); err != nil {
-			return err
+		if !notExist {
+			if err := git_model.AddDeletedBranch(ctx, repo.ID, branchName, doer.ID); err != nil {
+				return err
+			}
 		}
 
 		return gitRepo.DeleteBranch(branchName, git.DeleteBranchOptions{

From 36af3348bce8a06c0601b3fa80bb1d2231e1bde2 Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Wed, 25 Sep 2024 03:34:08 +0900
Subject: [PATCH 061/443] Fix wrong status of `Set up Job` when first step is
 skipped (#32120)

Fix #32089

(cherry picked from commit 6fa962f409c84477a7a4cf35b4a38a4a93fc3224)
---
 modules/actions/task_state.go      | 51 ++++++++++++++++++------------
 modules/actions/task_state_test.go | 19 +++++++++++
 2 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/modules/actions/task_state.go b/modules/actions/task_state.go
index 31a74be3fd..1f36e021a5 100644
--- a/modules/actions/task_state.go
+++ b/modules/actions/task_state.go
@@ -18,8 +18,32 @@ func FullSteps(task *actions_model.ActionTask) []*actions_model.ActionTaskStep {
 		return fullStepsOfEmptySteps(task)
 	}
 
-	firstStep := task.Steps[0]
+	// firstStep is the first step that has run or running, not include preStep.
+	// For example,
+	// 1. preStep(Success) -> step1(Success) -> step2(Running) -> step3(Waiting) -> postStep(Waiting): firstStep is step1.
+	// 2. preStep(Success) -> step1(Skipped) -> step2(Success) -> postStep(Success): firstStep is step2.
+	// 3. preStep(Success) -> step1(Running) -> step2(Waiting) -> postStep(Waiting): firstStep is step1.
+	// 4. preStep(Success) -> step1(Skipped) -> step2(Skipped) -> postStep(Skipped): firstStep is nil.
+	// 5. preStep(Success) -> step1(Cancelled) -> step2(Cancelled) -> postStep(Cancelled): firstStep is nil.
+	var firstStep *actions_model.ActionTaskStep
+	// lastHasRunStep is the last step that has run.
+	// For example,
+	// 1. preStep(Success) -> step1(Success) -> step2(Running) -> step3(Waiting) -> postStep(Waiting): lastHasRunStep is step1.
+	// 2. preStep(Success) -> step1(Success) -> step2(Success) -> step3(Success) -> postStep(Success): lastHasRunStep is step3.
+	// 3. preStep(Success) -> step1(Success) -> step2(Failure) -> step3 -> postStep(Waiting): lastHasRunStep is step2.
+	// So its Stopped is the Started of postStep when there are no more steps to run.
+	var lastHasRunStep *actions_model.ActionTaskStep
+
 	var logIndex int64
+	for _, step := range task.Steps {
+		if firstStep == nil && (step.Status.HasRun() || step.Status.IsRunning()) {
+			firstStep = step
+		}
+		if step.Status.HasRun() {
+			lastHasRunStep = step
+		}
+		logIndex += step.LogLength
+	}
 
 	preStep := &actions_model.ActionTaskStep{
 		Name:      preStepName,
@@ -28,32 +52,17 @@ func FullSteps(task *actions_model.ActionTask) []*actions_model.ActionTaskStep {
 		Status:    actions_model.StatusRunning,
 	}
 
-	if firstStep.Status.HasRun() || firstStep.Status.IsRunning() {
+	// No step has run or is running, so preStep is equal to the task
+	if firstStep == nil {
+		preStep.Stopped = task.Stopped
+		preStep.Status = task.Status
+	} else {
 		preStep.LogLength = firstStep.LogIndex
 		preStep.Stopped = firstStep.Started
 		preStep.Status = actions_model.StatusSuccess
-	} else if task.Status.IsDone() {
-		preStep.Stopped = task.Stopped
-		preStep.Status = actions_model.StatusFailure
-		if task.Status.IsSkipped() {
-			preStep.Status = actions_model.StatusSkipped
-		}
 	}
 	logIndex += preStep.LogLength
 
-	// lastHasRunStep is the last step that has run.
-	// For example,
-	// 1. preStep(Success) -> step1(Success) -> step2(Running) -> step3(Waiting) -> postStep(Waiting): lastHasRunStep is step1.
-	// 2. preStep(Success) -> step1(Success) -> step2(Success) -> step3(Success) -> postStep(Success): lastHasRunStep is step3.
-	// 3. preStep(Success) -> step1(Success) -> step2(Failure) -> step3 -> postStep(Waiting): lastHasRunStep is step2.
-	// So its Stopped is the Started of postStep when there are no more steps to run.
-	var lastHasRunStep *actions_model.ActionTaskStep
-	for _, step := range task.Steps {
-		if step.Status.HasRun() {
-			lastHasRunStep = step
-		}
-		logIndex += step.LogLength
-	}
 	if lastHasRunStep == nil {
 		lastHasRunStep = preStep
 	}
diff --git a/modules/actions/task_state_test.go b/modules/actions/task_state_test.go
index 28213d781b..ff0fd57195 100644
--- a/modules/actions/task_state_test.go
+++ b/modules/actions/task_state_test.go
@@ -137,6 +137,25 @@ func TestFullSteps(t *testing.T) {
 				{Name: postStepName, Status: actions_model.StatusSkipped, LogIndex: 0, LogLength: 0, Started: 0, Stopped: 0},
 			},
 		},
+		{
+			name: "first step is skipped",
+			task: &actions_model.ActionTask{
+				Steps: []*actions_model.ActionTaskStep{
+					{Status: actions_model.StatusSkipped, LogIndex: 0, LogLength: 0, Started: 0, Stopped: 0},
+					{Status: actions_model.StatusSuccess, LogIndex: 10, LogLength: 80, Started: 10010, Stopped: 10090},
+				},
+				Status:    actions_model.StatusSuccess,
+				Started:   10000,
+				Stopped:   10100,
+				LogLength: 100,
+			},
+			want: []*actions_model.ActionTaskStep{
+				{Name: preStepName, Status: actions_model.StatusSuccess, LogIndex: 0, LogLength: 10, Started: 10000, Stopped: 10010},
+				{Status: actions_model.StatusSkipped, LogIndex: 0, LogLength: 0, Started: 0, Stopped: 0},
+				{Status: actions_model.StatusSuccess, LogIndex: 10, LogLength: 80, Started: 10010, Stopped: 10090},
+				{Name: postStepName, Status: actions_model.StatusSuccess, LogIndex: 90, LogLength: 10, Started: 10090, Stopped: 10100},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

From 8178d6eaba64d05799fd3b62fa889bd13bee07c7 Mon Sep 17 00:00:00 2001
From: Bruno Sofiato 
Date: Sat, 28 Sep 2024 17:13:55 -0300
Subject: [PATCH 062/443] Change the code search to sort results by relevance
 (#32134)

Resolves #32129

Signed-off-by: Bruno Sofiato 
(cherry picked from commit 99d0510cb69c3c53cee05ef0e83ed02389925a90)
---
 modules/indexer/code/bleve/bleve.go                 | 2 ++
 modules/indexer/code/elasticsearch/elasticsearch.go | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/indexer/code/bleve/bleve.go b/modules/indexer/code/bleve/bleve.go
index cf9fcbd8b5..ad854094e5 100644
--- a/modules/indexer/code/bleve/bleve.go
+++ b/modules/indexer/code/bleve/bleve.go
@@ -288,6 +288,8 @@ func (b *Indexer) Search(ctx context.Context, opts *internal.SearchOptions) (int
 		searchRequest.AddFacet("languages", bleve.NewFacetRequest("Language", 10))
 	}
 
+	searchRequest.SortBy([]string{"-_score", "UpdatedAt"})
+
 	result, err := b.inner.Indexer.SearchInContext(ctx, searchRequest)
 	if err != nil {
 		return 0, nil, nil, err
diff --git a/modules/indexer/code/elasticsearch/elasticsearch.go b/modules/indexer/code/elasticsearch/elasticsearch.go
index 0bda180fac..d64d99433d 100644
--- a/modules/indexer/code/elasticsearch/elasticsearch.go
+++ b/modules/indexer/code/elasticsearch/elasticsearch.go
@@ -318,7 +318,8 @@ func (b *Indexer) Search(ctx context.Context, opts *internal.SearchOptions) (int
 					NumOfFragments(0). // return all highting content on fragments
 					HighlighterType("fvh"),
 			).
-			Sort("repo_id", true).
+			Sort("_score", false).
+			Sort("updated_at", true).
 			From(start).Size(pageSize).
 			Do(ctx)
 		if err != nil {
@@ -349,7 +350,8 @@ func (b *Indexer) Search(ctx context.Context, opts *internal.SearchOptions) (int
 				NumOfFragments(0). // return all highting content on fragments
 				HighlighterType("fvh"),
 		).
-		Sort("repo_id", true).
+		Sort("_score", false).
+		Sort("updated_at", true).
 		From(start).Size(pageSize).
 		Do(ctx)
 	if err != nil {

From 19672407f081be9f7af48c952eab74ea1500f738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= 
Date: Sun, 29 Sep 2024 11:10:50 +0200
Subject: [PATCH 063/443] ui(git-grep): adapt the hint per the comments

---
 options/locale/locale_en-US.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 625f85fac3..fd888b2a5b 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -174,7 +174,7 @@ union_tooltip = Include results that match any of the whitespace seperated keywo
 exact = Exact
 exact_tooltip = Include only results that match the exact search term
 regexp = RegExp
-regexp_tooltip = Include results that match the regular expression
+regexp_tooltip = Interpret the search term as a regular expression
 repo_kind = Search repos...
 user_kind = Search users...
 org_kind = Search orgs...

From c9ea78eb1ce316f453aeadb6938ff2bf4b23d816 Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Sun, 29 Sep 2024 11:30:39 +0200
Subject: [PATCH 064/443] chore(release-notes): weekly cherry-pick week 2024-40

---
 release-notes/5416.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 release-notes/5416.md

diff --git a/release-notes/5416.md b/release-notes/5416.md
new file mode 100644
index 0000000000..1368b952ae
--- /dev/null
+++ b/release-notes/5416.md
@@ -0,0 +1,3 @@
+feat: [commit](https://codeberg.org/forgejo/forgejo/commit/8178d6eaba64d05799fd3b62fa889bd13bee07c7) Code search results when using the bleve indexer are sorted by relevance.
+fix: [commit](https://codeberg.org/forgejo/forgejo/commit/b496317b5a2aea970bc94ccf6fcde35cd417ec20) After migrating a repository that contains merged pull requests, the branch is missing and cannot be deleted.
+fix: [commit](https://codeberg.org/forgejo/forgejo/commit/a226064711899da07d6b1455a68ef758f2f3e7e0) Forgejo Actions artifact v4 upload above 8MB.

From a56c000f602424c21d79d9b80495889333baa1c1 Mon Sep 17 00:00:00 2001
From: Otto Richter 
Date: Sun, 15 Sep 2024 02:08:36 +0200
Subject: [PATCH 065/443] Replace setup-go with a custom action

To maximize the caching efficiency, all build jobs are executed as
forgejo user.
Hash is explicitly specified to avoid breaking changes.
---
 .forgejo/workflows/composite/setup-env/action.yaml | 6 +++---
 .forgejo/workflows/testing.yml                     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.forgejo/workflows/composite/setup-env/action.yaml b/.forgejo/workflows/composite/setup-env/action.yaml
index 30e78dbb71..65ffa8341c 100644
--- a/.forgejo/workflows/composite/setup-env/action.yaml
+++ b/.forgejo/workflows/composite/setup-env/action.yaml
@@ -1,11 +1,11 @@
 runs:
   using: "composite"
   steps:
-    - uses: https://code.forgejo.org/actions/setup-go@v4
-      with:
-        go-version-file: "go.mod"
     - name: setup user and permissions
       run: |
         git config --add safe.directory '*'
         adduser --quiet --comment forgejo --disabled-password forgejo
         chown -R forgejo:forgejo .
+    - uses: https://codeberg.org/fnetx/setup-cache-go@b2214eaf6fb44c7e8512c0f462a2c3ec31f86a73
+      with:
+        username: forgejo
diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml
index 8c1e6d06f8..943c3a3c8b 100644
--- a/.forgejo/workflows/testing.yml
+++ b/.forgejo/workflows/testing.yml
@@ -214,5 +214,5 @@ jobs:
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v3
       - uses: ./.forgejo/workflows/composite/setup-env
-      - run: make deps-backend deps-tools
-      - run: make security-check
+      - run: su forgejo -c 'make deps-backend deps-tools'
+      - run: su forgejo -c 'make security-check'

From 1b06287fe330e250fe1c90c67c673aa43c854484 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Mon, 30 Sep 2024 00:08:52 +0000
Subject: [PATCH 066/443] Update renovate to v38.101.1

---
 .forgejo/workflows/renovate.yml | 2 +-
 Makefile                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml
index 400cd453b3..b455403f94 100644
--- a/.forgejo/workflows/renovate.yml
+++ b/.forgejo/workflows/renovate.yml
@@ -23,7 +23,7 @@ jobs:
 
     runs-on: docker
     container:
-      image: code.forgejo.org/forgejo-contrib/renovate:38.93.2
+      image: code.forgejo.org/forgejo-contrib/renovate:38.101.1
 
     steps:
       - name: Load renovate repo cache
diff --git a/Makefile b/Makefile
index a2bfbdc95c..9bed644ba3 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1 # renovate: datasour
 DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.25.0 # renovate: datasource=go
 GOMOCK_PACKAGE ?= go.uber.org/mock/mockgen@v0.4.0 # renovate: datasource=go
 GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.16.2 # renovate: datasource=go
-RENOVATE_NPM_PACKAGE ?= renovate@38.93.2 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate
+RENOVATE_NPM_PACKAGE ?= renovate@38.101.1 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate
 
 ifeq ($(HAS_GO), yes)
 	CGO_EXTRA_CFLAGS := -DSQLITE_MAX_VARIABLE_NUMBER=32766

From 0c993085e0508e03729f1da447ef69b055fd0bca Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Mon, 30 Sep 2024 02:03:35 +0000
Subject: [PATCH 067/443] Lock file maintenance

---
 package-lock.json                  | 368 ++++++++++++++---------------
 web_src/fomantic/package-lock.json |  70 +++---
 2 files changed, 219 insertions(+), 219 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9c4673e3e6..bdb6e26b98 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3661,9 +3661,9 @@
       "license": "MIT"
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.3.tgz",
-      "integrity": "sha512-MmKSfaB9GX+zXl6E8z4koOr/xU63AMVleLEa64v7R0QF/ZloMs5vcD1sHgM64GXXS1csaJutG+ddtzcueI/BLg==",
+      "version": "4.22.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.5.tgz",
+      "integrity": "sha512-SU5cvamg0Eyu/F+kLeMXS7GoahL+OoizlclVFX3l5Ql6yNlywJJ0OuqTzUx0v+aHhPHEB/56CT06GQrRrGNYww==",
       "cpu": [
         "arm"
       ],
@@ -3675,9 +3675,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.3.tgz",
-      "integrity": "sha512-zrt8ecH07PE3sB4jPOggweBjJMzI1JG5xI2DIsUbkA+7K+Gkjys6eV7i9pOenNSDJH3eOr/jLb/PzqtmdwDq5g==",
+      "version": "4.22.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.5.tgz",
+      "integrity": "sha512-S4pit5BP6E5R5C8S6tgU/drvgjtYW76FBuG6+ibG3tMvlD1h9LHVF9KmlmaUBQ8Obou7hEyS+0w+IR/VtxwNMQ==",
       "cpu": [
         "arm64"
       ],
@@ -3689,9 +3689,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.3.tgz",
-      "integrity": "sha512-P0UxIOrKNBFTQaXTxOH4RxuEBVCgEA5UTNV6Yz7z9QHnUJ7eLX9reOd/NYMO3+XZO2cco19mXTxDMXxit4R/eQ==",
+      "version": "4.22.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.5.tgz",
+      "integrity": "sha512-250ZGg4ipTL0TGvLlfACkIxS9+KLtIbn7BCZjsZj88zSg2Lvu3Xdw6dhAhfe/FjjXPVNCtcSp+WZjVsD3a/Zlw==",
       "cpu": [
         "arm64"
       ],
@@ -3703,9 +3703,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.3.tgz",
-      "integrity": "sha512-L1M0vKGO5ASKntqtsFEjTq/fD91vAqnzeaF6sfNAy55aD+Hi2pBI5DKwCO+UNDQHWsDViJLqshxOahXyLSh3EA==",
+      "version": "4.22.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.5.tgz",
+      "integrity": "sha512-D8brJEFg5D+QxFcW6jYANu+Rr9SlKtTenmsX5hOSzNYVrK5oLAEMTUgKWYJP+wdKyCdeSwnapLsn+OVRFycuQg==",
       "cpu": [
         "x64"
       ],
@@ -3717,9 +3717,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.3.tgz",
-      "integrity": "sha512-btVgIsCjuYFKUjopPoWiDqmoUXQDiW2A4C3Mtmp5vACm7/GnyuprqIDPNczeyR5W8rTXEbkmrJux7cJmD99D2g==",
+      "version": "4.22.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.5.tgz",
+      "integrity": "sha512-PNqXYmdNFyWNg0ma5LdY8wP+eQfdvyaBAojAXgO7/gs0Q/6TQJVXAXe8gwW9URjbS0YAammur0fynYGiWsKlXw==",
       "cpu": [
         "arm"
       ],
@@ -3731,9 +3731,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.3.tgz",
-      "integrity": "sha512-zmjbSphplZlau6ZTkxd3+NMtE4UKVy7U4aVFMmHcgO5CUbw17ZP6QCgyxhzGaU/wFFdTfiojjbLG3/0p9HhAqA==",
+      "version": "4.22.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.5.tgz",
+      "integrity": "sha512-kSSCZOKz3HqlrEuwKd9TYv7vxPYD77vHSUvM2y0YaTGnFc8AdI5TTQRrM1yIp3tXCKrSL9A7JLoILjtad5t8pQ==",
       "cpu": [
         "arm"
       ],
@@ -3745,9 +3745,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.3.tgz",
-      "integrity": "sha512-nSZfcZtAnQPRZmUkUQwZq2OjQciR6tEoJaZVFvLHsj0MF6QhNMg0fQ6mUOsiCUpTqxTx0/O6gX0V/nYc7LrgPw==",
+      "version": "4.22.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.5.tgz",
+      "integrity": "sha512-oTXQeJHRbOnwRnRffb6bmqmUugz0glXaPyspp4gbQOPVApdpRrY/j7KP3lr7M8kTfQTyrBUzFjj5EuHAhqH4/w==",
       "cpu": [
         "arm64"
       ],
@@ -3759,9 +3759,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.3.tgz",
-      "integrity": "sha512-MnvSPGO8KJXIMGlQDYfvYS3IosFN2rKsvxRpPO2l2cum+Z3exiExLwVU+GExL96pn8IP+GdH8Tz70EpBhO0sIQ==",
+      "version": "4.22.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.5.tgz",
+      "integrity": "sha512-qnOTIIs6tIGFKCHdhYitgC2XQ2X25InIbZFor5wh+mALH84qnFHvc+vmWUpyX97B0hNvwNUL4B+MB8vJvH65Fw==",
       "cpu": [
         "arm64"
       ],
@@ -3773,9 +3773,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.3.tgz",
-      "integrity": "sha512-+W+p/9QNDr2vE2AXU0qIy0qQE75E8RTwTwgqS2G5CRQ11vzq0tbnfBd6brWhS9bCRjAjepJe2fvvkvS3dno+iw==",
+      "version": "4.22.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.5.tgz",
+      "integrity": "sha512-TMYu+DUdNlgBXING13rHSfUc3Ky5nLPbWs4bFnT+R6Vu3OvXkTkixvvBKk8uO4MT5Ab6lC3U7x8S8El2q5o56w==",
       "cpu": [
         "ppc64"
       ],
@@ -3787,9 +3787,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.3.tgz",
-      "integrity": "sha512-yXH6K6KfqGXaxHrtr+Uoy+JpNlUlI46BKVyonGiaD74ravdnF9BUNC+vV+SIuB96hUMGShhKV693rF9QDfO6nQ==",
+      "version": "4.22.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.5.tgz",
+      "integrity": "sha512-PTQq1Kz22ZRvuhr3uURH+U/Q/a0pbxJoICGSprNLAoBEkyD3Sh9qP5I0Asn0y0wejXQBbsVMRZRxlbGFD9OK4A==",
       "cpu": [
         "riscv64"
       ],
@@ -3801,9 +3801,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.3.tgz",
-      "integrity": "sha512-R8cwY9wcnApN/KDYWTH4gV/ypvy9yZUHlbJvfaiXSB48JO3KpwSpjOGqO4jnGkLDSk1hgjYkTbTt6Q7uvPf8eg==",
+      "version": "4.22.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.5.tgz",
+      "integrity": "sha512-bR5nCojtpuMss6TDEmf/jnBnzlo+6n1UhgwqUvRoe4VIotC7FG1IKkyJbwsT7JDsF2jxR+NTnuOwiGv0hLyDoQ==",
       "cpu": [
         "s390x"
       ],
@@ -3815,9 +3815,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.3.tgz",
-      "integrity": "sha512-kZPbX/NOPh0vhS5sI+dR8L1bU2cSO9FgxwM8r7wHzGydzfSjLRCFAT87GR5U9scj2rhzN3JPYVC7NoBbl4FZ0g==",
+      "version": "4.22.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.5.tgz",
+      "integrity": "sha512-N0jPPhHjGShcB9/XXZQWuWBKZQnC1F36Ce3sDqWpujsGjDz/CQtOL9LgTrJ+rJC8MJeesMWrMWVLKKNR/tMOCA==",
       "cpu": [
         "x64"
       ],
@@ -3829,9 +3829,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.3.tgz",
-      "integrity": "sha512-S0Yq+xA1VEH66uiMNhijsWAafffydd2X5b77eLHfRmfLsRSpbiAWiRHV6DEpz6aOToPsgid7TI9rGd6zB1rhbg==",
+      "version": "4.22.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.5.tgz",
+      "integrity": "sha512-uBa2e28ohzNNwjr6Uxm4XyaA1M/8aTgfF2T7UIlElLaeXkgpmIJ2EitVNQxjO9xLLLy60YqAgKn/AqSpCUkE9g==",
       "cpu": [
         "x64"
       ],
@@ -3843,9 +3843,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.3.tgz",
-      "integrity": "sha512-9isNzeL34yquCPyerog+IMCNxKR8XYmGd0tHSV+OVx0TmE0aJOo9uw4fZfUuk2qxobP5sug6vNdZR6u7Mw7Q+Q==",
+      "version": "4.22.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.5.tgz",
+      "integrity": "sha512-RXT8S1HP8AFN/Kr3tg4fuYrNxZ/pZf1HemC5Tsddc6HzgGnJm0+Lh5rAHJkDuW3StI0ynNXukidROMXYl6ew8w==",
       "cpu": [
         "arm64"
       ],
@@ -3857,9 +3857,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.3.tgz",
-      "integrity": "sha512-nMIdKnfZfzn1Vsk+RuOvl43ONTZXoAPUUxgcU0tXooqg4YrAqzfKzVenqqk2g5efWh46/D28cKFrOzDSW28gTA==",
+      "version": "4.22.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.5.tgz",
+      "integrity": "sha512-ElTYOh50InL8kzyUD6XsnPit7jYCKrphmddKAe1/Ytt74apOxDq5YEcbsiKs0fR3vff3jEneMM+3I7jbqaMyBg==",
       "cpu": [
         "ia32"
       ],
@@ -3871,9 +3871,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.3.tgz",
-      "integrity": "sha512-fOvu7PCQjAj4eWDEuD8Xz5gpzFqXzGlxHZozHP4b9Jxv9APtdxL6STqztDzMLuRXEc4UpXGGhx029Xgm91QBeA==",
+      "version": "4.22.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.5.tgz",
+      "integrity": "sha512-+lvL/4mQxSV8MukpkKyyvfwhH266COcWlXE/1qxwN08ajovta3459zrjLghYMgDerlzNwLAcFpvU+WWE5y6nAQ==",
       "cpu": [
         "x64"
       ],
@@ -4313,9 +4313,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/@stoplight/spectral-rulesets": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.20.1.tgz",
-      "integrity": "sha512-LrJ9lm/Jy9uUrPyBVO03zOkRVRVB2EfzrbtMegTiGs6ju02YGH/0mPu0DKJy+749aKGiSjpXTiLZgsbDJniEew==",
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.20.2.tgz",
+      "integrity": "sha512-7Y8orZuNyGyeHr9n50rMfysgUJ+/zzIEHMptt66jiy82GUWl+0nr865DkMuXdC5GryfDYhtjoRTUCVsXu80Nkg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -4531,9 +4531,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.5.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.5.tgz",
-      "integrity": "sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==",
+      "version": "22.7.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.4.tgz",
+      "integrity": "sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.19.2"
@@ -4570,17 +4570,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.5.0.tgz",
-      "integrity": "sha512-lHS5hvz33iUFQKuPFGheAB84LwcJ60G8vKnEhnfcK1l8kGVLro2SFYW6K0/tj8FUhRJ0VHyg1oAfg50QGbPPHw==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.7.0.tgz",
+      "integrity": "sha512-RIHOoznhA3CCfSTFiB6kBGLQtB/sox+pJ6jeFu6FxJvqL8qRxq/FfGO/UhsGgQM9oGdXkV4xUgli+dt26biB6A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.5.0",
-        "@typescript-eslint/type-utils": "8.5.0",
-        "@typescript-eslint/utils": "8.5.0",
-        "@typescript-eslint/visitor-keys": "8.5.0",
+        "@typescript-eslint/scope-manager": "8.7.0",
+        "@typescript-eslint/type-utils": "8.7.0",
+        "@typescript-eslint/utils": "8.7.0",
+        "@typescript-eslint/visitor-keys": "8.7.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -4604,16 +4604,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.5.0.tgz",
-      "integrity": "sha512-gF77eNv0Xz2UJg/NbpWJ0kqAm35UMsvZf1GHj8D9MRFTj/V3tAciIWXfmPLsAAF/vUlpWPvUDyH1jjsr0cMVWw==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.7.0.tgz",
+      "integrity": "sha512-lN0btVpj2unxHlNYLI//BQ7nzbMJYBVQX5+pbNXvGYazdlgYonMn4AhhHifQ+J4fGRYA/m1DjaQjx+fDetqBOQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.5.0",
-        "@typescript-eslint/types": "8.5.0",
-        "@typescript-eslint/typescript-estree": "8.5.0",
-        "@typescript-eslint/visitor-keys": "8.5.0",
+        "@typescript-eslint/scope-manager": "8.7.0",
+        "@typescript-eslint/types": "8.7.0",
+        "@typescript-eslint/typescript-estree": "8.7.0",
+        "@typescript-eslint/visitor-keys": "8.7.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -4633,14 +4633,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.5.0.tgz",
-      "integrity": "sha512-06JOQ9Qgj33yvBEx6tpC8ecP9o860rsR22hWMEd12WcTRrfaFgHr2RB/CA/B+7BMhHkXT4chg2MyboGdFGawYg==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.7.0.tgz",
+      "integrity": "sha512-87rC0k3ZlDOuz82zzXRtQ7Akv3GKhHs0ti4YcbAJtaomllXoSO8hi7Ix3ccEvCd824dy9aIX+j3d2UMAfCtVpg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.5.0",
-        "@typescript-eslint/visitor-keys": "8.5.0"
+        "@typescript-eslint/types": "8.7.0",
+        "@typescript-eslint/visitor-keys": "8.7.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4651,14 +4651,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.5.0.tgz",
-      "integrity": "sha512-N1K8Ix+lUM+cIDhL2uekVn/ZD7TZW+9/rwz8DclQpcQ9rk4sIL5CAlBC0CugWKREmDjBzI/kQqU4wkg46jWLYA==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.7.0.tgz",
+      "integrity": "sha512-tl0N0Mj3hMSkEYhLkjREp54OSb/FI6qyCzfiiclvJvOqre6hsZTGSnHtmFLDU8TIM62G7ygEa1bI08lcuRwEnQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.5.0",
-        "@typescript-eslint/utils": "8.5.0",
+        "@typescript-eslint/typescript-estree": "8.7.0",
+        "@typescript-eslint/utils": "8.7.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
@@ -4676,9 +4676,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.5.0.tgz",
-      "integrity": "sha512-qjkormnQS5wF9pjSi6q60bKUHH44j2APxfh9TQRXK8wbYVeDYYdYJGIROL87LGZZ2gz3Rbmjc736qyL8deVtdw==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.7.0.tgz",
+      "integrity": "sha512-LLt4BLHFwSfASHSF2K29SZ+ZCsbQOM+LuarPjRUuHm+Qd09hSe3GCeaQbcCr+Mik+0QFRmep/FyZBO6fJ64U3w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4690,14 +4690,14 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.5.0.tgz",
-      "integrity": "sha512-vEG2Sf9P8BPQ+d0pxdfndw3xIXaoSjliG0/Ejk7UggByZPKXmJmw3GW5jV2gHNQNawBUyfahoSiCFVov0Ruf7Q==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.7.0.tgz",
+      "integrity": "sha512-MC8nmcGHsmfAKxwnluTQpNqceniT8SteVwd2voYlmiSWGOtjvGXdPl17dYu2797GVscK30Z04WRM28CrKS9WOg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/types": "8.5.0",
-        "@typescript-eslint/visitor-keys": "8.5.0",
+        "@typescript-eslint/types": "8.7.0",
+        "@typescript-eslint/visitor-keys": "8.7.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -4735,16 +4735,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.5.0.tgz",
-      "integrity": "sha512-6yyGYVL0e+VzGYp60wvkBHiqDWOpT63pdMV2CVG4LVDd5uR6q1qQN/7LafBZtAtNIn/mqXjsSeS5ggv/P0iECw==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.7.0.tgz",
+      "integrity": "sha512-ZbdUdwsl2X/s3CiyAu3gOlfQzpbuG3nTWKPoIvAu1pu5r8viiJvv2NPN2AqArL35NCYtw/lrPPfM4gxrMLNLPw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.5.0",
-        "@typescript-eslint/types": "8.5.0",
-        "@typescript-eslint/typescript-estree": "8.5.0"
+        "@typescript-eslint/scope-manager": "8.7.0",
+        "@typescript-eslint/types": "8.7.0",
+        "@typescript-eslint/typescript-estree": "8.7.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4758,13 +4758,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.5.0.tgz",
-      "integrity": "sha512-yTPqMnbAZJNy2Xq2XU8AdtOW9tJIr+UQb64aXB9f3B1498Zx9JorVgFJcZpEc9UBuCCrdzKID2RGAMkYcDtZOw==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.7.0.tgz",
+      "integrity": "sha512-b1tx0orFCCh/THWPQa2ZwWzvOeyzzp36vkJYOpVg0u8UVOIsfVrnuC9FqAw9gRKn+rG2VmWQ/zDJZzkxUnj/XQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.5.0",
+        "@typescript-eslint/types": "8.7.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -4921,9 +4921,9 @@
       }
     },
     "node_modules/@vitest/mocker/node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
       "dev": true,
       "license": "MIT"
     },
@@ -5538,9 +5538,9 @@
       "license": "Python-2.0"
     },
     "node_modules/aria-query": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.1.tgz",
-      "integrity": "sha512-Z/ZeOgVl7bcSYZ/u/rh0fOpvEpq//LZmdbkXyc7syVzjPAhfOa9ebsdTSjEBDU4vs5nC98Kfduj1uFo0qyET3g==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz",
+      "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -5972,9 +5972,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.23.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
-      "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
+      "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
       "funding": [
         {
           "type": "opencollective",
@@ -5991,8 +5991,8 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001646",
-        "electron-to-chromium": "^1.5.4",
+        "caniuse-lite": "^1.0.30001663",
+        "electron-to-chromium": "^1.5.28",
         "node-releases": "^2.0.18",
         "update-browserslist-db": "^1.1.0"
       },
@@ -6112,9 +6112,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001660",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz",
-      "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==",
+      "version": "1.0.30001664",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz",
+      "integrity": "sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==",
       "funding": [
         {
           "type": "opencollective",
@@ -6384,9 +6384,9 @@
       }
     },
     "node_modules/codemirror": {
-      "version": "5.65.17",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.17.tgz",
-      "integrity": "sha512-1zOsUx3lzAOu/gnMAZkQ9kpIHcPYOc9y1Fbm2UVk5UBPkdq380nhkelG0qUwm1f7wPvTbndu9ZYlug35EwAZRQ==",
+      "version": "5.65.18",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.18.tgz",
+      "integrity": "sha512-Gaz4gHnkbHMGgahNt3CA5HBk5lLQBqmD/pBgeB4kQU6OedZmqMBjlRF0LSrp2tJ4wlLNPm2FfaUd1pDy0mdlpA==",
       "license": "MIT"
     },
     "node_modules/codemirror-spell-checker": {
@@ -7461,9 +7461,9 @@
       }
     },
     "node_modules/dom-input-range": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/dom-input-range/-/dom-input-range-1.1.6.tgz",
-      "integrity": "sha512-4o/SkTpscD0n81BeErrrtmE58lG8vTks++92vk//ld0NmkQTb4AVJ2rexh2yor6rtBf5IMte26u+fF3EgCppPQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/dom-input-range/-/dom-input-range-1.2.0.tgz",
+      "integrity": "sha512-8HVA5Oy5Vt872S7IXsjjp6/5Hqsm5YZLhurxwwQXp80T9qVsj8/mEUH3sQlFujLLUoWfxiaThHHuJ3/q1MHVuA==",
       "license": "MIT",
       "workspaces": [
         "demos"
@@ -7514,9 +7514,9 @@
       }
     },
     "node_modules/dompurify": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.6.tgz",
-      "integrity": "sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.7.tgz",
+      "integrity": "sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==",
       "license": "(MPL-2.0 OR Apache-2.0)"
     },
     "node_modules/domutils": {
@@ -7599,9 +7599,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.23",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.23.tgz",
-      "integrity": "sha512-mBhODedOXg4v5QWwl21DjM5amzjmI1zw9EPrPK/5Wx7C8jt33bpZNrC7OhHUG3pxRtbLpr3W2dXT+Ph1SsfRZA==",
+      "version": "1.5.29",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.29.tgz",
+      "integrity": "sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw==",
       "license": "ISC"
     },
     "node_modules/emoji-regex": {
@@ -8088,9 +8088,9 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.11.0.tgz",
-      "integrity": "sha512-gbBE5Hitek/oG6MUVj6sFuzEjA/ClzNflVrLovHi/JgLdC7fiN5gLAY1WIPW1a0V5I999MnsrvVrCOGmmVqDBQ==",
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
+      "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8129,9 +8129,9 @@
       }
     },
     "node_modules/eslint-plugin-escompat": {
-      "version": "3.11.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-escompat/-/eslint-plugin-escompat-3.11.1.tgz",
-      "integrity": "sha512-j/H70uveM+G9M0onQJOYM+h5trTjQfmBnhGzxAxwGrqARfgXwkfjs+SkvJ1j/a4ofyCIYpBQsGg7q+TowwPNmA==",
+      "version": "3.11.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-escompat/-/eslint-plugin-escompat-3.11.3.tgz",
+      "integrity": "sha512-Gz/eTJzl7fK9SPBkvB3t+xc1iribxRc5Fgu6Z7206b5q1d7kG0t8Drtin8MRY4UgGBg8Zu1HG6RGzR35LCUpLA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8527,9 +8527,9 @@
       }
     },
     "node_modules/eslint-plugin-react": {
-      "version": "7.36.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.36.1.tgz",
-      "integrity": "sha512-/qwbqNXZoq+VP30s1d4Nc1C5GTxjJQjk4Jzs4Wq2qzxFM7dSmuG2UkIjg2USMLh3A/aVcUNrK7v0J5U1XEGGwA==",
+      "version": "7.37.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.0.tgz",
+      "integrity": "sha512-IHBePmfWH5lKhJnJ7WB1V+v/GolbB0rjS8XYVCSQCZKaQCAUhMoVoOEn1Ef8Z8Wf0a7l8KTJvuZg5/e4qrZ6nA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9302,9 +9302,9 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz",
-      "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.1.0.tgz",
+      "integrity": "sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -9394,15 +9394,15 @@
       }
     },
     "node_modules/espree": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz",
-      "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.2.0.tgz",
+      "integrity": "sha512-upbkBJbckcCNBDBDXEbuhjbP68n+scUd3k/U2EkyM9nw+I/jPiL4cLF/Al06CF96wRltFda16sxDFrxsI1v0/g==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "acorn": "^8.12.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.0.0"
+        "eslint-visitor-keys": "^4.1.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -9542,9 +9542,9 @@
       "license": "MIT"
     },
     "node_modules/fast-uri": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz",
-      "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.2.tgz",
+      "integrity": "sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row==",
       "license": "MIT"
     },
     "node_modules/fastest-levenshtein": {
@@ -12585,9 +12585,9 @@
       }
     },
     "node_modules/package-json-from-dist": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
-      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
       "license": "BlueOak-1.0.0"
     },
     "node_modules/package-manager-detector": {
@@ -13983,9 +13983,9 @@
       "license": "Unlicense"
     },
     "node_modules/rollup": {
-      "version": "2.79.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
-      "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
+      "version": "2.79.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz",
+      "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -14388,9 +14388,9 @@
       }
     },
     "node_modules/solid-js": {
-      "version": "1.8.22",
-      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.8.22.tgz",
-      "integrity": "sha512-VBzN5j+9Y4rqIKEnK301aBk+S7fvFSTs9ljg+YEdFxjNjH0hkjXPiQRcws9tE5fUzMznSS6KToL5hwMfHDgpLA==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.9.1.tgz",
+      "integrity": "sha512-Gd6QWRFfO2XKKZqVK4YwbhWZkr0jWw1dYHOt+VYebomeyikGP0SuMflf42XcDuU9HAEYDArFJIYsBNjlE7iZsw==",
       "license": "MIT",
       "dependencies": {
         "csstype": "^3.1.0",
@@ -15315,9 +15315,9 @@
       "license": "ISC"
     },
     "node_modules/terser": {
-      "version": "5.32.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.32.0.tgz",
-      "integrity": "sha512-v3Gtw3IzpBJ0ugkxEX8U0W6+TnPKRRCWGh1jC/iM/e3Ki5+qvO1L1EAZ56bZasc64aXHwRHNIQEzm6//i5cemQ==",
+      "version": "5.34.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.34.1.tgz",
+      "integrity": "sha512-FsJZ7iZLd/BXkz+4xrRTGJ26o/6VTjQytUk8b8OxkwcD2I+79VPJlz7qss1+zE7h8GNIScFqXcDyJ/KqBYZFVA==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
@@ -15897,9 +15897,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
-      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+      "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
       "funding": [
         {
           "type": "opencollective",
@@ -15916,8 +15916,8 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "escalade": "^3.1.2",
-        "picocolors": "^1.0.1"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.0"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -15999,9 +15999,9 @@
       "license": "MIT"
     },
     "node_modules/vite": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.5.tgz",
-      "integrity": "sha512-pXqR0qtb2bTwLkev4SE3r4abCNioP3GkjvIDLlzziPpXtHgiJIjuKl+1GN6ESOT3wMjG3JTeARopj2SwYaHTOA==",
+      "version": "5.4.8",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.8.tgz",
+      "integrity": "sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16088,9 +16088,9 @@
       "license": "BSD-2-Clause"
     },
     "node_modules/vite/node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
       "dev": true,
       "license": "MIT"
     },
@@ -16110,13 +16110,13 @@
       }
     },
     "node_modules/vite/node_modules/rollup": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.3.tgz",
-      "integrity": "sha512-7sqRtBNnEbcBtMeRVc6VRsJMmpI+JU1z9VTvW8D4gXIYQFz0aLcsE6rRkyghZkLfEgUZgVvOG7A5CVz/VW5GIA==",
+      "version": "4.22.5",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.5.tgz",
+      "integrity": "sha512-WoinX7GeQOFMGznEcWA1WrTQCd/tpEbMkc3nuMs9BT0CPjMdSjPMTVClwWd4pgSQwJdP65SK9mTCNvItlr5o7w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.5"
+        "@types/estree": "1.0.6"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -16126,22 +16126,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.21.3",
-        "@rollup/rollup-android-arm64": "4.21.3",
-        "@rollup/rollup-darwin-arm64": "4.21.3",
-        "@rollup/rollup-darwin-x64": "4.21.3",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.21.3",
-        "@rollup/rollup-linux-arm-musleabihf": "4.21.3",
-        "@rollup/rollup-linux-arm64-gnu": "4.21.3",
-        "@rollup/rollup-linux-arm64-musl": "4.21.3",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.21.3",
-        "@rollup/rollup-linux-riscv64-gnu": "4.21.3",
-        "@rollup/rollup-linux-s390x-gnu": "4.21.3",
-        "@rollup/rollup-linux-x64-gnu": "4.21.3",
-        "@rollup/rollup-linux-x64-musl": "4.21.3",
-        "@rollup/rollup-win32-arm64-msvc": "4.21.3",
-        "@rollup/rollup-win32-ia32-msvc": "4.21.3",
-        "@rollup/rollup-win32-x64-msvc": "4.21.3",
+        "@rollup/rollup-android-arm-eabi": "4.22.5",
+        "@rollup/rollup-android-arm64": "4.22.5",
+        "@rollup/rollup-darwin-arm64": "4.22.5",
+        "@rollup/rollup-darwin-x64": "4.22.5",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.22.5",
+        "@rollup/rollup-linux-arm-musleabihf": "4.22.5",
+        "@rollup/rollup-linux-arm64-gnu": "4.22.5",
+        "@rollup/rollup-linux-arm64-musl": "4.22.5",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.22.5",
+        "@rollup/rollup-linux-riscv64-gnu": "4.22.5",
+        "@rollup/rollup-linux-s390x-gnu": "4.22.5",
+        "@rollup/rollup-linux-x64-gnu": "4.22.5",
+        "@rollup/rollup-linux-x64-musl": "4.22.5",
+        "@rollup/rollup-win32-arm64-msvc": "4.22.5",
+        "@rollup/rollup-win32-ia32-msvc": "4.22.5",
+        "@rollup/rollup-win32-x64-msvc": "4.22.5",
         "fsevents": "~2.3.2"
       }
     },
diff --git a/web_src/fomantic/package-lock.json b/web_src/fomantic/package-lock.json
index 2401294105..0b9dc6eaa7 100644
--- a/web_src/fomantic/package-lock.json
+++ b/web_src/fomantic/package-lock.json
@@ -198,9 +198,9 @@
       }
     },
     "node_modules/@octokit/core/node_modules/@octokit/request-error": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.4.tgz",
-      "integrity": "sha512-VpAhIUxwhWZQImo/dWAN/NpPqqojR6PSLgLYAituLM6U+ddx9hCioFGwBr5Mi+oi5CLeJkcAs3gJ0PYYzU6wUg==",
+      "version": "6.1.5",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.5.tgz",
+      "integrity": "sha512-IlBTfGX8Yn/oFPMwSfvugfncK2EwRLjzbrpifNaMY8o/HTEAFqCA1FZxjD9cWvSKBHgrIhc4CSBIzMxiLsbzFQ==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -211,9 +211,9 @@
       }
     },
     "node_modules/@octokit/core/node_modules/@octokit/types": {
-      "version": "13.5.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz",
-      "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==",
+      "version": "13.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.0.tgz",
+      "integrity": "sha512-CrooV/vKCXqwLa+osmHLIMUb87brpgUqlqkPGc6iE2wCkUvTrHiXFMhAKoDDaAAYJrtKtrFTgSQTg5nObBEaew==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -304,9 +304,9 @@
       }
     },
     "node_modules/@octokit/graphql/node_modules/@octokit/request-error": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.4.tgz",
-      "integrity": "sha512-VpAhIUxwhWZQImo/dWAN/NpPqqojR6PSLgLYAituLM6U+ddx9hCioFGwBr5Mi+oi5CLeJkcAs3gJ0PYYzU6wUg==",
+      "version": "6.1.5",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.5.tgz",
+      "integrity": "sha512-IlBTfGX8Yn/oFPMwSfvugfncK2EwRLjzbrpifNaMY8o/HTEAFqCA1FZxjD9cWvSKBHgrIhc4CSBIzMxiLsbzFQ==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -317,9 +317,9 @@
       }
     },
     "node_modules/@octokit/graphql/node_modules/@octokit/types": {
-      "version": "13.5.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz",
-      "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==",
+      "version": "13.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.0.tgz",
+      "integrity": "sha512-CrooV/vKCXqwLa+osmHLIMUb87brpgUqlqkPGc6iE2wCkUvTrHiXFMhAKoDDaAAYJrtKtrFTgSQTg5nObBEaew==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -492,9 +492,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.5.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.5.tgz",
-      "integrity": "sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==",
+      "version": "22.7.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.4.tgz",
+      "integrity": "sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.19.2"
@@ -1115,9 +1115,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.23.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
-      "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
+      "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
       "funding": [
         {
           "type": "opencollective",
@@ -1134,8 +1134,8 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001646",
-        "electron-to-chromium": "^1.5.4",
+        "caniuse-lite": "^1.0.30001663",
+        "electron-to-chromium": "^1.5.28",
         "node-releases": "^2.0.18",
         "update-browserslist-db": "^1.1.0"
       },
@@ -1219,9 +1219,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001660",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz",
-      "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==",
+      "version": "1.0.30001664",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz",
+      "integrity": "sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==",
       "funding": [
         {
           "type": "opencollective",
@@ -1961,9 +1961,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.23",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.23.tgz",
-      "integrity": "sha512-mBhODedOXg4v5QWwl21DjM5amzjmI1zw9EPrPK/5Wx7C8jt33bpZNrC7OhHUG3pxRtbLpr3W2dXT+Ph1SsfRZA==",
+      "version": "1.5.29",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.29.tgz",
+      "integrity": "sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw==",
       "license": "ISC"
     },
     "node_modules/emoji-regex": {
@@ -2618,7 +2618,7 @@
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
       "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2",
+      "deprecated": "Upgrade to fsevents v2 to mitigate potential security issues",
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
@@ -6239,9 +6239,9 @@
       }
     },
     "node_modules/package-json-from-dist": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
-      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
       "license": "BlueOak-1.0.0"
     },
     "node_modules/parse-filepath": {
@@ -8229,9 +8229,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
-      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+      "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
       "funding": [
         {
           "type": "opencollective",
@@ -8248,8 +8248,8 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "escalade": "^3.1.2",
-        "picocolors": "^1.0.1"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.0"
       },
       "bin": {
         "update-browserslist-db": "cli.js"

From 502a6a4461fe47cbc65105dac5e1ed4acfca16e7 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Mon, 30 Sep 2024 12:06:49 +0000
Subject: [PATCH 068/443] Update actions/cache action to v4

---
 .forgejo/workflows/build-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml
index ce05f6d8ff..68e0398241 100644
--- a/.forgejo/workflows/build-release.yml
+++ b/.forgejo/workflows/build-release.yml
@@ -87,7 +87,7 @@ jobs:
 
       - name: cache node_modules
         id: node
-        uses: https://code.forgejo.org/actions/cache@v3
+        uses: https://code.forgejo.org/actions/cache@v4
         with:
           path: |
             node_modules

From 92305933b16c7b5753c616d9270fe7309cded051 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Mon, 30 Sep 2024 12:56:08 +0000
Subject: [PATCH 069/443] Update actions/setup-node action to v4 (forgejo)
 (#5428)

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5428
Reviewed-by: Michael Kriese 
Co-authored-by: Renovate Bot 
Co-committed-by: Renovate Bot 
---
 .forgejo/workflows/build-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml
index ce05f6d8ff..7f5c4467cd 100644
--- a/.forgejo/workflows/build-release.yml
+++ b/.forgejo/workflows/build-release.yml
@@ -37,7 +37,7 @@ jobs:
           repository="${{ github.repository }}"
           echo "value=${repository##*/}" >> "$GITHUB_OUTPUT"
 
-      - uses: https://code.forgejo.org/actions/setup-node@v3
+      - uses: https://code.forgejo.org/actions/setup-node@v4
         with:
           node-version: 20
 

From e3eaa284bb86a3767bff7c601f74e8350b66f6f4 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Mon, 30 Sep 2024 13:08:26 +0000
Subject: [PATCH 070/443] Update actions/checkout action to v4 (forgejo)
 (#5427)

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5427
Reviewed-by: Michael Kriese 
Co-authored-by: Renovate Bot 
Co-committed-by: Renovate Bot 
---
 .forgejo/workflows/build-release-integration.yml |  2 +-
 .forgejo/workflows/build-release.yml             |  2 +-
 .forgejo/workflows/publish-release.yml           |  2 +-
 .../release-notes-assistant-milestones.yml       |  2 +-
 .forgejo/workflows/release-notes-assistant.yml   |  2 +-
 .forgejo/workflows/testing.yml                   | 16 ++++++++--------
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.forgejo/workflows/build-release-integration.yml b/.forgejo/workflows/build-release-integration.yml
index 610b8f0520..f5f0d19da3 100644
--- a/.forgejo/workflows/build-release-integration.yml
+++ b/.forgejo/workflows/build-release-integration.yml
@@ -25,7 +25,7 @@ jobs:
     if: ${{ !startsWith(vars.ROLE, 'forgejo-') }}
     runs-on: self-hosted
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - id: forgejo
         uses: https://code.forgejo.org/actions/setup-forgejo@v1
diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml
index 7f5c4467cd..4b0262a8d0 100644
--- a/.forgejo/workflows/build-release.yml
+++ b/.forgejo/workflows/build-release.yml
@@ -27,7 +27,7 @@ jobs:
     # root is used for testing, allow it
     if: vars.ROLE == 'forgejo-integration' || github.repository_owner == 'root'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/.forgejo/workflows/publish-release.yml b/.forgejo/workflows/publish-release.yml
index 41c884c2d1..5de8785ee1 100644
--- a/.forgejo/workflows/publish-release.yml
+++ b/.forgejo/workflows/publish-release.yml
@@ -39,7 +39,7 @@ jobs:
     runs-on: self-hosted
     if: vars.DOER != '' && vars.FORGEJO != '' && vars.TO_OWNER != '' && vars.FROM_OWNER != '' && secrets.TOKEN != ''
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: copy & sign
         uses: https://code.forgejo.org/forgejo/forgejo-build-publish/publish@v5
diff --git a/.forgejo/workflows/release-notes-assistant-milestones.yml b/.forgejo/workflows/release-notes-assistant-milestones.yml
index fb7bba1d52..dfe9a33a3c 100644
--- a/.forgejo/workflows/release-notes-assistant-milestones.yml
+++ b/.forgejo/workflows/release-notes-assistant-milestones.yml
@@ -11,7 +11,7 @@ jobs:
     container:
       image: 'code.forgejo.org/oci/node:20-bookworm'
     steps:
-      - uses: https://code.forgejo.org/actions/checkout@v3
+      - uses: https://code.forgejo.org/actions/checkout@v4
 
       - uses: https://code.forgejo.org/actions/setup-go@v4
         with:
diff --git a/.forgejo/workflows/release-notes-assistant.yml b/.forgejo/workflows/release-notes-assistant.yml
index dd67b4e203..3fed2d08d4 100644
--- a/.forgejo/workflows/release-notes-assistant.yml
+++ b/.forgejo/workflows/release-notes-assistant.yml
@@ -12,7 +12,7 @@ jobs:
     container:
       image: 'code.forgejo.org/oci/node:20-bookworm'
     steps:
-      - uses: https://code.forgejo.org/actions/checkout@v3
+      - uses: https://code.forgejo.org/actions/checkout@v4
 
       - name: event
         run: |
diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml
index 943c3a3c8b..56f2de5136 100644
--- a/.forgejo/workflows/testing.yml
+++ b/.forgejo/workflows/testing.yml
@@ -19,7 +19,7 @@ jobs:
           cat <<'EOF'
           ${{ toJSON(github) }}
           EOF
-      - uses: https://code.forgejo.org/actions/checkout@v3
+      - uses: https://code.forgejo.org/actions/checkout@v4
       - uses: ./.forgejo/workflows/composite/setup-env
       - run: su forgejo -c 'make deps-backend deps-tools'
       - run: su forgejo -c 'make --always-make -j$(nproc) lint-backend tidy-check swagger-check fmt-check swagger-validate' # ensure the "go-licenses" make target runs
@@ -30,7 +30,7 @@ jobs:
     container:
       image: 'code.forgejo.org/oci/node:20-bookworm'
     steps:
-      - uses: https://code.forgejo.org/actions/checkout@v3
+      - uses: https://code.forgejo.org/actions/checkout@v4
       - run: make deps-frontend
       - run: make lint-frontend
       - run: make checks-frontend
@@ -57,7 +57,7 @@ jobs:
           MINIO_ROOT_USER: 123456
           MINIO_ROOT_PASSWORD: 12345678
     steps:
-      - uses: https://code.forgejo.org/actions/checkout@v3
+      - uses: https://code.forgejo.org/actions/checkout@v4
       - uses: ./.forgejo/workflows/composite/setup-env
       - name: install git >= 2.42
         uses: ./.forgejo/workflows/composite/apt-install-from
@@ -101,7 +101,7 @@ jobs:
         image: ${{ matrix.cacher.image }}
         options: ${{ matrix.cacher.options }}
     steps:
-      - uses: https://code.forgejo.org/actions/checkout@v3
+      - uses: https://code.forgejo.org/actions/checkout@v4
       - uses: ./.forgejo/workflows/composite/setup-env
       - name: install git >= 2.42
         uses: ./.forgejo/workflows/composite/apt-install-from
@@ -132,7 +132,7 @@ jobs:
           #
           MYSQL_EXTRA_FLAGS: --innodb-adaptive-flushing=OFF --innodb-buffer-pool-size=4G --innodb-log-buffer-size=128M --innodb-flush-log-at-trx-commit=0 --innodb-flush-log-at-timeout=30 --innodb-flush-method=nosync --innodb-fsync-threshold=1000000000
     steps:
-      - uses: https://code.forgejo.org/actions/checkout@v3
+      - uses: https://code.forgejo.org/actions/checkout@v4
       - uses: ./.forgejo/workflows/composite/setup-env
       - name: install dependencies & git >= 2.42
         uses: ./.forgejo/workflows/composite/apt-install-from
@@ -164,7 +164,7 @@ jobs:
           POSTGRES_DB: test
           POSTGRES_PASSWORD: postgres
     steps:
-      - uses: https://code.forgejo.org/actions/checkout@v3
+      - uses: https://code.forgejo.org/actions/checkout@v4
       - uses: ./.forgejo/workflows/composite/setup-env
       - name: install dependencies & git >= 2.42
         uses: ./.forgejo/workflows/composite/apt-install-from
@@ -185,7 +185,7 @@ jobs:
     container:
       image: 'code.forgejo.org/oci/node:20-bookworm'
     steps:
-      - uses: https://code.forgejo.org/actions/checkout@v3
+      - uses: https://code.forgejo.org/actions/checkout@v4
       - uses: ./.forgejo/workflows/composite/setup-env
       - name: install dependencies & git >= 2.42
         uses: ./.forgejo/workflows/composite/apt-install-from
@@ -212,7 +212,7 @@ jobs:
     container:
       image: 'code.forgejo.org/oci/node:20-bookworm'
     steps:
-      - uses: https://code.forgejo.org/actions/checkout@v3
+      - uses: https://code.forgejo.org/actions/checkout@v4
       - uses: ./.forgejo/workflows/composite/setup-env
       - run: su forgejo -c 'make deps-backend deps-tools'
       - run: su forgejo -c 'make security-check'

From 0a5fd7fdb89d55e38db4a8bb5c2f0a851b23b592 Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Mon, 30 Sep 2024 14:58:40 +0200
Subject: [PATCH 071/443] fix: referenced sha256:* container images may be
 deleted

The inventory of the sha256:* images and the manifest index that
reference them is incomplete because it does not take into account any
image older than the expiration limit. As a result some sha256:* will
be considered orphaned although they are referenced from a manifest
index that was created more recently than the expiration limit.

There must not be any filtering based on the creation time when
building the inventory. The expiration limit must only be taken into
account when deleting orphaned images: those that are more recent than
the expiration limit must not be deleted.

This limit is specially important because it protects against a race
between a cleanup task and an ongoing mirroring task. A mirroring
task (such as skopeo sync) will first upload sha256:* images and then
create the corresponding manifest index. If a cleanup races against
it, the sha256:* images that are not yet referenced will be deleted
without skopeo noticing and the published index manifest that happens
at a later time will contain references to non-existent images.
---
 .../packages/cleanup/cleanup_sha256_test.go   | 116 ++++++++++++++++++
 services/packages/cleanup/main_test.go        |  14 +++
 services/packages/container/cleanup_sha256.go |  50 +++++---
 3 files changed, 163 insertions(+), 17 deletions(-)
 create mode 100644 services/packages/cleanup/cleanup_sha256_test.go
 create mode 100644 services/packages/cleanup/main_test.go

diff --git a/services/packages/cleanup/cleanup_sha256_test.go b/services/packages/cleanup/cleanup_sha256_test.go
new file mode 100644
index 0000000000..6d7cc47d3e
--- /dev/null
+++ b/services/packages/cleanup/cleanup_sha256_test.go
@@ -0,0 +1,116 @@
+// Copyright 2024 The Forgejo Authors.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package container
+
+import (
+	"testing"
+	"time"
+
+	"code.gitea.io/gitea/models/db"
+	"code.gitea.io/gitea/models/packages"
+	"code.gitea.io/gitea/models/unittest"
+	"code.gitea.io/gitea/modules/json"
+	"code.gitea.io/gitea/modules/log"
+	container_module "code.gitea.io/gitea/modules/packages/container"
+	"code.gitea.io/gitea/modules/test"
+	"code.gitea.io/gitea/modules/timeutil"
+	container_service "code.gitea.io/gitea/services/packages/container"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCleanupSHA256(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+	defer test.MockVariableValue(&container_service.SHA256BatchSize, 1)()
+
+	ctx := db.DefaultContext
+
+	createContainer := func(t *testing.T, name, version, digest string, created timeutil.TimeStamp) {
+		t.Helper()
+
+		ownerID := int64(2001)
+
+		p := packages.Package{
+			OwnerID:   ownerID,
+			LowerName: name,
+			Type:      packages.TypeContainer,
+		}
+		_, err := db.GetEngine(ctx).Insert(&p)
+		// package_version").Where("version = ?", multiTag).Update(&packages_model.PackageVersion{MetadataJSON: `corrupted "manifests":[{ bad`})
+		require.NoError(t, err)
+
+		var metadata string
+		if digest != "" {
+			m := container_module.Metadata{
+				Manifests: []*container_module.Manifest{
+					{
+						Digest: digest,
+					},
+				},
+			}
+			mt, err := json.Marshal(m)
+			require.NoError(t, err)
+			metadata = string(mt)
+		}
+		v := packages.PackageVersion{
+			PackageID:    p.ID,
+			LowerVersion: version,
+			MetadataJSON: metadata,
+			CreatedUnix:  created,
+		}
+		_, err = db.GetEngine(ctx).NoAutoTime().Insert(&v)
+		require.NoError(t, err)
+	}
+
+	cleanupAndCheckLogs := func(t *testing.T, olderThan time.Duration, expected ...string) {
+		t.Helper()
+		logChecker, cleanup := test.NewLogChecker(log.DEFAULT, log.TRACE)
+		logChecker.Filter(expected...)
+		logChecker.StopMark(container_service.SHA256LogFinish)
+		defer cleanup()
+
+		require.NoError(t, CleanupExpiredData(ctx, olderThan))
+
+		logFiltered, logStopped := logChecker.Check(5 * time.Second)
+		assert.True(t, logStopped)
+		filtered := make([]bool, 0, len(expected))
+		for range expected {
+			filtered = append(filtered, true)
+		}
+		assert.EqualValues(t, filtered, logFiltered, expected)
+	}
+
+	ancient := 1 * time.Hour
+
+	t.Run("no packages, cleanup nothing", func(t *testing.T) {
+		cleanupAndCheckLogs(t, ancient, "Nothing to cleanup")
+	})
+
+	orphan := "orphan"
+	createdLongAgo := timeutil.TimeStamp(time.Now().Add(-(ancient * 2)).Unix())
+	createdRecently := timeutil.TimeStamp(time.Now().Add(-(ancient / 2)).Unix())
+
+	t.Run("an orphaned package created a long time ago is removed", func(t *testing.T) {
+		createContainer(t, orphan, "sha256:"+orphan, "", createdLongAgo)
+		cleanupAndCheckLogs(t, ancient, "Removing 1 entries from `package_version`")
+		cleanupAndCheckLogs(t, ancient, "Nothing to cleanup")
+	})
+
+	t.Run("a newly created orphaned package is not cleaned up", func(t *testing.T) {
+		createContainer(t, orphan, "sha256:"+orphan, "", createdRecently)
+		cleanupAndCheckLogs(t, ancient, "1 out of 1 container image(s) are not deleted because they were created less than")
+		cleanupAndCheckLogs(t, 0, "Removing 1 entries from `package_version`")
+		cleanupAndCheckLogs(t, 0, "Nothing to cleanup")
+	})
+
+	t.Run("a referenced package is not removed", func(t *testing.T) {
+		referenced := "referenced"
+		digest := "sha256:" + referenced
+		createContainer(t, referenced, digest, "", createdRecently)
+		index := "index"
+		createContainer(t, index, index, digest, createdRecently)
+		cleanupAndCheckLogs(t, ancient, "Nothing to cleanup")
+	})
+}
diff --git a/services/packages/cleanup/main_test.go b/services/packages/cleanup/main_test.go
new file mode 100644
index 0000000000..ded3d76c83
--- /dev/null
+++ b/services/packages/cleanup/main_test.go
@@ -0,0 +1,14 @@
+// Copyright 2024 The Forgejo Authors.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package container
+
+import (
+	"testing"
+
+	"code.gitea.io/gitea/models/unittest"
+)
+
+func TestMain(m *testing.M) {
+	unittest.MainTest(m)
+}
diff --git a/services/packages/container/cleanup_sha256.go b/services/packages/container/cleanup_sha256.go
index 558aea3a55..16afc74b18 100644
--- a/services/packages/container/cleanup_sha256.go
+++ b/services/packages/container/cleanup_sha256.go
@@ -13,6 +13,7 @@ import (
 	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/log"
 	container_module "code.gitea.io/gitea/modules/packages/container"
+	"code.gitea.io/gitea/modules/timeutil"
 )
 
 var (
@@ -37,18 +38,24 @@ func cleanupSHA256(outerCtx context.Context, olderThan time.Duration) error {
 	defer committer.Close()
 
 	foundAtLeastOneSHA256 := false
-	shaToVersionID := make(map[string]int64, 100)
+	type packageVersion struct {
+		id      int64
+		created timeutil.TimeStamp
+	}
+	shaToPackageVersion := make(map[string]packageVersion, 100)
 	knownSHA := make(map[string]any, 100)
 
+	// compute before making the inventory to not race against ongoing
+	// image creations
+	old := timeutil.TimeStamp(time.Now().Add(-olderThan).Unix())
+
 	log.Debug("Look for all package_version.version that start with sha256:")
 
-	old := time.Now().Add(-olderThan).Unix()
-
 	// Iterate over all container versions in ascending order and store
-	// in shaToVersionID all versions with a sha256: prefix. If an index
+	// in shaToPackageVersion all versions with a sha256: prefix. If an index
 	// manifest is found, the sha256: digest it references are removed
-	// from shaToVersionID. If the sha256: digest found in an index
-	// manifest is not already in shaToVersionID, it is stored in
+	// from shaToPackageVersion. If the sha256: digest found in an index
+	// manifest is not already in shaToPackageVersion, it is stored in
 	// knownSHA to be dealt with later.
 	//
 	// Although it is theoretically possible that a sha256: is uploaded
@@ -56,16 +63,16 @@ func cleanupSHA256(outerCtx context.Context, olderThan time.Duration) error {
 	// normal order of operations. First the sha256: version is uploaded
 	// and then the index manifest. When the iteration completes,
 	// knownSHA will therefore be empty most of the time and
-	// shaToVersionID will only contain unreferenced sha256: versions.
+	// shaToPackageVersion will only contain unreferenced sha256: versions.
 	if err := db.GetEngine(ctx).
-		Select("`package_version`.`id`, `package_version`.`lower_version`, `package_version`.`metadata_json`").
+		Select("`package_version`.`id`, `package_version`.`created_unix`, `package_version`.`lower_version`, `package_version`.`metadata_json`").
 		Join("INNER", "`package`", "`package`.`id` = `package_version`.`package_id`").
-		Where("`package`.`type` = ? AND `package_version`.`created_unix` < ?", packages.TypeContainer, old).
+		Where("`package`.`type` = ?", packages.TypeContainer).
 		OrderBy("`package_version`.`id` ASC").
 		Iterate(new(packages.PackageVersion), func(_ int, bean any) error {
 			v := bean.(*packages.PackageVersion)
 			if strings.HasPrefix(v.LowerVersion, "sha256:") {
-				shaToVersionID[v.LowerVersion] = v.ID
+				shaToPackageVersion[v.LowerVersion] = packageVersion{id: v.ID, created: v.CreatedUnix}
 				foundAtLeastOneSHA256 = true
 			} else if strings.Contains(v.MetadataJSON, `"manifests":[{`) {
 				var metadata container_module.Metadata
@@ -74,8 +81,8 @@ func cleanupSHA256(outerCtx context.Context, olderThan time.Duration) error {
 					return nil
 				}
 				for _, manifest := range metadata.Manifests {
-					if _, ok := shaToVersionID[manifest.Digest]; ok {
-						delete(shaToVersionID, manifest.Digest)
+					if _, ok := shaToPackageVersion[manifest.Digest]; ok {
+						delete(shaToPackageVersion, manifest.Digest)
 					} else {
 						knownSHA[manifest.Digest] = true
 					}
@@ -87,10 +94,10 @@ func cleanupSHA256(outerCtx context.Context, olderThan time.Duration) error {
 	}
 
 	for sha := range knownSHA {
-		delete(shaToVersionID, sha)
+		delete(shaToPackageVersion, sha)
 	}
 
-	if len(shaToVersionID) == 0 {
+	if len(shaToPackageVersion) == 0 {
 		if foundAtLeastOneSHA256 {
 			log.Debug("All container images with a version matching sha256:* are referenced by an index manifest")
 		} else {
@@ -100,15 +107,24 @@ func cleanupSHA256(outerCtx context.Context, olderThan time.Duration) error {
 		return nil
 	}
 
-	found := len(shaToVersionID)
+	found := len(shaToPackageVersion)
 
 	log.Warn("%d container image(s) with a version matching sha256:* are not referenced by an index manifest", found)
 
 	log.Debug("Deleting unreferenced image versions from `package_version`, `package_file` and `package_property` (%d at a time)", SHA256BatchSize)
 
 	packageVersionIDs := make([]int64, 0, SHA256BatchSize)
-	for _, id := range shaToVersionID {
-		packageVersionIDs = append(packageVersionIDs, id)
+	tooYoung := 0
+	for _, p := range shaToPackageVersion {
+		if p.created < old {
+			packageVersionIDs = append(packageVersionIDs, p.id)
+		} else {
+			tooYoung++
+		}
+	}
+
+	if tooYoung > 0 {
+		log.Warn("%d out of %d container image(s) are not deleted because they were created less than %v ago", tooYoung, found, olderThan)
 	}
 
 	for len(packageVersionIDs) > 0 {

From 2099c2af7ca986cec1784f32e9960512466e5efb Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Mon, 30 Sep 2024 18:47:30 +0200
Subject: [PATCH 072/443] chore: remove spurious comment in tests

---
 services/packages/cleanup/cleanup_sha256_test.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/services/packages/cleanup/cleanup_sha256_test.go b/services/packages/cleanup/cleanup_sha256_test.go
index 6d7cc47d3e..41dde28248 100644
--- a/services/packages/cleanup/cleanup_sha256_test.go
+++ b/services/packages/cleanup/cleanup_sha256_test.go
@@ -38,7 +38,6 @@ func TestCleanupSHA256(t *testing.T) {
 			Type:      packages.TypeContainer,
 		}
 		_, err := db.GetEngine(ctx).Insert(&p)
-		// package_version").Where("version = ?", multiTag).Update(&packages_model.PackageVersion{MetadataJSON: `corrupted "manifests":[{ bad`})
 		require.NoError(t, err)
 
 		var metadata string

From 96c4ca249aafd033847e03b8d02027be147c6e62 Mon Sep 17 00:00:00 2001
From: Mai-Lapyst 
Date: Tue, 1 Oct 2024 09:22:43 +0200
Subject: [PATCH 073/443] Fix boolean inputs in workflow_dispatch; closes #5425

---
 routers/web/repo/actions/manual.go   | 6 +++---
 templates/repo/actions/dispatch.tmpl | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/routers/web/repo/actions/manual.go b/routers/web/repo/actions/manual.go
index 86a6014761..949469fa21 100644
--- a/routers/web/repo/actions/manual.go
+++ b/routers/web/repo/actions/manual.go
@@ -1,5 +1,5 @@
-// Copyright The Forgejo Authors.
-// SPDX-License-Identifier: MIT
+// Copyright 2024 The Forgejo Authors.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 package actions
 
@@ -43,7 +43,7 @@ func ManualRunWorkflow(ctx *context_module.Context) {
 
 	formKeyGetter := func(key string) string {
 		formKey := "inputs[" + key + "]"
-		return ctx.FormString(formKey)
+		return ctx.Req.PostFormValue(formKey)
 	}
 
 	if err := workflow.Dispatch(ctx, formKeyGetter, ctx.Repo.Repository, ctx.Doer); err != nil {
diff --git a/templates/repo/actions/dispatch.tmpl b/templates/repo/actions/dispatch.tmpl
index 2372e61ebb..48c2aa5a26 100644
--- a/templates/repo/actions/dispatch.tmpl
+++ b/templates/repo/actions/dispatch.tmpl
@@ -33,7 +33,9 @@
 							{{if eq $val.Type "boolean"}}
 								

 									
-									
+									{{/* These two inputs need to stay in exactly this order (checkbox first, hidden second) or boolean fields wont work correctly! */}}
+									
+									
 								

 							{{else}}
 								

From e28a1e1d38a66b2471094e6c13445c6fceb1d5de Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Tue, 1 Oct 2024 08:05:28 +0000
Subject: [PATCH 074/443] Update dependency eslint-plugin-sonarjs to v2.0.3

---
 package-lock.json | 406 ++++++++++++++++++++++++++--------------------
 package.json      |   2 +-
 2 files changed, 229 insertions(+), 179 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bdb6e26b98..33f665d57c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -78,7 +78,7 @@
         "eslint-plugin-no-use-extend-native": "0.5.0",
         "eslint-plugin-playwright": "1.6.2",
         "eslint-plugin-regexp": "2.6.0",
-        "eslint-plugin-sonarjs": "2.0.2",
+        "eslint-plugin-sonarjs": "2.0.3",
         "eslint-plugin-unicorn": "55.0.0",
         "eslint-plugin-vitest-globals": "1.5.0",
         "eslint-plugin-vue": "9.28.0",
@@ -195,22 +195,22 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.24.3",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.3.tgz",
-      "integrity": "sha512-5FcvN1JHw2sHJChotgx8Ek0lyuh4kCKelgMTTqhYJJtloNvUfpAFMeNQUtdlIaktwrSV9LtCdqwk48wL2wBacQ==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.2",
-        "@babel/generator": "^7.24.1",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.24.1",
-        "@babel/parser": "^7.24.1",
-        "@babel/template": "^7.24.0",
-        "@babel/traverse": "^7.24.1",
-        "@babel/types": "^7.24.0",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.0",
+        "@babel/helper-compilation-targets": "^7.25.2",
+        "@babel/helper-module-transforms": "^7.25.2",
+        "@babel/helpers": "^7.25.0",
+        "@babel/parser": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.2",
+        "@babel/types": "^7.25.2",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -236,9 +236,9 @@
       }
     },
     "node_modules/@babel/eslint-parser": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.24.1.tgz",
-      "integrity": "sha512-d5guuzMlPeDfZIbpQ8+g1NaCNuAGBBGNECh0HVqz1sjOeVLh2CEaifuOysCH18URW6R7pqXINvf5PaR/dC6jLQ==",
+      "version": "7.25.1",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.25.1.tgz",
+      "integrity": "sha512-Y956ghgTT4j7rKesabkh5WeqgSFZVFwaPR0IWFm7KFHFmmJ4afbG49SmfW4S+GyRPx0Dy5jxEWA5t0rpxfElWg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -251,7 +251,7 @@
       },
       "peerDependencies": {
         "@babel/core": "^7.11.0",
-        "eslint": "^7.5.0 || ^8.0.0"
+        "eslint": "^7.5.0 || ^8.0.0 || ^9.0.0"
       }
     },
     "node_modules/@babel/eslint-parser/node_modules/eslint-visitor-keys": {
@@ -713,6 +713,39 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+      "version": "7.25.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz",
+      "integrity": "sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.8",
+        "@babel/traverse": "^7.25.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz",
+      "integrity": "sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.8"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.25.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz",
@@ -765,15 +798,15 @@
       }
     },
     "node_modules/@babel/plugin-proposal-decorators": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.24.1.tgz",
-      "integrity": "sha512-zPEvzFijn+hRvJuX2Vu3KbEBN39LN3f7tW3MQO2LsIs57B26KU+kUc82BdAktS1VCM6libzh45eKGI65lg0cpA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.24.7.tgz",
+      "integrity": "sha512-RL9GR0pUG5Kc8BUWLNDm2T5OpYwSX15r98I0IkgmRQTXuELq/OynH8xtMTMvTJFjXbMWFVTKtYkTaYQsuAwQlQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.1",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-decorators": "^7.24.1"
+        "@babel/helper-create-class-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-decorators": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1313,6 +1346,23 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz",
+      "integrity": "sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.25.0",
+        "@babel/helper-plugin-utils": "^7.24.8"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
     "node_modules/@babel/plugin-transform-dynamic-import": {
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz",
@@ -2010,27 +2060,29 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.24.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.3.tgz",
-      "integrity": "sha512-fSk430k5c2ff8536JcPvPWK4tZDwehWLGlBp0wrsBUjZVdeQV6lePbwKWZaZfK2vnh/1kQX1PzAJWsnBmVgGJA==",
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.4.tgz",
+      "integrity": "sha512-W9Gyo+KmcxjGahtt3t9fb14vFRWvPpu5pT6GBlovAK6BTBcxgjfVMSQCfJl4oi35ODrxP6xx2Wr8LNST57Mraw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.24.1",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-validator-option": "^7.23.5",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.24.1",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.1",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.24.1",
+        "@babel/compat-data": "^7.25.4",
+        "@babel/helper-compilation-targets": "^7.25.2",
+        "@babel/helper-plugin-utils": "^7.24.8",
+        "@babel/helper-validator-option": "^7.24.8",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.3",
+        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.0",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.0",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.0",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.24.1",
-        "@babel/plugin-syntax-import-attributes": "^7.24.1",
+        "@babel/plugin-syntax-import-assertions": "^7.24.7",
+        "@babel/plugin-syntax-import-attributes": "^7.24.7",
         "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
@@ -2042,59 +2094,60 @@
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.24.1",
-        "@babel/plugin-transform-async-generator-functions": "^7.24.3",
-        "@babel/plugin-transform-async-to-generator": "^7.24.1",
-        "@babel/plugin-transform-block-scoped-functions": "^7.24.1",
-        "@babel/plugin-transform-block-scoping": "^7.24.1",
-        "@babel/plugin-transform-class-properties": "^7.24.1",
-        "@babel/plugin-transform-class-static-block": "^7.24.1",
-        "@babel/plugin-transform-classes": "^7.24.1",
-        "@babel/plugin-transform-computed-properties": "^7.24.1",
-        "@babel/plugin-transform-destructuring": "^7.24.1",
-        "@babel/plugin-transform-dotall-regex": "^7.24.1",
-        "@babel/plugin-transform-duplicate-keys": "^7.24.1",
-        "@babel/plugin-transform-dynamic-import": "^7.24.1",
-        "@babel/plugin-transform-exponentiation-operator": "^7.24.1",
-        "@babel/plugin-transform-export-namespace-from": "^7.24.1",
-        "@babel/plugin-transform-for-of": "^7.24.1",
-        "@babel/plugin-transform-function-name": "^7.24.1",
-        "@babel/plugin-transform-json-strings": "^7.24.1",
-        "@babel/plugin-transform-literals": "^7.24.1",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.24.1",
-        "@babel/plugin-transform-member-expression-literals": "^7.24.1",
-        "@babel/plugin-transform-modules-amd": "^7.24.1",
-        "@babel/plugin-transform-modules-commonjs": "^7.24.1",
-        "@babel/plugin-transform-modules-systemjs": "^7.24.1",
-        "@babel/plugin-transform-modules-umd": "^7.24.1",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-        "@babel/plugin-transform-new-target": "^7.24.1",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.1",
-        "@babel/plugin-transform-numeric-separator": "^7.24.1",
-        "@babel/plugin-transform-object-rest-spread": "^7.24.1",
-        "@babel/plugin-transform-object-super": "^7.24.1",
-        "@babel/plugin-transform-optional-catch-binding": "^7.24.1",
-        "@babel/plugin-transform-optional-chaining": "^7.24.1",
-        "@babel/plugin-transform-parameters": "^7.24.1",
-        "@babel/plugin-transform-private-methods": "^7.24.1",
-        "@babel/plugin-transform-private-property-in-object": "^7.24.1",
-        "@babel/plugin-transform-property-literals": "^7.24.1",
-        "@babel/plugin-transform-regenerator": "^7.24.1",
-        "@babel/plugin-transform-reserved-words": "^7.24.1",
-        "@babel/plugin-transform-shorthand-properties": "^7.24.1",
-        "@babel/plugin-transform-spread": "^7.24.1",
-        "@babel/plugin-transform-sticky-regex": "^7.24.1",
-        "@babel/plugin-transform-template-literals": "^7.24.1",
-        "@babel/plugin-transform-typeof-symbol": "^7.24.1",
-        "@babel/plugin-transform-unicode-escapes": "^7.24.1",
-        "@babel/plugin-transform-unicode-property-regex": "^7.24.1",
-        "@babel/plugin-transform-unicode-regex": "^7.24.1",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.24.1",
+        "@babel/plugin-transform-arrow-functions": "^7.24.7",
+        "@babel/plugin-transform-async-generator-functions": "^7.25.4",
+        "@babel/plugin-transform-async-to-generator": "^7.24.7",
+        "@babel/plugin-transform-block-scoped-functions": "^7.24.7",
+        "@babel/plugin-transform-block-scoping": "^7.25.0",
+        "@babel/plugin-transform-class-properties": "^7.25.4",
+        "@babel/plugin-transform-class-static-block": "^7.24.7",
+        "@babel/plugin-transform-classes": "^7.25.4",
+        "@babel/plugin-transform-computed-properties": "^7.24.7",
+        "@babel/plugin-transform-destructuring": "^7.24.8",
+        "@babel/plugin-transform-dotall-regex": "^7.24.7",
+        "@babel/plugin-transform-duplicate-keys": "^7.24.7",
+        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.0",
+        "@babel/plugin-transform-dynamic-import": "^7.24.7",
+        "@babel/plugin-transform-exponentiation-operator": "^7.24.7",
+        "@babel/plugin-transform-export-namespace-from": "^7.24.7",
+        "@babel/plugin-transform-for-of": "^7.24.7",
+        "@babel/plugin-transform-function-name": "^7.25.1",
+        "@babel/plugin-transform-json-strings": "^7.24.7",
+        "@babel/plugin-transform-literals": "^7.25.2",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.24.7",
+        "@babel/plugin-transform-member-expression-literals": "^7.24.7",
+        "@babel/plugin-transform-modules-amd": "^7.24.7",
+        "@babel/plugin-transform-modules-commonjs": "^7.24.8",
+        "@babel/plugin-transform-modules-systemjs": "^7.25.0",
+        "@babel/plugin-transform-modules-umd": "^7.24.7",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7",
+        "@babel/plugin-transform-new-target": "^7.24.7",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7",
+        "@babel/plugin-transform-numeric-separator": "^7.24.7",
+        "@babel/plugin-transform-object-rest-spread": "^7.24.7",
+        "@babel/plugin-transform-object-super": "^7.24.7",
+        "@babel/plugin-transform-optional-catch-binding": "^7.24.7",
+        "@babel/plugin-transform-optional-chaining": "^7.24.8",
+        "@babel/plugin-transform-parameters": "^7.24.7",
+        "@babel/plugin-transform-private-methods": "^7.25.4",
+        "@babel/plugin-transform-private-property-in-object": "^7.24.7",
+        "@babel/plugin-transform-property-literals": "^7.24.7",
+        "@babel/plugin-transform-regenerator": "^7.24.7",
+        "@babel/plugin-transform-reserved-words": "^7.24.7",
+        "@babel/plugin-transform-shorthand-properties": "^7.24.7",
+        "@babel/plugin-transform-spread": "^7.24.7",
+        "@babel/plugin-transform-sticky-regex": "^7.24.7",
+        "@babel/plugin-transform-template-literals": "^7.24.7",
+        "@babel/plugin-transform-typeof-symbol": "^7.24.8",
+        "@babel/plugin-transform-unicode-escapes": "^7.24.7",
+        "@babel/plugin-transform-unicode-property-regex": "^7.24.7",
+        "@babel/plugin-transform-unicode-regex": "^7.24.7",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.25.4",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
         "babel-plugin-polyfill-corejs2": "^0.4.10",
-        "babel-plugin-polyfill-corejs3": "^0.10.4",
+        "babel-plugin-polyfill-corejs3": "^0.10.6",
         "babel-plugin-polyfill-regenerator": "^0.6.1",
-        "core-js-compat": "^3.31.0",
+        "core-js-compat": "^3.37.1",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -2115,15 +2168,15 @@
       }
     },
     "node_modules/@babel/preset-flow": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.24.1.tgz",
-      "integrity": "sha512-sWCV2G9pcqZf+JHyv/RyqEIpFypxdCSxWIxQjpdaQxenNog7cN1pr76hg8u0Fz8Qgg0H4ETkGcJnXL8d4j0PPA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.24.7.tgz",
+      "integrity": "sha512-NL3Lo0NorCU607zU3NwRyJbpaB6E3t0xtd3LfAQKDfkeX4/ggcDXvkmkW42QWT5owUeW/jAe4hn+2qvkV1IbfQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-validator-option": "^7.23.5",
-        "@babel/plugin-transform-flow-strip-types": "^7.24.1"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-validator-option": "^7.24.7",
+        "@babel/plugin-transform-flow-strip-types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2148,18 +2201,18 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.24.1.tgz",
-      "integrity": "sha512-eFa8up2/8cZXLIpkafhaADTXSnl7IsUFCYenRWrARBz0/qZwcT0RBXpys0LJU4+WfPoF2ZG6ew6s2V6izMCwRA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.24.7.tgz",
+      "integrity": "sha512-AAH4lEkpmzFWrGVlHaxJB7RLH21uPQ9+He+eFLWHmF9IuFQVugz8eAsamaW0DXRrTfco5zj1wWtpdcXJUOfsag==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-validator-option": "^7.23.5",
-        "@babel/plugin-transform-react-display-name": "^7.24.1",
-        "@babel/plugin-transform-react-jsx": "^7.23.4",
-        "@babel/plugin-transform-react-jsx-development": "^7.22.5",
-        "@babel/plugin-transform-react-pure-annotations": "^7.24.1"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-validator-option": "^7.24.7",
+        "@babel/plugin-transform-react-display-name": "^7.24.7",
+        "@babel/plugin-transform-react-jsx": "^7.24.7",
+        "@babel/plugin-transform-react-jsx-development": "^7.24.7",
+        "@babel/plugin-transform-react-pure-annotations": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2976,9 +3029,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
-      "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
+      "version": "4.11.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz",
+      "integrity": "sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8560,9 +8613,9 @@
       }
     },
     "node_modules/eslint-plugin-react-hooks": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
-      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
+      "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8660,33 +8713,33 @@
       }
     },
     "node_modules/eslint-plugin-sonarjs": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-sonarjs/-/eslint-plugin-sonarjs-2.0.2.tgz",
-      "integrity": "sha512-0JUYTlUDk/up3mS0rFP9vHCRvhIYNTy06m99IPFeyMDUWL8u0ebz+nFPYn6OWDBTIEfbvQ/Xe0PdjWO8w0WD0Q==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-sonarjs/-/eslint-plugin-sonarjs-2.0.3.tgz",
+      "integrity": "sha512-Xsy+x5xNxc/h+M/B2s8XMPoKw0o4gUL0cqT8gl6SiEtA6qKX6/SlOjj4Avp7bT7UIguHbjKv/RACy3AxIGOvwA==",
       "dev": true,
       "license": "LGPL-3.0-only",
       "dependencies": {
-        "@babel/core": "7.24.3",
-        "@babel/eslint-parser": "7.24.1",
-        "@babel/plugin-proposal-decorators": "7.24.1",
-        "@babel/preset-env": "7.24.3",
-        "@babel/preset-flow": "7.24.1",
-        "@babel/preset-react": "7.24.1",
-        "@eslint-community/regexpp": "4.10.0",
+        "@babel/core": "7.25.2",
+        "@babel/eslint-parser": "7.25.1",
+        "@babel/plugin-proposal-decorators": "7.24.7",
+        "@babel/preset-env": "7.25.4",
+        "@babel/preset-flow": "7.24.7",
+        "@babel/preset-react": "7.24.7",
+        "@eslint-community/regexpp": "4.11.1",
         "@typescript-eslint/eslint-plugin": "7.16.1",
         "@typescript-eslint/utils": "^7.16.1",
         "builtin-modules": "3.3.0",
         "bytes": "3.1.2",
-        "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-jsx-a11y": "^6.8.0",
-        "eslint-plugin-react": "^7.35.0",
-        "eslint-plugin-react-hooks": "4.6.0",
-        "eslint-scope": "8.0.1",
+        "eslint-plugin-import": "^2.30.0",
+        "eslint-plugin-jsx-a11y": "^6.10.0",
+        "eslint-plugin-react": "^7.36.1",
+        "eslint-plugin-react-hooks": "4.6.2",
+        "eslint-scope": "8.0.2",
         "functional-red-black-tree": "1.0.1",
         "jsx-ast-utils": "^3.3.5",
-        "minimatch": "^9.0.3",
+        "minimatch": "^10.0.1",
         "scslre": "0.3.0",
-        "semver": "7.6.0",
+        "semver": "7.6.3",
         "typescript": "*",
         "vue-eslint-parser": "9.4.3"
       },
@@ -8899,6 +8952,22 @@
         }
       }
     },
+    "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/type-utils/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/types": {
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
@@ -8963,6 +9032,23 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "peer": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/utils": {
       "version": "7.16.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.16.1.tgz",
@@ -9029,6 +9115,22 @@
         }
       }
     },
+    "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/utils/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/visitor-keys": {
       "version": "7.16.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.16.1.tgz",
@@ -9062,9 +9164,9 @@
       }
     },
     "node_modules/eslint-plugin-sonarjs/node_modules/eslint-scope": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.1.tgz",
-      "integrity": "sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz",
+      "integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -9091,58 +9193,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint-plugin-sonarjs/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint-plugin-sonarjs/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/eslint-plugin-sonarjs/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint-plugin-sonarjs/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/eslint-plugin-unicorn": {
       "version": "55.0.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-55.0.0.tgz",
diff --git a/package.json b/package.json
index ec2ca78119..10d56f55a5 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     "eslint-plugin-no-use-extend-native": "0.5.0",
     "eslint-plugin-playwright": "1.6.2",
     "eslint-plugin-regexp": "2.6.0",
-    "eslint-plugin-sonarjs": "2.0.2",
+    "eslint-plugin-sonarjs": "2.0.3",
     "eslint-plugin-unicorn": "55.0.0",
     "eslint-plugin-vitest-globals": "1.5.0",
     "eslint-plugin-vue": "9.28.0",

From f79d2fba07f95c0c0d18b66c54c4a0124c3310d1 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Tue, 1 Oct 2024 10:02:11 +0000
Subject: [PATCH 075/443] Update ghcr.io/devcontainers/features/git-lfs Docker
 tag to v1.2.3

---
 .devcontainer/devcontainer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index da649017ae..4549974afd 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,7 +6,7 @@
     "ghcr.io/devcontainers/features/node:1": {
       "version": "20"
     },
-    "ghcr.io/devcontainers/features/git-lfs:1.2.1": {},
+    "ghcr.io/devcontainers/features/git-lfs:1.2.3": {},
     "ghcr.io/devcontainers-contrib/features/poetry:2": {},
     "ghcr.io/devcontainers/features/python:1": {
       "version": "3.12"

From be373e948e9935db189c0010bc33755a012f3a9a Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Tue, 1 Oct 2024 10:02:16 +0000
Subject: [PATCH 076/443] Update actions/setup-go action to v5

---
 .forgejo/workflows/build-release.yml                      | 2 +-
 .forgejo/workflows/e2e.yml                                | 2 +-
 .forgejo/workflows/publish-release.yml                    | 2 +-
 .forgejo/workflows/release-notes-assistant-milestones.yml | 2 +-
 .forgejo/workflows/release-notes-assistant.yml            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml
index a132242ad0..4c2905ba4f 100644
--- a/.forgejo/workflows/build-release.yml
+++ b/.forgejo/workflows/build-release.yml
@@ -41,7 +41,7 @@ jobs:
         with:
           node-version: 20
 
-      - uses: https://code.forgejo.org/actions/setup-go@v4
+      - uses: https://code.forgejo.org/actions/setup-go@v5
         with:
           go-version-file: "go.mod"
 
diff --git a/.forgejo/workflows/e2e.yml b/.forgejo/workflows/e2e.yml
index 9f2fbb0fa2..7e27765513 100644
--- a/.forgejo/workflows/e2e.yml
+++ b/.forgejo/workflows/e2e.yml
@@ -20,7 +20,7 @@ jobs:
       image: 'code.forgejo.org/oci/playwright:latest'
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v4
-      - uses: https://code.forgejo.org/actions/setup-go@v4
+      - uses: https://code.forgejo.org/actions/setup-go@v5
         with:
           go-version-file: "go.mod"
       - run: |
diff --git a/.forgejo/workflows/publish-release.yml b/.forgejo/workflows/publish-release.yml
index 5de8785ee1..f8cfdafb59 100644
--- a/.forgejo/workflows/publish-release.yml
+++ b/.forgejo/workflows/publish-release.yml
@@ -72,7 +72,7 @@ jobs:
 
       - name: set up go for the DNS update below
         if: vars.ROLE == 'forgejo-experimental' && secrets.OVH_APP_KEY != ''
-        uses: https://code.forgejo.org/actions/setup-go@v4
+        uses: https://code.forgejo.org/actions/setup-go@v5
         with:
           go-version-file: "go.mod"
       - name: update the _release.experimental DNS record
diff --git a/.forgejo/workflows/release-notes-assistant-milestones.yml b/.forgejo/workflows/release-notes-assistant-milestones.yml
index dfe9a33a3c..f2dfc807f5 100644
--- a/.forgejo/workflows/release-notes-assistant-milestones.yml
+++ b/.forgejo/workflows/release-notes-assistant-milestones.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v4
 
-      - uses: https://code.forgejo.org/actions/setup-go@v4
+      - uses: https://code.forgejo.org/actions/setup-go@v5
         with:
           go-version-file: "go.mod"
           cache: false
diff --git a/.forgejo/workflows/release-notes-assistant.yml b/.forgejo/workflows/release-notes-assistant.yml
index 3fed2d08d4..89ec2293e2 100644
--- a/.forgejo/workflows/release-notes-assistant.yml
+++ b/.forgejo/workflows/release-notes-assistant.yml
@@ -23,7 +23,7 @@ jobs:
           ${{ toJSON(github.event) }}
           EOF
 
-      - uses: https://code.forgejo.org/actions/setup-go@v4
+      - uses: https://code.forgejo.org/actions/setup-go@v5
         with:
           go-version-file: "go.mod"
           cache: false

From e6b84f91916f91adfa136277a1e4b2beb6af01ba Mon Sep 17 00:00:00 2001
From: Otto Richter 
Date: Mon, 30 Sep 2024 02:06:28 +0200
Subject: [PATCH 077/443] ci: move composite workflow location

otherwise, they unfortunately display in the Forgejo UI with an error message
---
 .../apt-install-from/action.yaml              |  0
 .../build-backend/action.yaml                 |  0
 .../setup-env/action.yaml                     |  0
 .forgejo/workflows/testing.yml                | 36 +++++++++----------
 4 files changed, 18 insertions(+), 18 deletions(-)
 rename .forgejo/{workflows/composite => workflows-composite}/apt-install-from/action.yaml (100%)
 rename .forgejo/{workflows/composite => workflows-composite}/build-backend/action.yaml (100%)
 rename .forgejo/{workflows/composite => workflows-composite}/setup-env/action.yaml (100%)

diff --git a/.forgejo/workflows/composite/apt-install-from/action.yaml b/.forgejo/workflows-composite/apt-install-from/action.yaml
similarity index 100%
rename from .forgejo/workflows/composite/apt-install-from/action.yaml
rename to .forgejo/workflows-composite/apt-install-from/action.yaml
diff --git a/.forgejo/workflows/composite/build-backend/action.yaml b/.forgejo/workflows-composite/build-backend/action.yaml
similarity index 100%
rename from .forgejo/workflows/composite/build-backend/action.yaml
rename to .forgejo/workflows-composite/build-backend/action.yaml
diff --git a/.forgejo/workflows/composite/setup-env/action.yaml b/.forgejo/workflows-composite/setup-env/action.yaml
similarity index 100%
rename from .forgejo/workflows/composite/setup-env/action.yaml
rename to .forgejo/workflows-composite/setup-env/action.yaml
diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml
index 56f2de5136..960f3d716e 100644
--- a/.forgejo/workflows/testing.yml
+++ b/.forgejo/workflows/testing.yml
@@ -20,10 +20,10 @@ jobs:
           ${{ toJSON(github) }}
           EOF
       - uses: https://code.forgejo.org/actions/checkout@v4
-      - uses: ./.forgejo/workflows/composite/setup-env
+      - uses: ./.forgejo/workflows-composite/setup-env
       - run: su forgejo -c 'make deps-backend deps-tools'
       - run: su forgejo -c 'make --always-make -j$(nproc) lint-backend tidy-check swagger-check fmt-check swagger-validate' # ensure the "go-licenses" make target runs
-      - uses: ./.forgejo/workflows/composite/build-backend
+      - uses: ./.forgejo/workflows-composite/build-backend
   frontend-checks:
     if: ${{ !startsWith(vars.ROLE, 'forgejo-') }}
     runs-on: docker
@@ -58,16 +58,16 @@ jobs:
           MINIO_ROOT_PASSWORD: 12345678
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v4
-      - uses: ./.forgejo/workflows/composite/setup-env
+      - uses: ./.forgejo/workflows-composite/setup-env
       - name: install git >= 2.42
-        uses: ./.forgejo/workflows/composite/apt-install-from
+        uses: ./.forgejo/workflows-composite/apt-install-from
         with:
           packages: git
       - name: test release-notes-assistant.sh
         run: |
           apt-get -q install -qq -y jq
           ./release-notes-assistant.sh test_main
-      - uses: ./.forgejo/workflows/composite/build-backend
+      - uses: ./.forgejo/workflows-composite/build-backend
       - run: |
           su forgejo -c 'make test-backend test-check'
         timeout-minutes: 50
@@ -102,12 +102,12 @@ jobs:
         options: ${{ matrix.cacher.options }}
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v4
-      - uses: ./.forgejo/workflows/composite/setup-env
+      - uses: ./.forgejo/workflows-composite/setup-env
       - name: install git >= 2.42
-        uses: ./.forgejo/workflows/composite/apt-install-from
+        uses: ./.forgejo/workflows-composite/apt-install-from
         with:
           packages: git
-      - uses: ./.forgejo/workflows/composite/build-backend
+      - uses: ./.forgejo/workflows-composite/build-backend
       - run: |
           su forgejo -c 'make test-remote-cacher test-check'
         timeout-minutes: 50
@@ -133,12 +133,12 @@ jobs:
           MYSQL_EXTRA_FLAGS: --innodb-adaptive-flushing=OFF --innodb-buffer-pool-size=4G --innodb-log-buffer-size=128M --innodb-flush-log-at-trx-commit=0 --innodb-flush-log-at-timeout=30 --innodb-flush-method=nosync --innodb-fsync-threshold=1000000000
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v4
-      - uses: ./.forgejo/workflows/composite/setup-env
+      - uses: ./.forgejo/workflows-composite/setup-env
       - name: install dependencies & git >= 2.42
-        uses: ./.forgejo/workflows/composite/apt-install-from
+        uses: ./.forgejo/workflows-composite/apt-install-from
         with:
           packages: git git-lfs
-      - uses: ./.forgejo/workflows/composite/build-backend
+      - uses: ./.forgejo/workflows-composite/build-backend
       - run: |
           su forgejo -c 'make test-mysql-migration test-mysql'
         timeout-minutes: 50
@@ -165,12 +165,12 @@ jobs:
           POSTGRES_PASSWORD: postgres
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v4
-      - uses: ./.forgejo/workflows/composite/setup-env
+      - uses: ./.forgejo/workflows-composite/setup-env
       - name: install dependencies & git >= 2.42
-        uses: ./.forgejo/workflows/composite/apt-install-from
+        uses: ./.forgejo/workflows-composite/apt-install-from
         with:
           packages: git git-lfs
-      - uses: ./.forgejo/workflows/composite/build-backend
+      - uses: ./.forgejo/workflows-composite/build-backend
       - run: |
           su forgejo -c 'make test-pgsql-migration test-pgsql'
         timeout-minutes: 50
@@ -186,12 +186,12 @@ jobs:
       image: 'code.forgejo.org/oci/node:20-bookworm'
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v4
-      - uses: ./.forgejo/workflows/composite/setup-env
+      - uses: ./.forgejo/workflows-composite/setup-env
       - name: install dependencies & git >= 2.42
-        uses: ./.forgejo/workflows/composite/apt-install-from
+        uses: ./.forgejo/workflows-composite/apt-install-from
         with:
           packages: git git-lfs
-      - uses: ./.forgejo/workflows/composite/build-backend
+      - uses: ./.forgejo/workflows-composite/build-backend
       - run: |
           su forgejo -c 'make test-sqlite-migration test-sqlite'
         timeout-minutes: 50
@@ -213,6 +213,6 @@ jobs:
       image: 'code.forgejo.org/oci/node:20-bookworm'
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v4
-      - uses: ./.forgejo/workflows/composite/setup-env
+      - uses: ./.forgejo/workflows-composite/setup-env
       - run: su forgejo -c 'make deps-backend deps-tools'
       - run: su forgejo -c 'make security-check'

From 08b1c609bc6284fd138650f81e4add8ccd3f7190 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Tue, 1 Oct 2024 18:05:54 +0000
Subject: [PATCH 078/443] Update dependency go to v1.23.2

---
 .forgejo/testdata/build-release/go.mod | 2 +-
 go.mod                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.forgejo/testdata/build-release/go.mod b/.forgejo/testdata/build-release/go.mod
index 697bc87b98..1c442048b6 100644
--- a/.forgejo/testdata/build-release/go.mod
+++ b/.forgejo/testdata/build-release/go.mod
@@ -1,3 +1,3 @@
 module code.gitea.io/gitea
 
-go 1.23.1
+go 1.23.2
diff --git a/go.mod b/go.mod
index 55d70febc0..36eeb8a96c 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module code.gitea.io/gitea
 
-go 1.23.1
+go 1.23.2
 
 require (
 	code.forgejo.org/f3/gof3/v3 v3.7.0

From 84e77c41fa1c7f244260691bd6e2a2e40c11f45f Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Thu, 12 Sep 2024 15:21:04 +0200
Subject: [PATCH 079/443] [FEAT] Don't allow modification to internal reference

- This a port of https://github.com/go-gitea/gitea/pull/31931 in a
behavior-sense. None of the code was actually ported.
- Follow up for #2834, now also don't allow modification.
- Integration test added.
- Unit test modified.
---
 cmd/hook.go                   | 3 ++-
 cmd/hook_test.go              | 9 ++++++++-
 tests/integration/git_test.go | 5 +++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/cmd/hook.go b/cmd/hook.go
index edab611972..93dfd9d648 100644
--- a/cmd/hook.go
+++ b/cmd/hook.go
@@ -322,7 +322,8 @@ func runHookUpdate(c *cli.Context) error {
 		return fail(ctx, fmt.Sprintf("The deletion of %s is skipped as it's an internal reference.", refFullName), "")
 	}
 
-	return nil
+	// If the new comment isn't empty it means modification.
+	return fail(ctx, fmt.Sprintf("The modification of %s is skipped as it's an internal reference.", refFullName), "")
 }
 
 func runHookPostReceive(c *cli.Context) error {
diff --git a/cmd/hook_test.go b/cmd/hook_test.go
index 514eb917e1..1f0ee7087b 100644
--- a/cmd/hook_test.go
+++ b/cmd/hook_test.go
@@ -180,8 +180,15 @@ func TestRunHookUpdate(t *testing.T) {
 	})
 
 	t.Run("Update of internal reference", func(t *testing.T) {
+		defer test.MockVariableValue(&cli.OsExiter, func(code int) {})()
+		defer test.MockVariableValue(&setting.IsProd, false)()
+		finish := captureOutput(t, os.Stderr)
+
 		err := app.Run([]string{"./forgejo", "update", "refs/pull/1/head", "0a51ae26bc73c47e2f754560c40904cf14ed51a9", "0000000000000000000000000000000000000001"})
-		require.NoError(t, err)
+		out := finish()
+		require.Error(t, err)
+
+		assert.Contains(t, out, "The modification of refs/pull/1/head is skipped as it's an internal reference.")
 	})
 
 	t.Run("Removal of branch", func(t *testing.T) {
diff --git a/tests/integration/git_test.go b/tests/integration/git_test.go
index 2c46fdde68..b5afdd78c4 100644
--- a/tests/integration/git_test.go
+++ b/tests/integration/git_test.go
@@ -764,6 +764,11 @@ func doInternalReferences(ctx *APITestContext, dstPath string) func(t *testing.T
 		require.Error(t, gitErr)
 		assert.Contains(t, stdErr, fmt.Sprintf("remote: Forgejo: The deletion of refs/pull/%d/head is skipped as it's an internal reference.", pr1.Index))
 		assert.Contains(t, stdErr, fmt.Sprintf("[remote rejected] refs/pull/%d/head (hook declined)", pr1.Index))
+
+		_, stdErr, gitErr = git.NewCommand(git.DefaultContext, "push", "origin", "--force").AddDynamicArguments(fmt.Sprintf("HEAD~1:refs/pull/%d/head", pr1.Index)).RunStdString(&git.RunOpts{Dir: dstPath})
+		require.Error(t, gitErr)
+		assert.Contains(t, stdErr, fmt.Sprintf("remote: Forgejo: The modification of refs/pull/%d/head is skipped as it's an internal reference.", pr1.Index))
+		assert.Contains(t, stdErr, fmt.Sprintf("[remote rejected] HEAD~1 -> refs/pull/%d/head (hook declined)", pr1.Index))
 	}
 }
 

From 2bd9a253ed3b75ba13d04885d672f8718c8dfe46 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Thu, 3 Oct 2024 00:03:02 +0000
Subject: [PATCH 080/443] Update module github.com/caddyserver/certmagic to
 v0.21.4

---
 go.mod | 10 +++++-----
 go.sum | 21 ++++++++++-----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/go.mod b/go.mod
index 55d70febc0..af93452307 100644
--- a/go.mod
+++ b/go.mod
@@ -25,7 +25,7 @@ require (
 	github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb
 	github.com/blevesearch/bleve/v2 v2.4.2
 	github.com/buildkite/terminal-to-html/v3 v3.16.2
-	github.com/caddyserver/certmagic v0.21.0
+	github.com/caddyserver/certmagic v0.21.4
 	github.com/chi-middleware/proxy v1.1.1
 	github.com/djherbis/buffer v1.2.0
 	github.com/djherbis/nio/v3 v3.0.1
@@ -157,7 +157,7 @@ require (
 	github.com/blevesearch/zapx/v16 v16.1.5 // indirect
 	github.com/boombuler/barcode v1.0.1 // indirect
 	github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 // indirect
-	github.com/caddyserver/zerossl v0.1.2 // indirect
+	github.com/caddyserver/zerossl v0.1.3 // indirect
 	github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cloudflare/circl v1.3.8 // indirect
@@ -224,8 +224,8 @@ require (
 	github.com/markbates/going v1.0.3 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
-	github.com/mholt/acmez/v2 v2.0.1 // indirect
-	github.com/miekg/dns v1.1.59 // indirect
+	github.com/mholt/acmez/v2 v2.0.3 // indirect
+	github.com/miekg/dns v1.1.62 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -271,7 +271,7 @@ require (
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
-	github.com/zeebo/blake3 v0.2.3 // indirect
+	github.com/zeebo/blake3 v0.2.4 // indirect
 	go.etcd.io/bbolt v1.3.9 // indirect
 	go.mongodb.org/mongo-driver v1.13.1 // indirect
 	go.opentelemetry.io/otel v1.26.0 // indirect
diff --git a/go.sum b/go.sum
index ffa5ce5cc4..a37dfe7ba8 100644
--- a/go.sum
+++ b/go.sum
@@ -146,10 +146,10 @@ github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0
 github.com/buildkite/terminal-to-html/v3 v3.16.2 h1:ueVE+BUqKOK3O4p+oul1y4Lo0sq7Qoj2Fb6/DJOrxYM=
 github.com/buildkite/terminal-to-html/v3 v3.16.2/go.mod h1:tdi6+MA4AjV5udS5cm8PVxLHsbJWLGsr5W/tHFzPgbY=
 github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
-github.com/caddyserver/certmagic v0.21.0 h1:yDoifClc4hIxhHer3AxUj4buhF+NzRR6torw/AOnuUE=
-github.com/caddyserver/certmagic v0.21.0/go.mod h1:OgUZNXYV/ylYoFJNmoYVR5nntydLNMQISePPgqZTyhc=
-github.com/caddyserver/zerossl v0.1.2 h1:tlEu1VzWGoqcCpivs9liKAKhfpJWYJkHEMmlxRbVAxE=
-github.com/caddyserver/zerossl v0.1.2/go.mod h1:wtiJEHbdvunr40ZzhXlnIkOB8Xj4eKtBKizCcZitJiQ=
+github.com/caddyserver/certmagic v0.21.4 h1:e7VobB8rffHv8ZZpSiZtEwnLDHUwLVYLWzWSa1FfKI0=
+github.com/caddyserver/certmagic v0.21.4/go.mod h1:swUXjQ1T9ZtMv95qj7/InJvWLXURU85r+CfG0T+ZbDE=
+github.com/caddyserver/zerossl v0.1.3 h1:onS+pxp3M8HnHpN5MMbOMyNjmTheJyWRaZYwn+YTAyA=
+github.com/caddyserver/zerossl v0.1.3/go.mod h1:CxA0acn7oEGO6//4rtrRjYgEoa4MFw/XofZnrYwGqG4=
 github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a h1:MISbI8sU/PSK/ztvmWKFcI7UGb5/HQT7B+i3a2myKgI=
 github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a/go.mod h1:2GxOXOlEPAMFPfp014mK1SWq8G8BN8o7/dfYqJrVGn8=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
@@ -452,7 +452,6 @@ github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/N
 github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c=
 github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
 github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
@@ -494,12 +493,12 @@ github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o
 github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/meilisearch/meilisearch-go v0.28.0 h1:f3XJ66ZM+R8bANAOLqsjvoq/HhQNpVJPYoNt6QgNzME=
 github.com/meilisearch/meilisearch-go v0.28.0/go.mod h1:Szcc9CaDiKIfjdgdt49jlmDKpEzjD+x+b6Y6heMdlQ0=
-github.com/mholt/acmez/v2 v2.0.1 h1:3/3N0u1pLjMK4sNEAFSI+bcvzbPhRpY383sy1kLHJ6k=
-github.com/mholt/acmez/v2 v2.0.1/go.mod h1:fX4c9r5jYwMyMsC+7tkYRxHibkOTgta5DIFGoe67e1U=
+github.com/mholt/acmez/v2 v2.0.3 h1:CgDBlEwg3QBp6s45tPQmFIBrkRIkBT4rW4orMM6p4sw=
+github.com/mholt/acmez/v2 v2.0.3/go.mod h1:pQ1ysaDeGrIMvJ9dfJMk5kJNkn7L2sb3UhyrX6Q91cw=
 github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=
 github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
-github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
-github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
+github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
+github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
 github.com/minio/minio-go/v7 v7.0.77 h1:GaGghJRg9nwDVlNbwYjSDJT1rqltQkBFDsypWX1v3Bw=
@@ -699,8 +698,8 @@ github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc h1:+
 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc/go.mod h1:ovIvrum6DQJA4QsJSovrkC4saKHQVs7TvcaeO8AIl5I=
 github.com/zeebo/assert v1.1.0 h1:hU1L1vLTHsnO8x8c9KAR5GmM5QscxHg5RNU5z5qbUWY=
 github.com/zeebo/assert v1.1.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
-github.com/zeebo/blake3 v0.2.3 h1:TFoLXsjeXqRNFxSbk35Dk4YtszE/MQQGK10BH4ptoTg=
-github.com/zeebo/blake3 v0.2.3/go.mod h1:mjJjZpnsyIVtVgTOSpJ9vmRE4wgDeyt2HU3qXvvKCaQ=
+github.com/zeebo/blake3 v0.2.4 h1:KYQPkhpRtcqh0ssGYcKLG1JYvddkEA8QwCM/yBqhaZI=
+github.com/zeebo/blake3 v0.2.4/go.mod h1:7eeQ6d2iXWRGF6npfaxl2CU+xy2Fjo2gxeyZGCRUjcE=
 github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo=
 github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
 go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI=

From 94f04e6fd84787522b932b2482e0b13235b8583f Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Thu, 3 Oct 2024 02:02:46 +0000
Subject: [PATCH 081/443] Update vitest monorepo to v2.1.2

---
 package-lock.json | 100 +++++++++++++++++++++++-----------------------
 package.json      |   4 +-
 2 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 559196635e..9e28619c94 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -67,7 +67,7 @@
         "@stylistic/eslint-plugin-js": "2.8.0",
         "@stylistic/stylelint-plugin": "3.1.0",
         "@vitejs/plugin-vue": "5.1.4",
-        "@vitest/coverage-v8": "2.1.1",
+        "@vitest/coverage-v8": "2.1.2",
         "@vitest/eslint-plugin": "1.1.4",
         "@vue/test-utils": "2.4.6",
         "eslint": "8.57.1",
@@ -94,7 +94,7 @@
         "stylelint-value-no-unknown-custom-properties": "6.0.1",
         "svgo": "3.2.0",
         "vite-string-plugin": "1.3.4",
-        "vitest": "2.1.1"
+        "vitest": "2.1.2"
       },
       "engines": {
         "node": ">= 18.0.0"
@@ -4863,9 +4863,9 @@
       }
     },
     "node_modules/@vitest/coverage-v8": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-2.1.1.tgz",
-      "integrity": "sha512-md/A7A3c42oTT8JUHSqjP5uKTWJejzUW4jalpvs+rZ27gsURsMU8DEb+8Jf8C6Kj2gwfSHJqobDNBuoqlm0cFw==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-2.1.2.tgz",
+      "integrity": "sha512-b7kHrFrs2urS0cOk5N10lttI8UdJ/yP3nB4JYTREvR5o18cR99yPpK4gK8oQgI42BVv0ILWYUSYB7AXkAUDc0g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4886,8 +4886,8 @@
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "@vitest/browser": "2.1.1",
-        "vitest": "2.1.1"
+        "@vitest/browser": "2.1.2",
+        "vitest": "2.1.2"
       },
       "peerDependenciesMeta": {
         "@vitest/browser": {
@@ -4930,14 +4930,14 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.1.tgz",
-      "integrity": "sha512-YeueunS0HiHiQxk+KEOnq/QMzlUuOzbU1Go+PgAsHvvv3tUkJPm9xWt+6ITNTlzsMXUjmgm5T+U7KBPK2qQV6w==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.2.tgz",
+      "integrity": "sha512-FEgtlN8mIUSEAAnlvn7mP8vzaWhEaAEvhSXCqrsijM7K6QqjB11qoRZYEd4AKSCDz8p0/+yH5LzhZ47qt+EyPg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "2.1.1",
-        "@vitest/utils": "2.1.1",
+        "@vitest/spy": "2.1.2",
+        "@vitest/utils": "2.1.2",
         "chai": "^5.1.1",
         "tinyrainbow": "^1.2.0"
       },
@@ -4946,9 +4946,9 @@
       }
     },
     "node_modules/@vitest/mocker": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.1.tgz",
-      "integrity": "sha512-LNN5VwOEdJqCmJ/2XJBywB11DLlkbY0ooDJW3uRX5cZyYCrc4PI/ePX0iQhE3BiEGiQmK4GE7Q/PqCkkaiPnrA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.2.tgz",
+      "integrity": "sha512-ExElkCGMS13JAJy+812fw1aCv2QO/LBK6CyO4WOPAzLTmve50gydOlWhgdBJPx2ztbADUq3JVI0C5U+bShaeEA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4960,7 +4960,7 @@
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "@vitest/spy": "2.1.1",
+        "@vitest/spy": "2.1.2",
         "msw": "^2.3.5",
         "vite": "^5.0.0"
       },
@@ -5001,9 +5001,9 @@
       }
     },
     "node_modules/@vitest/pretty-format": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.1.tgz",
-      "integrity": "sha512-SjxPFOtuINDUW8/UkElJYQSFtnWX7tMksSGW0vfjxMneFqxVr8YJ979QpMbDW7g+BIiq88RAGDjf7en6rvLPPQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.2.tgz",
+      "integrity": "sha512-FIoglbHrSUlOJPDGIrh2bjX1sNars5HbxlcsFKCtKzu4+5lpsRhOCVcuzp0fEhAGHkPZRIXVNzPcpSlkoZ3LuA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5014,13 +5014,13 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.1.tgz",
-      "integrity": "sha512-uTPuY6PWOYitIkLPidaY5L3t0JJITdGTSwBtwMjKzo5O6RCOEncz9PUN+0pDidX8kTHYjO0EwUIvhlGpnGpxmA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.2.tgz",
+      "integrity": "sha512-UCsPtvluHO3u7jdoONGjOSil+uON5SSvU9buQh3lP7GgUXHp78guN1wRmZDX4wGK6J10f9NUtP6pO+SFquoMlw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "2.1.1",
+        "@vitest/utils": "2.1.2",
         "pathe": "^1.1.2"
       },
       "funding": {
@@ -5028,13 +5028,13 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.1.tgz",
-      "integrity": "sha512-BnSku1WFy7r4mm96ha2FzN99AZJgpZOWrAhtQfoxjUU5YMRpq1zmHRq7a5K9/NjqonebO7iVDla+VvZS8BOWMw==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.2.tgz",
+      "integrity": "sha512-xtAeNsZ++aRIYIUsek7VHzry/9AcxeULlegBvsdLncLmNCR6tR8SRjn8BbDP4naxtccvzTqZ+L1ltZlRCfBZFA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "2.1.1",
+        "@vitest/pretty-format": "2.1.2",
         "magic-string": "^0.30.11",
         "pathe": "^1.1.2"
       },
@@ -5053,9 +5053,9 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.1.tgz",
-      "integrity": "sha512-ZM39BnZ9t/xZ/nF4UwRH5il0Sw93QnZXd9NAZGRpIgj0yvVwPpLd702s/Cx955rGaMlyBQkZJ2Ir7qyY48VZ+g==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.2.tgz",
+      "integrity": "sha512-GSUi5zoy+abNRJwmFhBDC0yRuVUn8WMlQscvnbbXdKLXX9dE59YbfwXxuJ/mth6eeqIzofU8BB5XDo/Ns/qK2A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5066,13 +5066,13 @@
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.1.tgz",
-      "integrity": "sha512-Y6Q9TsI+qJ2CC0ZKj6VBb+T8UPz593N113nnUykqwANqhgf3QkZeHFlusgKLTqrnVHbj/XDKZcDHol+dxVT+rQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.2.tgz",
+      "integrity": "sha512-zMO2KdYy6mx56btx9JvAqAZ6EyS3g49krMPPrgOp1yxGZiA93HumGk+bZ5jIZtOg5/VBYl5eBmGRQHqq4FG6uQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "2.1.1",
+        "@vitest/pretty-format": "2.1.2",
         "loupe": "^3.1.1",
         "tinyrainbow": "^1.2.0"
       },
@@ -16109,9 +16109,9 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.1.tgz",
-      "integrity": "sha512-N/mGckI1suG/5wQI35XeR9rsMsPqKXzq1CdUndzVstBj/HvyxxGctwnK6WX43NGt5L3Z5tcRf83g4TITKJhPrA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.2.tgz",
+      "integrity": "sha512-HPcGNN5g/7I2OtPjLqgOtCRu/qhVvBxTUD3qzitmL0SrG1cWFzxzhMDWussxSbrRYWqnKf8P2jiNhPMSN+ymsQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16196,19 +16196,19 @@
       }
     },
     "node_modules/vitest": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.1.tgz",
-      "integrity": "sha512-97We7/VC0e9X5zBVkvt7SGQMGrRtn3KtySFQG5fpaMlS+l62eeXRQO633AYhSTC3z7IMebnPPNjGXVGNRFlxBA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.2.tgz",
+      "integrity": "sha512-veNjLizOMkRrJ6xxb+pvxN6/QAWg95mzcRjtmkepXdN87FNfxAss9RKe2far/G9cQpipfgP2taqg0KiWsquj8A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/expect": "2.1.1",
-        "@vitest/mocker": "2.1.1",
-        "@vitest/pretty-format": "^2.1.1",
-        "@vitest/runner": "2.1.1",
-        "@vitest/snapshot": "2.1.1",
-        "@vitest/spy": "2.1.1",
-        "@vitest/utils": "2.1.1",
+        "@vitest/expect": "2.1.2",
+        "@vitest/mocker": "2.1.2",
+        "@vitest/pretty-format": "^2.1.2",
+        "@vitest/runner": "2.1.2",
+        "@vitest/snapshot": "2.1.2",
+        "@vitest/spy": "2.1.2",
+        "@vitest/utils": "2.1.2",
         "chai": "^5.1.1",
         "debug": "^4.3.6",
         "magic-string": "^0.30.11",
@@ -16219,7 +16219,7 @@
         "tinypool": "^1.0.0",
         "tinyrainbow": "^1.2.0",
         "vite": "^5.0.0",
-        "vite-node": "2.1.1",
+        "vite-node": "2.1.2",
         "why-is-node-running": "^2.3.0"
       },
       "bin": {
@@ -16234,8 +16234,8 @@
       "peerDependencies": {
         "@edge-runtime/vm": "*",
         "@types/node": "^18.0.0 || >=20.0.0",
-        "@vitest/browser": "2.1.1",
-        "@vitest/ui": "2.1.1",
+        "@vitest/browser": "2.1.2",
+        "@vitest/ui": "2.1.2",
         "happy-dom": "*",
         "jsdom": "*"
       },
diff --git a/package.json b/package.json
index f5af54f1b2..38bf92d0d3 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "@stylistic/eslint-plugin-js": "2.8.0",
     "@stylistic/stylelint-plugin": "3.1.0",
     "@vitejs/plugin-vue": "5.1.4",
-    "@vitest/coverage-v8": "2.1.1",
+    "@vitest/coverage-v8": "2.1.2",
     "@vitest/eslint-plugin": "1.1.4",
     "@vue/test-utils": "2.4.6",
     "eslint": "8.57.1",
@@ -93,7 +93,7 @@
     "stylelint-value-no-unknown-custom-properties": "6.0.1",
     "svgo": "3.2.0",
     "vite-string-plugin": "1.3.4",
-    "vitest": "2.1.1"
+    "vitest": "2.1.2"
   },
   "browserslist": ["defaults"]
 }

From 56bcbbaa316889489357418a5f1d6c7ceebb53e1 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Thu, 3 Oct 2024 06:02:29 +0000
Subject: [PATCH 082/443] Update dependency @vitest/eslint-plugin to v1.1.5

---
 package-lock.json | 14 ++++----------
 package.json      |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9e28619c94..8e04f3c139 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -68,7 +68,7 @@
         "@stylistic/stylelint-plugin": "3.1.0",
         "@vitejs/plugin-vue": "5.1.4",
         "@vitest/coverage-v8": "2.1.2",
-        "@vitest/eslint-plugin": "1.1.4",
+        "@vitest/eslint-plugin": "1.1.5",
         "@vue/test-utils": "2.4.6",
         "eslint": "8.57.1",
         "eslint-plugin-array-func": "4.0.0",
@@ -4906,9 +4906,9 @@
       }
     },
     "node_modules/@vitest/eslint-plugin": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/eslint-plugin/-/eslint-plugin-1.1.4.tgz",
-      "integrity": "sha512-kudjgefmJJ7xQ2WfbUU6pZbm7Ou4gLYRaao/8Ynide3G0QhVKHd978sDyWX4KOH0CCMH9cyrGAkFd55eGzJ48Q==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@vitest/eslint-plugin/-/eslint-plugin-1.1.5.tgz",
+      "integrity": "sha512-a02F1HAJ/A1ietP96QDxkRqZROdgCJvNXSkmHAXTcTHnmj9Hh2gqi7x4M+miOj1sDIef2qGqE8zmMBb2PgTE8w==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -4918,14 +4918,8 @@
         "vitest": "*"
       },
       "peerDependenciesMeta": {
-        "@typescript-eslint/utils": {
-          "optional": true
-        },
         "typescript": {
           "optional": true
-        },
-        "vitest": {
-          "optional": true
         }
       }
     },
diff --git a/package.json b/package.json
index 38bf92d0d3..ac9e401bc3 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "@stylistic/stylelint-plugin": "3.1.0",
     "@vitejs/plugin-vue": "5.1.4",
     "@vitest/coverage-v8": "2.1.2",
-    "@vitest/eslint-plugin": "1.1.4",
+    "@vitest/eslint-plugin": "1.1.5",
     "@vue/test-utils": "2.4.6",
     "eslint": "8.57.1",
     "eslint-plugin-array-func": "4.0.0",

From ba891d50bffef71106984a422bd1ee59ef558412 Mon Sep 17 00:00:00 2001
From: Dirk 
Date: Thu, 3 Oct 2024 14:03:10 +0200
Subject: [PATCH 083/443] remove mssql as requested per review comment

see https://codeberg.org/forgejo/forgejo/pulls/5415#issuecomment-2349746
---
 custom/conf/app.example.ini | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index 7eb4f1c655..87eb83c762 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -349,7 +349,7 @@ RUN_USER = ; git
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
-;; Database to use. Either "sqlite3", "mySQL", "postgres" or "mssql".
+;; Database to use. Either "sqlite3", "mySQL" or "postgres".
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -386,17 +386,6 @@ DB_TYPE = sqlite3
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
-;; MSSQL Configuration
-;;
-;DB_TYPE = mssql
-;HOST = 172.17.0.2:1433
-;NAME = gitea
-;USER = SA
-;PASSWD = MwantsaSecurePassword1
-;CHARSET_COLLATION = ; Empty as default, Gitea will try to find a case-sensitive collation. Don't change it unless you clearly know what you need.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
 ;; Other settings
 ;;
 ;; For iterate buffer, default is 50

From 15a407a61757c15a11b97c6508d119921eb9aa0f Mon Sep 17 00:00:00 2001
From: Kwonunn 
Date: Thu, 3 Oct 2024 16:15:08 +0200
Subject: [PATCH 084/443] log concise repo names in lfs doctor

the old log prints the entire repo object
---
 services/repository/lfs.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/services/repository/lfs.go b/services/repository/lfs.go
index b49a4f71ea..4cd1110e55 100644
--- a/services/repository/lfs.go
+++ b/services/repository/lfs.go
@@ -52,21 +52,21 @@ func GarbageCollectLFSMetaObjects(ctx context.Context, opts GarbageCollectLFSMet
 
 // GarbageCollectLFSMetaObjectsForRepo garbage collects LFS objects for a specific repository
 func GarbageCollectLFSMetaObjectsForRepo(ctx context.Context, repo *repo_model.Repository, opts GarbageCollectLFSMetaObjectsOptions) error {
-	opts.LogDetail("Checking %-v", repo)
+	opts.LogDetail("Checking %s", repo.FullName())
 	total, orphaned, collected, deleted := int64(0), 0, 0, 0
 	defer func() {
 		if orphaned == 0 {
-			opts.LogDetail("Found %d total LFSMetaObjects in %-v", total, repo)
+			opts.LogDetail("Found %d total LFSMetaObjects in %s", total, repo.FullName())
 		} else if !opts.AutoFix {
-			opts.LogDetail("Found %d/%d orphaned LFSMetaObjects in %-v", orphaned, total, repo)
+			opts.LogDetail("Found %d/%d orphaned LFSMetaObjects in %s", orphaned, total, repo.FullName())
 		} else {
-			opts.LogDetail("Collected %d/%d orphaned/%d total LFSMetaObjects in %-v. %d removed from storage.", collected, orphaned, total, repo, deleted)
+			opts.LogDetail("Collected %d/%d orphaned/%d total LFSMetaObjects in %s. %d removed from storage.", collected, orphaned, total, repo.FullName(), deleted)
 		}
 	}()
 
 	gitRepo, err := gitrepo.OpenRepository(ctx, repo)
 	if err != nil {
-		log.Error("Unable to open git repository %-v: %v", repo, err)
+		log.Error("Unable to open git repository %s: %v", repo.FullName(), err)
 		return err
 	}
 	defer gitRepo.Close()

From aca00fa3465f554b06de4da840f9bd2c75fd494f Mon Sep 17 00:00:00 2001
From: Codeberg Translate 
Date: Thu, 3 Oct 2024 21:23:07 +0000
Subject: [PATCH 085/443] i18n: update of translations from Codeberg Translate
 (#5413)

Translations update from [Codeberg Translate](https://translate.codeberg.org) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/).

Current translation status:

![Weblate translation status](https://translate.codeberg.org/widget/forgejo/forgejo/horizontal-auto.svg)

Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: fnetX 
Co-authored-by: be4zad 
Co-authored-by: Fjuro 
Co-authored-by: hankskyjames777 
Co-authored-by: kwoot 
Co-authored-by: emansije 
Co-authored-by: xtex 
Co-authored-by: Outbreak2096 
Co-authored-by: WithLithum 
Co-authored-by: yeziruo 
Co-authored-by: kecrily 
Co-authored-by: overloop 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5413
Reviewed-by: Otto 
Co-authored-by: Codeberg Translate 
Co-committed-by: Codeberg Translate 
---
 options/locale/locale_cs-CZ.ini | 164 ++++++++++++++++----------------
 options/locale/locale_de-DE.ini |   4 +-
 options/locale/locale_el-GR.ini |   2 +-
 options/locale/locale_es-ES.ini |   2 +-
 options/locale/locale_fa-IR.ini |   4 +-
 options/locale/locale_fil.ini   |   2 +
 options/locale/locale_fr-FR.ini |   2 +-
 options/locale/locale_it-IT.ini |   2 +-
 options/locale/locale_ja-JP.ini |   2 +-
 options/locale/locale_lv-LV.ini |   2 +-
 options/locale/locale_nl-NL.ini |  17 ++--
 options/locale/locale_pt-BR.ini |   2 +-
 options/locale/locale_pt-PT.ini |  24 ++++-
 options/locale/locale_ru-RU.ini |  22 ++++-
 options/locale/locale_tr-TR.ini |   2 +-
 options/locale/locale_zh-CN.ini |  84 ++++++++--------
 options/locale/locale_zh-TW.ini |   2 +-
 17 files changed, 191 insertions(+), 148 deletions(-)

diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
index 4fa19b80f2..0eb5e1afef 100644
--- a/options/locale/locale_cs-CZ.ini
+++ b/options/locale/locale_cs-CZ.ini
@@ -33,7 +33,7 @@ password=Heslo
 access_token=Přístupový token
 re_type=Potvrzení hesla
 captcha=CAPTCHA
-twofa=Dvoufaktorové ověřování
+twofa=Dvoufázové ověření
 twofa_scratch=Dvoufaktorový kód
 passcode=Přístupový kód
 
@@ -434,7 +434,7 @@ non_local_account=Externě ověřovaní uživatelé nemohou změnit své heslo p
 verify=Ověřit
 scratch_code=Záložní kód
 use_scratch_code=Použít záložní kód
-twofa_scratch_used=Použili jste váš záložní kód. Byli jste přesměrování na stránku s nastavením dvoufaktorového ověřování, kde můžete odstranit registraci vašeho zařízení nebo vygenerovat nový záložní kód.
+twofa_scratch_used=Použili jste svůj záložní kód. Byli jste přesměrování na stránku s nastavením dvoufázového ověření, kde můžete odstranit registraci vašeho zařízení nebo vygenerovat nový záložní kód.
 twofa_passcode_incorrect=Vaše heslo je neplatné. Pokud jste ztratili vaše zařízení, použijte záložní kód k přihlášení.
 twofa_scratch_token_incorrect=Váš záložní kód není správný.
 login_userpass=Přihlásit se
@@ -622,7 +622,7 @@ repository_files_already_exist.adopt=Soubory pro tento repozitář již existuj
 repository_files_already_exist.delete=Soubory pro tento repozitář již existují. Musíte je odstranit.
 repository_files_already_exist.adopt_or_delete=Soubory pro tento repozitář již existují. Přijměte je, nebo je odstraňte.
 visit_rate_limit=Dosaženo limitu rychlosti dotazů při vzdáleném přístupu.
-2fa_auth_required=Vzdálený přístup vyžaduje dvoufaktorové ověřování.
+2fa_auth_required=Vzdálený přístup vyžaduje dvoufázové ověření.
 org_name_been_taken=Název organizace je již použit.
 team_name_been_taken=Název týmu je již použit.
 team_no_units_error=Povolit přístup alespoň do jedné sekce repozitáře.
@@ -732,11 +732,11 @@ applications=Aplikace
 orgs=Organizace
 repos=Repozitáře
 delete=Smazat účet
-twofa=Dvoufaktorové ověřování (TOTP)
+twofa=Dvoufázové ověření (TOTP)
 account_link=Propojené účty
 organization=Organizace
 uid=UID
-webauthn=Dvoufaktorové ověřování (bezpečnostní klíče)
+webauthn=Dvoufázové ověření (bezpečnostní klíče)
 
 public_profile=Veřejný profil
 biography_placeholder=Řekněte nám něco o sobě! (Můžete použít Markdown)
@@ -806,7 +806,7 @@ manage_emails=Správa e-mailových adres
 manage_themes=Výchozí motiv
 manage_openid=Adresy OpenID
 email_desc=Vaše hlavní e-mailová adresa bude použita pro oznámení, obnovení hesla, a pokud není skrytá, pro operace Gitu.
-theme_desc=Toto bude váš výchozí motiv vzhledu napříč stránkou.
+theme_desc=Toto bude váš výchozí motiv vzhledu na tomto webu.
 primary=Hlavní
 activated=Aktivován
 requires_activation=Vyžaduje aktivaci
@@ -898,7 +898,7 @@ ssh_principal_deletion_success=SSH Principal certifikát byl odstraněn.
 added_on=Přidáno %s
 valid_until_date=Platné do %s
 valid_forever=Platné navždy
-last_used=Naposledy použito dne
+last_used=Naposledy použito
 no_activity=Žádná aktuální aktivita
 can_read_info=Čtení
 can_write_info=Zápis
@@ -928,17 +928,17 @@ access_token_deletion_cancel_action=Zrušit
 access_token_deletion_confirm_action=Smazat
 access_token_deletion_desc=Smazání tokenu zruší přístup k vašemu účtu pro aplikace, které jej používají. Tuto akci nelze vrátit. Pokračovat?
 delete_token_success=Token byl odstraněn. Aplikace, které jej používají již nemají přístup k vašemu účtu.
-repo_and_org_access=Repozitář a přístup organizace
-permissions_public_only=Pouze veřejnost
+repo_and_org_access=Přístup k repozitářům a organizacím
+permissions_public_only=Pouze veřejné
 permissions_access_all=Vše (veřejné, soukromé a omezené)
 select_permissions=Vyberte oprávnění
-permission_no_access=Bez přístupu
-permission_read=Přečtené
+permission_no_access=Žádný přístup
+permission_read=Čtení
 permission_write=Čtení a zápis
 at_least_one_permission=Musíte vybrat alespoň jedno oprávnění pro vytvoření tokenu
 permissions_list=Oprávnění:
 
-manage_oauth2_applications=Spravovat aplikace OAuth2
+manage_oauth2_applications=Správa aplikací OAuth2
 edit_oauth2_application=Upravit OAuth2 aplikaci
 oauth2_applications_desc=OAuth2 aplikace umožní aplikacím třetích stran bezpečně ověřit uživatele v této instanci Forgejo.
 remove_oauth2_application=Odstranit OAuth2 aplikaci
@@ -949,8 +949,8 @@ create_oauth2_application_button=Vytvořit aplikaci
 create_oauth2_application_success=Úspěšně jste vytvořili novou OAuth2 aplikaci.
 update_oauth2_application_success=Úspěšně jste aktualizovali OAuth2 aplikaci.
 oauth2_application_name=Název aplikace
-oauth2_confidential_client=Důvěrný klient. Zvolte jej pro aplikace, které ukládají soubor secret, například webové aplikace. Nevybírejte jej pro nativní aplikace včetně aplikací pro počítače a mobilní zařízení.
-oauth2_redirect_uris=Přesměrování URI. Použijte nový řádek pro každou URI.
+oauth2_confidential_client=Důvěrný klient. Vyberte pro aplikace, které udržují tajný klíč v bezpečí, například webové aplikace. Nevybírejte pro nativní aplikace včetně aplikací pro počítače a mobilní zařízení.
+oauth2_redirect_uris=Přesměrování URI. Zadejte každou URI na vlastní řádek.
 save_application=Uložit
 oauth2_client_id=ID klienta
 oauth2_client_secret=Tajný klíč klienta
@@ -958,12 +958,12 @@ oauth2_regenerate_secret=Obnovit tajný klíč
 oauth2_regenerate_secret_hint=Ztratili jste svůj tajný klíč?
 oauth2_client_secret_hint=Tajný klíč se znovu nezobrazí po opuštění nebo obnovení této stránky. Ujistěte se, že jste si jej uložili.
 oauth2_application_edit=Upravit
-oauth2_application_create_description=OAuth2 aplikace poskytuje přístup aplikacím třetích stran k uživatelským účtům na této instanci.
+oauth2_application_create_description=Aplikace OAuth2 poskytují přístup vašim aplikacím třetích stran k uživatelským účtům na této instanci.
 oauth2_application_remove_description=Odebráním OAuth2 aplikace zabrání přístupu ověřeným uživatelům na této instanci. Pokračovat?
 oauth2_application_locked=Gitea předregistruje některé OAuth2 aplikace při spuštění, pokud je to povoleno v konfiguraci. Aby se zabránilo neočekávanému chování, nelze je upravovat ani odstranit. Více informací naleznete v dokumentaci OAuth2.
 
-authorized_oauth2_applications=Autorizovat aplikaci OAuth2
-authorized_oauth2_applications_description=Úspěšně jste povolili přístup k vašemu osobnímu účtu této aplikaci třetí strany. Zrušte prosím přístup aplikacím, které již nejsou používány.
+authorized_oauth2_applications=Autorizované aplikace OAuth2
+authorized_oauth2_applications_description=Těmto aplikacím třetích stran jste udělili přístup ke svému osobnímu účtu Forgejo. Zrušte prosím přístup aplikacím, které již nejsou používány.
 revoke_key=Zrušit
 revoke_oauth2_grant=Zrušit přístup
 revoke_oauth2_grant_description=Zrušením přístupu této aplikaci třetí strany ji zabráníte v přístupu k vašim datům. Jste si jisti?
@@ -971,24 +971,24 @@ revoke_oauth2_grant_success=Přístup byl úspěšně zrušen.
 
 twofa_desc=Dvoufaktorový způsob ověřování zvýší zabezpečení vašeho účtu.
 twofa_recovery_tip=Pokud ztratíte své zařízení, budete moci použít jednorázový obnovovací klíč k získání přístupu k vašemu účtu.
-twofa_is_enrolled=Váš účet aktuálně používá dvoufaktorové ověřování.
-twofa_not_enrolled=Váš účet aktuálně nepoužívá dvoufaktorové ověřování.
-twofa_disable=Zakázat dvoufaktorové ověřování
+twofa_is_enrolled=Váš účet aktuálně používá dvoufázové ověření.
+twofa_not_enrolled=Váš účet aktuálně nepoužívá dvoufázové ověření.
+twofa_disable=Zakázat dvoufázové ověření
 twofa_scratch_token_regenerate=Znovu vygenerovat jednorázový klíč pro obnovení
 twofa_scratch_token_regenerated=Váš jednorázový klíč pro obnovení je nyní %s. Uložte jej na bezpečné místo, protože se znovu nezobrazí.
-twofa_enroll=Povolit dvoufaktorové ověřování
-twofa_disable_note=Dvoufaktorové ověřování můžete zakázat, když bude potřeba.
-twofa_disable_desc=Zakážete-li dvoufaktorové ověřování, bude váš účet méně zabezpečený. Pokračovat?
+twofa_enroll=Povolit dvoufázové ověření
+twofa_disable_note=Dvoufázové ověření můžete v případě potřeby zakázat.
+twofa_disable_desc=Zakázáním dvoufázového ověření bude váš účet méně bezpečný. Pokračovat?
 regenerate_scratch_token_desc=Pokud jste ztratili svůj klíč pro obnovení nebo jste jej již použili k přihlášení, můžete jej resetovat zde.
-twofa_disabled=Dvoufaktorové ověřování bylo zakázáno.
+twofa_disabled=Dvoufázové ověření bylo zakázáno.
 scan_this_image=Naskenujte tento obrázek s vaší ověřovací aplikací:
 or_enter_secret=Nebo zadejte tajný kód: %s
 then_enter_passcode=A zadejte přístupový kód zobrazený ve vaší aplikaci:
 passcode_invalid=Přístupový kód není platný. Zkuste to znovu.
-twofa_enrolled=Ve vašem účtu bylo povoleno dvoufaktorové ověřování. Uložte si jednorázový obnovovací klíč (%s) na bezpečné místo, jelikož již nebude znovu zobrazen.
+twofa_enrolled=Ve vašem účtu bylo povoleno dvoufázové ověření. Uložte si jednorázový obnovovací klíč (%s) na bezpečné místo, jelikož již nebude znovu zobrazen.
 twofa_failed_get_secret=Nepodařilo se získat tajemství.
 
-webauthn_desc=Bezpečnostní klíče jsou hardwarová zařízení obsahující kryptografické klíče. Mohou být použity pro dvoufaktorové ověřování. Bezpečnostní klíče musí podporovat WebAuthn Authenticator standard.
+webauthn_desc=Bezpečnostní klíče jsou hardwarová zařízení obsahující kryptografické klíče. Mohou být použity pro dvoufázové ověření. Bezpečnostní klíče musí podporovat standard WebAuthn Authenticator.
 webauthn_register_key=Přidat bezpečnostní klíč
 webauthn_nickname=Přezdívka
 webauthn_delete_key=Odebrat bezpečnostní klíč
@@ -997,7 +997,7 @@ webauthn_key_loss_warning=Pokud ztratíte své bezpečnostní klíče, ztratíte
 webauthn_alternative_tip=Možná budete chtít nakonfigurovat další metodu ověřování.
 
 manage_account_links=Propojené účty
-manage_account_links_desc=Tyto externí účty jsou propojeny s vaším Forgejo účtem.
+manage_account_links_desc=Tyto externí účty jsou propojeny s vaším účtem Forgejo.
 account_links_not_available=K vašemu Forgejo účtu nejsou aktuálně připojené žádné externí účty.
 link_account=Propojit účet
 remove_account_link=Odstranit propojený účet
@@ -1009,7 +1009,7 @@ hooks.desc=Přidat webhooky, které budou spouštěny pro všechny repoz
 orgs_none=Nejste členem žádné organizace.
 repos_none=Nevlastníte žádné repozitáře.
 
-delete_account=Odstranit svůj účet
+delete_account=Odstranit účet
 delete_prompt=Tato operace natrvalo odstraní váš uživatelský účet. NELZE ji vrátit zpět.
 delete_with_all_comments=Váš účet je mladší než %s. Pro zabránění fantomovým komentářům budou společně s ním odstraněny všechny komentáře u problémů a ŽS.
 confirm_delete_account=Potvrdit odstranění
@@ -1037,7 +1037,7 @@ access_token_desc = Oprávnění vybraného tokenu omezují autorizaci pouze na
 blocked_users_none = Nemáte žádné zablokované uživatele.
 blocked_since = Zablokován od %s
 hints = Nápovědy
-additional_repo_units_hint = Navrhnout povolení dalších jednotek úložiště
+additional_repo_units_hint = Navrhnout povolení dalších jednotek repozitáře
 update_hints = Aktualizovat nápovědy
 update_hints_success = Nápovědy byly aktualizovány.
 additional_repo_units_hint_description = Zobrazit tlačítko „Přidat další jednotky...“ u repozitářů, které nemají povolené všechny dostupné jednotky.
@@ -1058,7 +1058,7 @@ repo_name_helper=Dobrý název repozitáře většinou používá krátká, zapa
 repo_size=Velikost repozitáře
 template=Šablona
 template_select=Vyberte šablonu
-template_helper=Z repozitáře vytvořit šablonu
+template_helper=Nastavit repozitář jako šablonu
 template_description=Šablony repozitářů umožňují uživatelům generovat nové repositáře se stejnou strukturou, soubory a volitelnými nastaveními.
 visibility=Viditelnost
 visibility_description=Pouze majitelé nebo členové organizace to budou moci vidět, pokud mají práva.
@@ -1069,7 +1069,7 @@ clone_helper=Potřebujete pomoci s klonováním? Navštivte “
+editor.commit_signed_changes=Odeslat podepsané změny
+editor.commit_changes=Odeslat změny
+editor.add_tmpl=Přidán „“
 editor.add=Přidat %s
 editor.update=Aktualizovat %s
 editor.delete=Odstranit %s
@@ -1357,7 +1357,7 @@ editor.fail_to_apply_patch=Nelze použít záplatu „%s“
 editor.new_patch=Nová záplata
 editor.commit_message_desc=Přidat volitelný rozšířený popis…
 editor.signoff_desc=Přidat Signed-off-by podpis přispěvatele na konec zprávy o commitu.
-editor.commit_directly_to_this_branch=Odevzdat přímo do větve %s.
+editor.commit_directly_to_this_branch=Odeslat přímo do větve %s.
 editor.create_new_branch=Vytvořit novou větev pro tento commit a vytvořit žádost o sloučení.
 editor.create_new_branch_np=Vytvořte novou větev z tohoto commitu.
 editor.propose_file_change=Navrhnout změnu souboru
@@ -1375,8 +1375,8 @@ editor.file_editing_no_longer_exists=Upravovaný soubor „%s“ již není sou
 editor.file_deleting_no_longer_exists=Odstraňovaný soubor „%s“ již není součástí tohoto repozitáře.
 editor.file_changed_while_editing=Obsah souboru se od zahájení úprav změnil. Klikněte sem pro jejich zobrazení nebo proveďte commit změn ještě jednou pro jejich přepsání.
 editor.file_already_exists=Soubor „%s“ již existuje v tomto repozitáři.
-editor.commit_empty_file_header=Odevzdat prázdný soubor
-editor.commit_empty_file_text=Soubor, který se chystáte odevzdat, je prázdný. Pokračovat?
+editor.commit_empty_file_header=Odeslat prázdný soubor
+editor.commit_empty_file_text=Soubor, který se chystáte odeslat, je prázdný. Pokračovat?
 editor.no_changes_to_show=Žádné změny k zobrazení.
 editor.fail_to_update_file=Nepodařilo se aktualizovat/vytvořit soubor „%s“.
 editor.fail_to_update_file_summary=Chybová zpráva:
@@ -1386,9 +1386,9 @@ editor.push_rejected_summary=Úplná zpráva o zamítnutí:
 editor.add_subdir=Přidat adresář…
 editor.unable_to_upload_files=Nepodařilo se nahrát soubory do „%s“. Chyba: %v
 editor.upload_file_is_locked=Soubor „%s“ je uzamčen uživatelem %s.
-editor.upload_files_to_dir=Nahrát soubory do „%s“
+editor.upload_files_to_dir=Nahrány soubory do „%s“
 editor.cannot_commit_to_protected_branch=Nelze vytvořit commit v chráněné větvi „%s“.
-editor.no_commit_to_branch=Nelze odevzdat přímo do větve, protože:
+editor.no_commit_to_branch=Nepodařilo se odeslat přímo do větve:
 editor.user_no_push_to_branch=Uživatel nemůže nahrávat do větve
 editor.require_signed_commit=Větev vyžaduje podepsaný commit
 editor.cherry_pick=Cherry-pick %s na:
@@ -1909,7 +1909,7 @@ pulls.has_merged=Chyba: žádost byla sloučena, nelze ji znovu sloučit nebo zm
 pulls.push_rejected=Push selhal: nahrání bylo zamítnuto. Zkontrolujte Git hooky pro tento repozitář.
 pulls.push_rejected_summary=Úplná zpráva o zamítnutí
 pulls.push_rejected_no_message=Push selhal: nahrání bylo odmítnuto, ale nebyla nalezena žádná vzdálená zpráva. Zkontrolujte Git hooky pro tento repozitář
-pulls.open_unmerged_pull_exists=`Nemůžete provést operaci znovuotevření protože je tu čekající požadavek na natažení (#%d) s identickými vlastnostmi.`
+pulls.open_unmerged_pull_exists=`Nemůžete provést operaci opětovného otevření, protože máte čekající žádost o sloučení (#%d) s identickými vlastnostmi.`
 pulls.status_checking=Některé kontroly jsou nedořešeny
 pulls.status_checks_success=Všechny kontroly byly úspěšné
 pulls.status_checks_warning=Některé kontroly nahlásily varování
@@ -1925,8 +1925,8 @@ pulls.update_branch_success=Aktualizace větve byla úspěšná
 pulls.update_not_allowed=Nemáte oprávnění aktualizovat větev
 pulls.outdated_with_base_branch=Tato větev je zastaralá oproti základní větvi
 pulls.close=Zavřít žádost o sloučení
-pulls.closed_at=`uzavřel/a tento požadavek na natažení %[2]s`
-pulls.reopened_at=`znovuotevřel/a tento požadavek na natažení %[2]s`
+pulls.closed_at=`uzavřel/a tuto žádost o sloučení %[2]s`
+pulls.reopened_at=`znovu otevřel/a tuto žádost o sloučení %[2]s`
 pulls.cmd_instruction_hint=Zobrazit instrukce příkazové řádky
 pulls.cmd_instruction_checkout_desc=Z vašeho repositáře projektu se podívejte na novou větev a vyzkoušejte změny.
 pulls.cmd_instruction_merge_title=Sloučit
@@ -1935,18 +1935,18 @@ pulls.clear_merge_message=Vymazat zprávu o sloučení
 
 pulls.auto_merge_button_when_succeed=(Když kontroly uspějí)
 pulls.auto_merge_when_succeed=Automaticky sloučit, když všechny kontroly uspějí
-pulls.auto_merge_newly_scheduled=Požadavek na natažení byl naplánován na sloučení, jakmile všechny kontroly uspějí.
-pulls.auto_merge_has_pending_schedule=%[1]s naplánoval/a tento požadavek na natažení pro automatické sloučení, když všechny kontroly uspějí v %[2]s.
+pulls.auto_merge_newly_scheduled=Žádost o sloučení bude sloučena, jakmile budou všechny kontroly úspěšné.
+pulls.auto_merge_has_pending_schedule=%[1]s naplánoval/a tuto žádost o sloučení na automatické sloučení, jakmile budou všechny kontroly úspěšné %[2]s.
 
 pulls.auto_merge_cancel_schedule=Zrušit automatické sloučení
-pulls.auto_merge_not_scheduled=Tento požadavek na natažení není naplánován na automatické sloučení.
-pulls.auto_merge_canceled_schedule=Automatické sloučení bylo zrušeno pro tento požadavek na natažení.
+pulls.auto_merge_not_scheduled=Tato žádost o sloučení nebude automaticky sloučena.
+pulls.auto_merge_canceled_schedule=Automatické sloučení bylo u této žádosti o sloučení zrušeno.
 
-pulls.auto_merge_newly_scheduled_comment=`požadavek na automatické sloučení tohoto požadavku na natažení je naplánován, když všechny kontroly uspějí %[1]s`
-pulls.auto_merge_canceled_schedule_comment=`zrušil/a automatické sloučení tohoto požadavku na natažení, když všechny kontroly uspějí %[1]s`
+pulls.auto_merge_newly_scheduled_comment=`naplánoval/a tuto žádost o sloučení na automatické sloučení, jakmile budou všechny kontroly úspěšné %[1]s`
+pulls.auto_merge_canceled_schedule_comment=`zrušil/a automatické sloučení této žádosti o sloučení, jakmile budou všechny kontroly úspěšné %[1]s`
 
-pulls.delete.title=Odstranit tento požadavek na natažení?
-pulls.delete.text=Opravdu chcete tento požadavek na natažení smazat? (Tím se trvale odstraní veškerý obsah. Pokud jej hodláte archivovat, zvažte raději jeho uzavření.)
+pulls.delete.title=Odstranit tuto žádost o sloučení?
+pulls.delete.text=Opravdu chcete odstranit tuto žádost o sloučení? (Tímto trvale odstraníte všechen obsah. Pokud jej chcete archivovat, zvažte raději jeho uzavření)
 
 
 pull.deleted_branch=(odstraněno):%s
@@ -1987,12 +1987,12 @@ signing.wont_sign.nokey=Tato instance nemá žádný klíč k podepsání tohoto
 signing.wont_sign.never=Commity nejsou nikdy podepsány.
 signing.wont_sign.always=Commity jsou vždy podepsány.
 signing.wont_sign.pubkey=Commit nebude podepsán, protože nemáte veřejný klíč spojený s vaším účtem.
-signing.wont_sign.twofa=Pro podepsání commitů musíte mít povoleno dvoufaktorové ověření.
+signing.wont_sign.twofa=Pro podepisování commitů musíte mít zapnuto dvoufázové ověření.
 signing.wont_sign.parentsigned=Commit nebude podepsán, protože nadřazený commit není podepsán.
 signing.wont_sign.basesigned=Sloučení nebude podepsáno, protože základní commit není podepsaný.
 signing.wont_sign.headsigned=Sloučení nebude podepsáno, protože hlavní revize není podepsána.
 signing.wont_sign.commitssigned=Sloučení nebude podepsáno, protože všechny přidružené revize nejsou podepsány.
-signing.wont_sign.approved=Sloučení nebude podepsáno, protože požadavek na natažení není schválen.
+signing.wont_sign.approved=Sloučení nebude podepsáno, protože žádost o sloučení není schválena.
 signing.wont_sign.not_signed_in=Nejste přihlášeni.
 
 ext_wiki=Externí wiki
@@ -2114,7 +2114,7 @@ settings.collaboration.write=Zápis
 settings.collaboration.read=Čtení
 settings.collaboration.owner=Vlastník
 settings.collaboration.undefined=Neurčeno
-settings.hooks=Webové háčky
+settings.hooks=Webhooky
 settings.githooks=Git hooky
 settings.basic_settings=Základní nastavení
 settings.mirror_settings=Nastavení zrcadla
@@ -2125,7 +2125,7 @@ settings.mirror_settings.docs.no_new_mirrors=Váš repozitář zrcadlí změny d
 settings.mirror_settings.docs.can_still_use=I když nemůžete upravit stávající zrcadla nebo vytvořit nová, stále můžete použít své stávající zrcadlo.
 settings.mirror_settings.docs.more_information_if_disabled=Více informací o zrcadlech pro nahrání a natažení naleznete zde:
 settings.mirror_settings.docs.doc_link_title=Jak mohu zrcadlit repozitáře?
-settings.mirror_settings.docs.pulling_remote_title=Stažení ze vzdáleného úložiště
+settings.mirror_settings.docs.pulling_remote_title=Stahování ze vzdáleného repozitáře
 settings.mirror_settings.mirrored_repository=Zrcadlený repozitář
 settings.mirror_settings.direction=Směr
 settings.mirror_settings.direction.pull=Natáhnout
@@ -2264,23 +2264,23 @@ settings.delete_team_tip=Tento tým má přístup ke všem repositářům a nem
 settings.remove_team_success=Přístup týmu k repozitáři byl odstraněn.
 settings.add_webhook=Přidat webhook
 settings.add_webhook.invalid_channel_name=Kanál webového háčku nemůže být prázdný a nemůže obsahovat pouze znak #.
-settings.hooks_desc=Webové háčky automaticky vytvářejí dotazy HTTP POST na server, když nastane určitá událost v Forgejo. Čtěte více v příručce webových háčků.
+settings.hooks_desc=Webhooky automaticky vytvářejí dotazy HTTP POST na server, když nastane určitá událost ve Forgejo. Více informací v příručce webhooků.
 settings.webhook_deletion=Odstranit webhook
 settings.webhook_deletion_desc=Odstranění webového háčku smaže jeho nastavení a historii doručení. Pokračovat?
-settings.webhook_deletion_success=Webový háček byl smazán.
+settings.webhook_deletion_success=Webhook byl smazán.
 settings.webhook.test_delivery=Test doručitelnosti
-settings.webhook.test_delivery_desc=Vyzkoušet tento webový háček pomocí falešné události.
-settings.webhook.test_delivery_desc_disabled=Chcete-li tento webový háček otestovat s falešnou událostí, aktivujte ho.
+settings.webhook.test_delivery_desc=Otestovat tento webhook pomocí falešné události.
+settings.webhook.test_delivery_desc_disabled=Chcete-li pomocí falešné události otestovat tento webhook, aktivujte ho.
 settings.webhook.request=Požadavek
 settings.webhook.response=Odpověď
 settings.webhook.headers=Hlavičky
 settings.webhook.payload=Obsah
 settings.webhook.body=Tělo zprávy
-settings.webhook.replay.description=Zopakovat tento webový háček.
-settings.webhook.replay.description_disabled=Chcete-li znovu spustit tento webový háček, aktivujte jej.
+settings.webhook.replay.description=Zopakovat tento webhook.
+settings.webhook.replay.description_disabled=Chcete-li zopakovat tento webhook, aktivujte jej.
 settings.webhook.delivery.success=Událost byla přidána do fronty doručení. Může to trvat několik sekund, než se zobrazí v historii doručení.
 settings.githooks_desc=Git hooks jsou spravovány samotným Gitem. Níže můžete upravit soubory hooků pro nastavení vlastních operací.
-settings.githook_edit_desc=Je-li háček neaktivní, bude zobrazen vzorový obsah. Nebude-li zadán žádný obsah, háček bude vypnut.
+settings.githook_edit_desc=Je-li webhook neaktivní, bude zobrazen vzorový obsah. Ponechte prázdné pro zakázání tohoto webhooku.
 settings.githook_name=Název hooku
 settings.githook_content=Obsah hooku
 settings.update_githook=Upravit hook
@@ -2303,7 +2303,7 @@ settings.event_create=Vytvořit
 settings.event_create_desc=Větev nebo značka vytvořena.
 settings.event_delete=Smazat
 settings.event_delete_desc=Větev nebo značka smazána.
-settings.event_fork=Rozštěpit
+settings.event_fork=Fork
 settings.event_fork_desc=Repozitář rozštěpen.
 settings.event_wiki=Wiki
 settings.event_wiki_desc=Wiki stránka vytvořena, přejmenována nebo smazána.
@@ -2348,9 +2348,9 @@ settings.authorization_header=Autorizační hlavička
 settings.authorization_header_desc=Pokud vyplněno, bude připojeno k požadavkům jako autorizační hlavička. Příklady: %s.
 settings.active=Aktivní
 settings.active_helper=Informace o spuštěných událostech budou odeslány na URL webového háčku.
-settings.add_hook_success=Webový háček byl přidán.
+settings.add_hook_success=Webhook byl přidán.
 settings.update_webhook=Upravit webhook
-settings.update_hook_success=Webový háček byl aktualizován.
+settings.update_hook_success=Webhook byl aktualizován.
 settings.delete_webhook=Odstranit webhook
 settings.recent_deliveries=Nedávná doručení
 settings.hook_type=Typ hooku
@@ -2582,7 +2582,7 @@ diff.hide_file_tree=Skrýt souborový strom
 
 releases.desc=Sledování verzí projektu a souborů ke stažení.
 release.releases=Vydání
-release.detail=Podrobnosti vydání
+release.detail=Podrobnosti o vydání
 release.tags=Značky
 release.new_release=Nové vydání
 release.draft=Koncept
@@ -2727,7 +2727,7 @@ settings.pull_mirror_sync_in_progress = Probíhá načítání změn ze vzdálen
 settings.enter_repo_name = Zadejte majitele a repozitář přesně tak, jak je vidíte níže:
 settings.mirror_settings.docs.disabled_push_mirror.pull_mirror_warning = Tuto akci lze v současné chvíli provést pouze v nabídce „Nová migrace“. Pro více informací viz:
 settings.new_owner_blocked_doer = Nový majitel vás zablokoval.
-settings.mirror_settings.pushed_repository = Pushnutý repozitář
+settings.mirror_settings.pushed_repository = Odeslaný repozitář
 settings.add_collaborator_blocked_our = Nepodařilo se přidat spolupracovníka, jelikož byl zablokován majitelem repozitáře.
 pulls.commit_ref_at = `se odkázal na tuto žádost o sloučení z commitu %[2]s`
 settings.wiki_rename_branch_main = Normalizovat název větve Wiki
@@ -2783,8 +2783,8 @@ settings.enforce_on_admins_desc = Správci repozitáře nemohou obejít toto pra
 issues.num_participants_one = %d účastník
 size_format = %[1]s: %[2]s, %[3]s: %[4]s
 issues.archived_label_description = (Archivován) %s
-release.download_count_one = %d stažení
-release.download_count_few = %d stažení
+release.download_count_one = %s stažení
+release.download_count_few = %s stažení
 release.system_generated = Tato příloha byla automaticky vygenerována.
 settings.add_webhook.invalid_path = Cesta nesmí obsahovat část, která je „.“ nebo „..“ nebo prázdný řetězec. Nesmí začínat ani končit lomítkem.
 settings.web_hook_name_sourcehut_builds = Sestavení SourceHut
@@ -2885,7 +2885,7 @@ settings.email=Kontaktní e-mail
 settings.website=Webové stránky
 settings.location=Umístění
 settings.permission=Oprávnění
-settings.repoadminchangeteam=Správce úložišť může týmům přidávat a odebírat přístup
+settings.repoadminchangeteam=Správce repozitářů může týmům přidávat a odebírat přístup
 settings.visibility=Viditelnost
 settings.visibility.public=Veřejná
 settings.visibility.limited=Omezená (viditelné pouze pro ověřené uživatele)
@@ -2904,7 +2904,7 @@ settings.delete_prompt=Organizace bude trvale odstraněna. Tato změna N
 settings.confirm_delete_account=Potvrdit odstranění
 settings.delete_org_title=Odstranit organizaci
 settings.delete_org_desc=Tato organizace bude trvale smazána. Pokračovat?
-settings.hooks_desc=Přidat webové háčky, které budou spouštěny pro všechny repozitáře v této organizaci.
+settings.hooks_desc=Přidat webhooky, které budou spouštěny pro všechny repozitáře v této organizaci.
 
 settings.labels_desc=Přidejte štítky, které mohou být použity pro problémy všech repozitářů v rámci této organizace.
 
@@ -2983,7 +2983,7 @@ identity_access=Identita a přístup
 users=Uživatelské účty
 organizations=Organizace
 repositories=Repozitáře
-hooks=Webové háčky
+hooks=Webhooky
 integrations=Integrace
 authentication=Zdroje ověření
 emails=Uživatelské e-maily
@@ -3183,12 +3183,12 @@ packages.size=Velikost
 packages.published=Publikováno
 
 defaulthooks=Výchozí webhooky
-defaulthooks.add_webhook=Přidat výchozí webový háček
-defaulthooks.update_webhook=Aktualizovat výchozí webový háček
+defaulthooks.add_webhook=Přidat výchozí webhook
+defaulthooks.update_webhook=Aktualizovat výchozí webhook
 
 systemhooks=Systémové webhooky
-systemhooks.add_webhook=Přidat systémový webový háček
-systemhooks.update_webhook=Aktualizovat systémový webový háček
+systemhooks.add_webhook=Přidat systémový webhook
+systemhooks.update_webhook=Aktualizovat systémový webhook
 
 auths.auth_manage_panel=Správa zdrojů ověřování
 auths.new=Přidat zdroj ověřování
@@ -3636,7 +3636,7 @@ error.unit_not_allowed=Nejste oprávněni přistupovat k této části repozitá
 [packages]
 title=Balíčky
 desc=Správa balíčků repozitáře.
-empty=Zatím nejsou žádné balíčky.
+empty=Zatím zde nejsou žádné balíčky.
 empty.documentation=Další informace o registru balíčků naleznete v dokumentaci.
 empty.repo=Nahráli jste balíček, ale nezobrazil se zde? Přejděte na nastavení balíčku a propojte jej s tímto repozitářem.
 registry.documentation=Další informace o registru %s naleznete v dokumentaci.
@@ -3754,7 +3754,7 @@ settings.delete.success=Balíček byl odstraněn.
 settings.delete.error=Nepodařilo se odstranit balíček.
 owner.settings.cargo.title=Index registru Cargo
 owner.settings.cargo.initialize=Inicializovat index
-owner.settings.cargo.initialize.description=Pro použití Cargo registru je zapotřebí speciální index Git. Použití této možnosti (znovu)vytvoří repozitář a automaticky jej nastaví.
+owner.settings.cargo.initialize.description=Pro použití registru Cargo je zapotřebí speciální index Git. Použití této možnosti (znovu) vytvoří repozitář a automaticky jej nastaví.
 owner.settings.cargo.initialize.error=Nepodařilo se inicializovat Cargo index: %v
 owner.settings.cargo.initialize.success=Index Cargo byl úspěšně vytvořen.
 owner.settings.cargo.rebuild=Znovu vytvořit index
@@ -3893,7 +3893,7 @@ workflow.disabled=Pracovní postup je zakázán.
 variables=Proměnné
 variables.management=Správa proměnných
 variables.creation=Přidat proměnnou
-variables.none=Zatím nejsou žádné proměnné.
+variables.none=Zatím zde nejsou žádné proměnné.
 variables.deletion=Odstranit proměnnou
 variables.deletion.description=Odstranění proměnné je trvalé a nelze jej vrátit zpět. Pokračovat?
 variables.description=Proměnné budou předány určitým akcím a nelze je přečíst jinak.
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
index b112ec82c3..a0c2c0c1fa 100644
--- a/options/locale/locale_de-DE.ini
+++ b/options/locale/locale_de-DE.ini
@@ -2434,7 +2434,7 @@ settings.require_signed_commits_desc=Pushes auf diesen Branch ablehnen, wenn Com
 settings.protect_branch_name_pattern=Muster für geschützte Branchnamen
 settings.protect_patterns=Muster
 settings.protect_protected_file_patterns=Geschützte Dateimuster (durch Semikolon „;“ getrennt)
-settings.protect_protected_file_patterns_desc=Geschützte Dateien dürfen nicht direkt geändert werden, auch wenn der Benutzer Rechte hat, Dateien in diesem Branch hinzuzufügen, zu bearbeiten oder zu löschen. Mehrere Muster können mit Semikolon („;“) getrennt werden. Siehe github.com/gobwas/glob Dokumentation zur Mustersyntax. Beispiele: .drone.yml, /docs/**/*.txt.
+settings.protect_protected_file_patterns_desc=Geschützte Dateien dürfen nicht direkt geändert werden, auch wenn der Benutzer Rechte hat, Dateien in diesem Branch hinzuzufügen, zu bearbeiten oder zu löschen. Mehrere Muster können mit Semikolon („;“) getrennt werden. Siehe %s Dokumentation zur Mustersyntax. Beispiele: .drone.yml, /docs/**/*.txt.
 settings.protect_unprotected_file_patterns=Ungeschützte Dateimuster (durch Semikolon „;“ getrennt)
 settings.protect_unprotected_file_patterns_desc=Ungeschützte Dateien, die direkt geändert werden dürfen, wenn der Benutzer Schreibzugriff hat, können die Push-Beschränkung umgehen. Mehrere Muster können mit Semikolon („;“) getrennt werden. Siehe %[2]s Dokumentation zur Mustersyntax. Beispiele: .drone.yml, /docs/**/*.txt.
 settings.add_protected_branch=Schutz aktivieren
@@ -3974,7 +3974,7 @@ issues.write = Schreiben: Issues schließen und Metadaten wie Labels, Mei
 pulls.read = Lesen: Pull-Requests lesen und erstellen.
 releases.read = Lesen: Releases ansehen und herunterladen.
 releases.write = Schreiben: Releases und ihre Assets veröffentlichen, bearbeiten und löschen.
-wiki.read = Read: Das integrierte Wiki und seine Historie lesen.
+wiki.read = Lesen: Das integrierte Wiki und seine Historie lesen.
 wiki.write = Schreiben: Seiten im integrierten Wiki erstellen, aktualisieren und löschen.
 projects.read = Lesen: Zugriff auf Projektboards des Repositories.
 projects.write = Schreiben: Projekte und Spalten erstellen und bearbeiten.
diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini
index 2df8dce95d..5227c8a7fc 100644
--- a/options/locale/locale_el-GR.ini
+++ b/options/locale/locale_el-GR.ini
@@ -2442,7 +2442,7 @@ settings.protect_branch_name_pattern=Μοτίβο προστατευμένου 
 settings.protect_branch_name_pattern_desc=Μοτίβα ονόματος προστατευμένων κλάδων. Συμβολευτείτε την τεκμηρίωση για την σύνταξη ενός μοτίβου. Παραδείγματα: main, release/**
 settings.protect_patterns=Μοτίβα
 settings.protect_protected_file_patterns=Μοτίβα προστατευμένων αρχείων (διαχωρισμός με semicolon «;» και ΟΧΙ το ελληνικό ερωτηματικό):
-settings.protect_protected_file_patterns_desc=Τα προστατευόμενα αρχεία δεν επιτρέπεται να αλλάξουν άμεσα, ακόμη και αν ο χρήστης έχει δικαιώματα να προσθέσει, να επεξεργαστεί ή να διαγράψει αρχεία σε αυτόν τον κλάδο. Επιπλέων μοτίβα μπορούν να διαχωριστούν με semicolon («;») (ΟΧΙ ερωτηματικό). Για να συντάξετε μοτίβα, συμβουλευτείται την τεκμηρίωση github.com/gobwas/glob. Παράδειγμα: .drone.yml, /docs/**/*.txt.
+settings.protect_protected_file_patterns_desc=Τα προστατευόμενα αρχεία δεν επιτρέπεται να αλλάξουν άμεσα, ακόμη και αν ο χρήστης έχει δικαιώματα να προσθέσει, να επεξεργαστεί ή να διαγράψει αρχεία σε αυτόν τον κλάδο. Επιπλέων μοτίβα μπορούν να διαχωριστούν με semicolon («;») (ΟΧΙ ερωτηματικό). Για να συντάξετε μοτίβα, συμβουλευτείται την τεκμηρίωση %s. Παράδειγμα: .drone.yml, /docs/**/*.txt.
 settings.protect_unprotected_file_patterns=Μοτίβα μη προστατευμένων αρχείων (διαχωρισμένα με semicolon «;» και ΟΧΙ το ελληνικό ερωτηματικό):
 settings.protect_unprotected_file_patterns_desc=Μη προστατευμένα αρχεία που επιτρέπεται να αλλάξουν απευθείας εάν ο χρήστης έχει πρόσβαση εγγραφής, παρακάμπτοντας τον περιορισμό ώθησης. Επιπλέων μοτίβα μπορούν να διαχωριστούν με ερωτηματικό (';'). Δείτε την τεκμηρίωση %[2]s για τη σύνταξη του μοτίβου. Πχ: .drone.yml, /docs/**/*.txt.
 settings.add_protected_branch=Ενεργοποίηση προστασίας
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
index d08770321c..6c55dcb1c6 100644
--- a/options/locale/locale_es-ES.ini
+++ b/options/locale/locale_es-ES.ini
@@ -2431,7 +2431,7 @@ settings.require_signed_commits_desc=Rechazar push en esta rama si los commits n
 settings.protect_branch_name_pattern=Patrón de nombre de ramas protegidas
 settings.protect_patterns=Patrones
 settings.protect_protected_file_patterns=Patrones de archivos protegidos (separados con punto y coma ';')
-settings.protect_protected_file_patterns_desc=No está permitido cambiar archivos directamente incluso si el usuario tiene permiso para agregar, editar o borrar archivos en esta rama. Múltiples patrones pueden separarse usando punto y coma (';'). Refvisa la documentación de github.com/gobwas/glob para la sintaxis de patrones. Ejemplos: .drone.yml, /docs/**/*.txt.
+settings.protect_protected_file_patterns_desc=No está permitido cambiar archivos directamente incluso si el usuario tiene permiso para agregar, editar o borrar archivos en esta rama. Múltiples patrones pueden separarse usando punto y coma (';'). Refvisa la documentación de %s para la sintaxis de patrones. Ejemplos: .drone.yml, /docs/**/*.txt.
 settings.protect_unprotected_file_patterns=Patrones de archivos sin protección (separados con punto y coma ";")
 settings.protect_unprotected_file_patterns_desc=Los archivos sin protección se pueden cambiar directamente si el usuario tiene acceso de escritura, evitando la restricción push. Múltiples patrones pueden separarse usando punto y coma (';'). Vea la documentación de %[2]s para la sintaxis de patrones. Ejemplos: .drone.yml, /docs/**/*.txt.
 settings.add_protected_branch=Activar protección
diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini
index 0af24db9e1..f1e109c953 100644
--- a/options/locale/locale_fa-IR.ini
+++ b/options/locale/locale_fa-IR.ini
@@ -15,9 +15,9 @@ page=صفحه
 template=قالب
 language=زبان
 notifications=اعلان‌ها
-active_stopwatch=فعال کردن ثبت زمان
+active_stopwatch=فعال کردن ردیاب زمان
 create_new=ایجاد…
-user_profile_and_more=پروفایل و تنظیمات…
+user_profile_and_more=نمایه و تنظیمات…
 signed_in_as=ورود به عنوان
 toc=فهرست محتویات
 licenses=گواهینامه ها
diff --git a/options/locale/locale_fil.ini b/options/locale/locale_fil.ini
index 5ac699359a..b0c515dccb 100644
--- a/options/locale/locale_fil.ini
+++ b/options/locale/locale_fil.ini
@@ -2008,6 +2008,8 @@ settings.mirror_settings.docs.disabled_push_mirror.info = Na-disable ng iyong ta
 settings.mirror_settings.docs.disabled_push_mirror.instructions = I-set up ang iyong proyekto na awtomatikong hilahin ang mga commit, tag at branch mula sa isa pang repositoryo.
 settings.mirror_settings.docs.disabled_pull_mirror.instructions = I-set up ang iyong proyekto na awtomatikong magtulak ng mga commit, tag at branch sa isa pang repositoryo. Na-disable ng iyong tagapangasiwa ng site ang mga pull mirror.
 activity.overview = Pangkalahatang Ideya
+mirror_public_key = Pampublikong susi ng SSH
+milestones.cancel = 
 
 [search]
 commit_kind = Maghanap ng mga commit...
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
index 0df97ec31b..3921d118e3 100644
--- a/options/locale/locale_fr-FR.ini
+++ b/options/locale/locale_fr-FR.ini
@@ -2922,7 +2922,7 @@ teams.can_create_org_repo=Créer des dépôts
 teams.can_create_org_repo_helper=Les membres peuvent créer de nouveaux dépôts dans l'organisation. Le créateur obtiendra l'accès administrateur au nouveau dépôt.
 teams.none_access=Aucun accès
 teams.none_access_helper=Les membres ne peuvent voir ou faire quoi que ce soit sur cette partie. Sans effet pour les dépôts publics.
-teams.general_access=Accès général
+teams.general_access=Accès personnalisé
 teams.general_access_helper=Les permissions des membres seront déterminées par la table des permissions ci-dessous.
 teams.read_access=Lecture
 teams.read_access_helper=Les membres peuvent voir et cloner les dépôts de l'équipe.
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
index f6fcd5135f..6b7de91462 100644
--- a/options/locale/locale_it-IT.ini
+++ b/options/locale/locale_it-IT.ini
@@ -2742,7 +2742,7 @@ settings.protect_status_check_patterns_desc = Inserisci sequenze per specificare
 settings.authorization_header_desc = Verrà inclusa come intestazione dell'autorizzazione per le richieste quando presente. Esempi: %s.
 pulls.title_desc_one = vuole fondere %[1]d commit da %[2]s in %[3]s
 settings.protect_unprotected_file_patterns_desc = File non protetti dei quali è consentita la modifica direttamente se l'utente ha permesso di scrittura, saltandole restrizioni di immissione. Più sequenze possono essere separate usando il punto e virgola (";"). Vedi la documentazione su %[2]s per la sintassi delle sequenze glob. Esempi .drone.yml, /docs/**/*.txt.
-settings.protect_protected_file_patterns_desc = I file non protetti non possono essere modificati direttamente neanche se l'utente ha il permesso di aggiungere, modificare o eliminare file in questo ramo. Più sequenze possono essere separate usando il punto e virgola (";"). Vedi la documentazione su github.com/gobwas/glob per la sintassi della sequenze. Esempi: .drone.yml, /docs/**/*.txt.
+settings.protect_protected_file_patterns_desc = I file non protetti non possono essere modificati direttamente neanche se l'utente ha il permesso di aggiungere, modificare o eliminare file in questo ramo. Più sequenze possono essere separate usando il punto e virgola (";"). Vedi la documentazione su %s per la sintassi della sequenze. Esempi: .drone.yml, /docs/**/*.txt.
 settings.protect_no_valid_status_check_patterns = Nessuna sequenza valida per il controllo dello stato.
 settings.event_pull_request_review_request_desc = Richiesta la revisione della richiesta di modifica o richiesta di revisione rimossa.
 stars = Stelle
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
index fba7f37808..b7cd2ae5d1 100644
--- a/options/locale/locale_ja-JP.ini
+++ b/options/locale/locale_ja-JP.ini
@@ -2413,7 +2413,7 @@ settings.protect_branch_name_pattern=保護ブランチ名のパターン
 settings.protect_branch_name_pattern_desc=保護ブランチ名のパターン。書き方については ドキュメント を参照してください。例: main, release/**
 settings.protect_patterns=パターン
 settings.protect_protected_file_patterns=保護されるファイルのパターン (セミコロン';'で区切る):
-settings.protect_protected_file_patterns_desc=保護されたファイルは、このブランチにファイルを追加・編集・削除する権限を持つユーザーであっても、直接変更することができなくなります。 セミコロン(';')で区切って複数のパターンを指定できます。 パターンの文法については github.com/gobwas/glob を参照してください。 例: .drone.yml, /docs/**/*.txt
+settings.protect_protected_file_patterns_desc=保護されたファイルは、このブランチにファイルを追加・編集・削除する権限を持つユーザーであっても、直接変更することができなくなります。 セミコロン(';')で区切って複数のパターンを指定できます。 パターンの文法については %s を参照してください。 例: .drone.yml, /docs/**/*.txt
 settings.protect_unprotected_file_patterns=保護しないファイルのパターン (セミコロン';'で区切る):
 settings.protect_unprotected_file_patterns_desc=保護しないファイルは、ユーザーに書き込み権限があればプッシュ制限をバイパスして直接変更できます。 セミコロン(';')で区切って複数のパターンを指定できます。 パターンの文法については %[2]s を参照してください。 例: .drone.yml, /docs/**/*.txt
 settings.add_protected_branch=保護を有効にする
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
index f4616cd1ff..48c739bb30 100644
--- a/options/locale/locale_lv-LV.ini
+++ b/options/locale/locale_lv-LV.ini
@@ -2323,7 +2323,7 @@ settings.protect_branch_name_pattern=Aizsargātā zara šablons
 settings.protect_branch_name_pattern_desc=Aizsargāto atzaru nosaukumu šabloni. Šablonu pierakstu skatīt dokumentācijā. Piemēri: main, release/**
 settings.protect_patterns=Šabloni
 settings.protect_protected_file_patterns=Aizsargāto failu šablons (vairākus var norādīt atdalot ar semikolu ';'):
-settings.protect_protected_file_patterns_desc=Aizsargātie faili, ko nevar mainīt, pat ja lietotājam ir tiesības veidot jaunus, labot vai dzēst failus šajā atzarā. Vairākus šablons ir iespējams norādīt atdalot tos ar semikolu (';'). Sīkāka informācija par šabloniem pieejama github.com/gobwas/glob dokumentācijā. Piemēram, .drone.yml, /docs/**/*.txt.
+settings.protect_protected_file_patterns_desc=Aizsargātie faili, ko nevar mainīt, pat ja lietotājam ir tiesības veidot jaunus, labot vai dzēst failus šajā atzarā. Vairākus šablons ir iespējams norādīt atdalot tos ar semikolu (';'). Sīkāka informācija par šabloniem pieejama %s dokumentācijā. Piemēram, .drone.yml, /docs/**/*.txt.
 settings.protect_unprotected_file_patterns=Neaizsargāto failu šablons (vairākus var norādīt atdalot ar semikolu ';'):
 settings.protect_unprotected_file_patterns_desc=Neaizsargātie faili, ko iespējams mainīt apejot iesūtīšanas ierobežojumus, ja lietotājam ir tiesības iesūtīt izmaiņas šajā atzarā. Vairākus šablons ir iespējams norādīt atdalot tos ar semikolu (';'). Sīkāka informācija par šabloniem pieejama %[2]s dokumentācijā. Piemēram, .drone.yml, /docs/**/*.txt.
 settings.add_protected_branch=Iespējot aizsargāšanu
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
index baec116282..d254036e36 100644
--- a/options/locale/locale_nl-NL.ini
+++ b/options/locale/locale_nl-NL.ini
@@ -1356,7 +1356,7 @@ commit.cherry-pick-content=Selecteer een branch om te cherry-pick op:
 commitstatus.error=Fout
 commitstatus.pending=In behandeling
 
-ext_issues=Toegang tot externe issues
+ext_issues=Externe issues
 ext_issues.desc=Koppelen aan een externe kwestie-tracker.
 
 projects=Projecten
@@ -1503,9 +1503,9 @@ issues.context.quote_reply=Citeer antwoord
 issues.context.reference_issue=Verwijs in een nieuwe issue
 issues.context.edit=Bewerken
 issues.context.delete=Verwijder
-issues.close_comment_issue=Reageer en sluit
+issues.close_comment_issue=Sluit met commentaar
 issues.reopen_issue=Heropen
-issues.reopen_comment_issue=Reageer en heropen
+issues.reopen_comment_issue=Heropen met commentaar
 issues.create_comment=Reageer
 issues.closed_at=`heeft dit probleem gesloten %[2]s`
 issues.reopened_at=`heropende dit probleem %[2]s`
@@ -1811,7 +1811,7 @@ milestones.filter_sort.most_issues=Meeste problemen
 milestones.filter_sort.least_issues=Minste problemen
 
 
-ext_wiki=Toegang tot externe wiki
+ext_wiki=Externe wiki
 ext_wiki.desc=Koppelen aan een externe wiki.
 
 wiki=Wiki
@@ -2692,7 +2692,7 @@ settings.wiki_rename_branch_main_notices_2 = Dit zal de interne branch van %s's
 settings.trust_model.collaborator.desc = Geldige handtekeningen van samenwerkers van deze repository worden als "vertrouwd" gemarkeerd - (of ze nu overeenkomen met de committer of niet). Anders worden geldige handtekeningen gemarkeerd als "niet-vertrouwd" als de handtekening overeenkomt met de committer en "niet-gematcht" als dat niet het geval is.
 settings.trust_model.committer.desc = Geldige handtekeningen zullen alleen "vertrouwd" gemarkeerd worden als ze overeenkomen met de committer, anders zullen ze gemarkeerd worden als "ongeëvenaard". Dit dwingt Forgejo om de committer te zijn op ondertekende commits met de werkelijke committer gemarkeerd als Co-authored-by: en Co-committed-by: aanhanger in de commit. De standaard Forgejo sleutel moet overeenkomen met een gebruiker in de database.
 settings.pulls.enable_autodetect_manual_merge = Handmatig samenvoegen met autodetectie inschakelen (Opmerking: In sommige speciale gevallen kunnen hierdoor verkeerde beoordelingen optreden)
-settings.protect_protected_file_patterns_desc = Beschermde bestanden mogen niet direct gewijzigd worden, zelfs als de gebruiker rechten heeft om bestanden in deze branch toe te voegen, te bewerken of te verwijderen. Meerdere patronen kunnen gescheiden worden met een puntkomma (";"). Zie github.com/gobwas/glob documentatie voor patroon syntax. Voorbeelden: .drone.yml, /docs/**/*.txt.
+settings.protect_protected_file_patterns_desc = Beschermde bestanden mogen niet direct gewijzigd worden, zelfs als de gebruiker rechten heeft om bestanden in deze branch toe te voegen, te bewerken of te verwijderen. Meerdere patronen kunnen gescheiden worden met een puntkomma (";"). Zie %s documentatie voor patroon syntax. Voorbeelden: .drone.yml, /docs/**/*.txt.
 wiki.delete_page_notice_1 = Het verwijderen van de wikipagina "%s" kan niet ongedaan worden gemaakt. Doorgaan?
 wiki.reserved_page = De wikipaginanaam "%s" is gereserveerd.
 activity.navbar.pulse = Puls
@@ -3959,4 +3959,9 @@ filepreview.truncated = Voorbeeld is ingekort
 
 
 [translation_meta]
-test = Oké
\ No newline at end of file
+test = Oké
+
+[repo.permissions]
+code.write = Schrijven: Push naar de repositorie, maak branches en tags.
+code.read = Lezen: Toegang en clone de code van de repository.
+issues.read = Lezen: Lees en maak issues en commentaren.
\ No newline at end of file
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
index a0e5acc060..1b1ae6882f 100644
--- a/options/locale/locale_pt-BR.ini
+++ b/options/locale/locale_pt-BR.ini
@@ -2370,7 +2370,7 @@ settings.require_signed_commits_desc=Rejeitar pushes para este branch se não es
 settings.protect_branch_name_pattern=Padrão de Nome de Branch Protegida
 settings.protect_patterns=Padrões
 settings.protect_protected_file_patterns=Padrões de arquivos protegidos (separados usando ponto e vírgula ';'):
-settings.protect_protected_file_patterns_desc=Arquivos protegidos não podem ser alterados diretamente, mesmo que o usuário tenha direitos para adicionar, editar ou excluir arquivos neste branch. Vários padrões podem ser separados usando ponto e vírgula (';'). Consulte a documentação github.com/gobwas/glob para a sintaxe padrão. Exemplos: .drone.yml, /docs/**/*.txt.
+settings.protect_protected_file_patterns_desc=Arquivos protegidos não podem ser alterados diretamente, mesmo que o usuário tenha direitos para adicionar, editar ou excluir arquivos neste branch. Vários padrões podem ser separados usando ponto e vírgula (';'). Consulte a documentação %s para a sintaxe padrão. Exemplos: .drone.yml, /docs/**/*.txt.
 settings.protect_unprotected_file_patterns=Padrões de arquivos desprotegidos (separados usando ponto e vírgula ';'):
 settings.protect_unprotected_file_patterns_desc=Arquivos não protegidos que podem ser alterados diretamente se o usuário tiver acesso de gravação, ignorando as restrições de push. Vários padrões podem ser separados usando ponto e vírgula (\;'). Veja %[2]s documentação para sintaxe de padrões. Exemplos: .drone.yml, /docs/**/*.txt.
 settings.add_protected_branch=Habilitar proteção
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
index 7f2bb86b79..ae912f3ffb 100644
--- a/options/locale/locale_pt-PT.ini
+++ b/options/locale/locale_pt-PT.ini
@@ -2458,7 +2458,7 @@ settings.protect_branch_name_pattern=Padrão do nome do ramo protegido
 settings.protect_branch_name_pattern_desc=Padrões de nomes de ramos protegidos. Consulte a documentação para ver a sintaxe dos padrões. Exemplos: main, release/**
 settings.protect_patterns=Padrões
 settings.protect_protected_file_patterns=Padrões de ficheiros protegidos (separados com ponto e vírgula ";")
-settings.protect_protected_file_patterns_desc=Ficheiros protegidos não podem ser modificados imediatamente, mesmo que o utilizador tenha direitos para adicionar, editar ou eliminar ficheiros neste ramo. Múltiplos padrões podem ser separados com ponto e vírgula (";"). Veja a documentação em github.com/gobwas/glob para ver a sintaxe. Exemplos: .drone.yml, /docs/**/*.txt.
+settings.protect_protected_file_patterns_desc=Ficheiros protegidos não podem ser modificados imediatamente, mesmo que o utilizador tenha direitos para adicionar, editar ou eliminar ficheiros neste ramo. Múltiplos padrões podem ser separados com ponto e vírgula (";"). Veja a documentação em %s para ver a sintaxe. Exemplos: .drone.yml, /docs/**/*.txt.
 settings.protect_unprotected_file_patterns=Padrões de ficheiros desprotegidos (separados com ponto e vírgula ";")
 settings.protect_unprotected_file_patterns_desc=Ficheiros desprotegidos que podem ser modificados imediatamente se o utilizador tiver direitos de escrita, contornando a restrição no envio. Padrões múltiplos podem ser separados com ponto e vírgula (";"). Veja a documentação em %[2]s para ver a sintaxe. Exemplos: .drone.yml, /docs/**/*.txt.
 settings.add_protected_branch=Habilitar salvaguarda
@@ -3954,4 +3954,24 @@ filepreview.line = Linha %[1]d em %[2]s
 filepreview.truncated = A previsão foi truncada
 
 [translation_meta]
-test = ok
\ No newline at end of file
+test = ok
+
+[repo.permissions]
+code.read = Ler: Aceder e clonar o código-fonte do repositório.
+releases.read = Ler: Ver e descarregar lançamentos.
+projects.read = Ler: Aceder aos quadros de planeamento do repositório.
+projects.write = Escrever: Criar planeamentos e colunas e editá-las.
+packages.read = Ler: Ver e descarregar pacotes atribuídos ao repositório.
+packages.write = Escrever: Publicar e eliminar pacotes atribuídos ao repositório.
+actions.read = Ler: Ver canais CI/CD integrados e os seus registos.
+actions.write = Escrever: Despoletar, reiniciar, cancelar ou aprovar manualmente canais CI/CD pendentes.
+ext_issues = Aceder à ligação para um rastreador de questões externo. As permissões são geridas externamente.
+ext_wiki = Aceder à ligação para um wiki externo. As permissões são geridas externamente.
+issues.write = Escrever: Fechar questões e gerir metadados, tais como rótulos, etapas, encarregados, datas de vencimento e dependências.
+pulls.read = Ler: Ler e criar pedidos de integração.
+releases.write = Escrever: Publicar, editar e eliminar lançamentos e seus recursos.
+wiki.read = Ler: Ler o wiki integrado e o seu histórico.
+wiki.write = Escrever: Criar, modificar e eliminar páginas no wiki integrado.
+code.write = Escrever: Enviar para o repositório, criar ramos e etiquetas.
+issues.read = Ler: Ler e criar questões e comentários.
+pulls.write = Escrever: Fechar pedidos de integração e gerir metadados, tais como rótulos, etapas, encarregados, datas de vencimento e dependências.
\ No newline at end of file
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
index e13b1341c4..450118fed4 100644
--- a/options/locale/locale_ru-RU.ini
+++ b/options/locale/locale_ru-RU.ini
@@ -1019,7 +1019,7 @@ visibility.public=Публичный
 visibility.public_tooltip=Виден всем, кто может открыть этот сайт
 visibility.limited=Ограниченный
 visibility.limited_tooltip=Виден только зарегистрированным пользователям сайта
-visibility.private=Частный
+visibility.private=Скрытый
 visibility.private_tooltip=Виден только участникам организаций, в которых вы состоите
 blocked_users_none = Заблокированных пользователей нет.
 user_block_success = Пользователь заблокирован.
@@ -2410,7 +2410,7 @@ settings.protect_branch_name_pattern=Шаблон названий защищё
 settings.protect_branch_name_pattern_desc=Шаблоны названий защищённых ветвей. О синтаксисе шаблонов читайте в документации. Примеры: main, release/**
 settings.protect_patterns=Шаблоны
 settings.protect_protected_file_patterns=Шаблоны защищённых файлов, разделённые точкой с запятой «;»
-settings.protect_protected_file_patterns_desc=Защищенные файлы нельзя изменить напрямую, даже если пользователь имеет право добавлять, редактировать или удалять файлы в этой ветви. Можно указать несколько шаблонов, разделяя их точкой с запятой («;»). О синтаксисе шаблонов читайте в документации github.com/gobwas/glob . Примеры: .drone.yml, /docs/**/*.txt.
+settings.protect_protected_file_patterns_desc=Защищенные файлы нельзя изменить напрямую, даже если пользователь имеет право добавлять, редактировать или удалять файлы в этой ветви. Можно указать несколько шаблонов, разделяя их точкой с запятой («;»). О синтаксисе шаблонов читайте в документации %s . Примеры: .drone.yml, /docs/**/*.txt.
 settings.protect_unprotected_file_patterns=Шаблоны незащищённых файлов, разделённые точкой с запятой «;»
 settings.protect_unprotected_file_patterns_desc=Незащищенные файлы, которые допускается изменять напрямую, если пользователь имеет право на запись, несмотря на ограничение отправки изменений. Можно указать несколько шаблонов, разделяя их точкой с запятой («;»). О синтаксисе шаблонов читайте в документации %[2]s . Примеры: .drone.yml, /docs/**/*.txt.
 settings.add_protected_branch=Включить защиту
@@ -3967,4 +3967,20 @@ test = хи-хи!
 
 [repo.permissions]
 code.write = Запись: отправка изменений в репозиторий, создание веток и тегов.
-code.read = Чтение: доступ к исходному коду репозитория и клонированию.
\ No newline at end of file
+code.read = Чтение: просмотр и клонирование исходного кода репозитория.
+issues.read = Чтение: просмотр и создание задач и комментариев.
+pulls.read = Чтение: просмотр и открытие запросов слияний.
+releases.read = Чтение: просмотр выпусков и скачивание файлов.
+releases.write = Запись: публикация, изменение и удаление выпусков и их файлов.
+wiki.read = Чтение: просмотр страниц и истории редактирования встроенной вики.
+projects.write = Запись: создание и изменение проектов и колонок.
+packages.write = Запись: публикация и удаление пакетов в репозитории.
+projects.read = Чтение: просмотр проектов в репозитории.
+ext_wiki = Доступ ко ссылке на внешнюю вики. Настройка разрешений выполняется вне сайта.
+actions.read = Чтение: просмотр интегрированных конвейеров CI/CD и их логов.
+pulls.write = Запись: закрытие запросов слияний и изменение их метаданных: меток, этапа, назначений, срока выполнения и зависимостей и пр.
+issues.write = Запись: закрытие задач и изменение их метаданных: меток, этапа, назначений, срока выполнения и зависимостей и пр.
+actions.write = Запись: ручной запуск, перезапуск, отмена и одобрение работы конвейеров CI/CD.
+wiki.write = Запись: создание, изменение и удаление страниц во встроенной вики.
+packages.read = Чтение: просмотр и скачивание пакетов в репозитории.
+ext_issues = Доступ к ссылке на внешний трекер задач. Настройка разрешений выполняется вне сайта.
\ No newline at end of file
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
index 9aa99729d6..ef7903eb31 100644
--- a/options/locale/locale_tr-TR.ini
+++ b/options/locale/locale_tr-TR.ini
@@ -2344,7 +2344,7 @@ settings.protect_branch_name_pattern=Korunmuş Dal Adı Deseni
 settings.protect_branch_name_pattern_desc=Korunmuş dal isim desenleri. Desen sözdizimi için belgelere bakabilirsiniz. Örnekler: main, release/**
 settings.protect_patterns=Desenler
 settings.protect_protected_file_patterns=Korumalı dosya kalıpları (noktalı virgülle ayrılmış ';'):
-settings.protect_protected_file_patterns_desc=Kullanıcının bu dalda dosya ekleme, düzenleme veya silme hakları olsa bile doğrudan değiştirilmesine izin verilmeyen korumalı dosyalar. Birden çok desen noktalı virgül (';') kullanılarak ayrılabilir. Desen sözdizimi için github.com/gobwas/glob belgelerine bakın. Örnekler: .drone.yml, /docs/**/*.txt.
+settings.protect_protected_file_patterns_desc=Kullanıcının bu dalda dosya ekleme, düzenleme veya silme hakları olsa bile doğrudan değiştirilmesine izin verilmeyen korumalı dosyalar. Birden çok desen noktalı virgül (';') kullanılarak ayrılabilir. Desen sözdizimi için %s belgelerine bakın. Örnekler: .drone.yml, /docs/**/*.txt.
 settings.protect_unprotected_file_patterns=Korunmasız dosya desenleri (noktalı virgülle ayrılmış ';'):
 settings.protect_unprotected_file_patterns_desc=Kullanıcının yazma erişimi, itme kısıtlamasını atlama hakkı olduğunda doğrudan değiştirmesine izin verilen korunmasız dosyalar. Birden çok desen noktalı virgül (';') kullanılarak ayrılabilir. Desen söz dizimi için %[2]s belgelerine bakın. Örnekler: .drone.yml, /docs/**/*.txt.
 settings.add_protected_branch=Korumayı etkinleştir
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 7a1a77c3e5..42d601b8db 100644
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -1,6 +1,6 @@
 [common]
 home=首页
-dashboard=首页
+dashboard=控制面板
 explore=探索
 help=帮助
 logo=徽标
@@ -12,7 +12,7 @@ sign_up=注册
 link_account=链接账户
 register=注册
 version=当前版本
-powered_by=Powered by %s
+powered_by=由 %s 提供支持
 page=页面
 template=模板
 language=语言选项
@@ -77,7 +77,7 @@ forks=派生
 
 activities=最近活动
 pull_requests=合并请求
-issues=工单管理
+issues=工单
 milestones=里程碑
 
 ok=确定
@@ -109,7 +109,7 @@ copy_type_unsupported=无法复制此类型的文件内容
 
 write=撰写
 preview=预览
-loading=正在加载...
+loading=正在加载…
 
 error=错误
 error404=您正尝试访问的页面 不存在 或 您尚未被授权 查看该页面。
@@ -216,13 +216,13 @@ server_internal = 服务器内部错误
 [startpage]
 app_desc=一款极易搭建的自助 Git 服务
 install=易安装
-install_desc=通过 二进制 来运行；或者通过 docker 来运行；或者通过 安装包 来运行
+install_desc=通过 二进制 来运行；或者通过 docker 来运行；或者通过 安装包 来运行。
 platform=跨平台
 platform_desc=已证实可以在 Linux 和 FreeBSD 等自由操作系统以及不同的 CPU 架构上运行 Forgejo。挑一个您喜欢的就行！
 lightweight=轻量级
 lightweight_desc=一个廉价的树莓派的配置足以满足 Forgejo 的最低系统硬件要求。最大程度上节省您的服务器资源！
 license=开源化
-license_desc=所有的代码都开源在 Forgejo 上，赶快加入我们来共同发展这个伟大的项目！还等什么？成为贡献者吧！
+license_desc=取得 Forgejo！赶快加入我们来共同发展这个伟大的项目！还等什么？成为贡献者吧！
 
 [install]
 install=安装页面
@@ -235,7 +235,7 @@ host=数据库主机
 user=用户名
 password=数据库用户密码
 db_name=数据库名称
-db_schema=Schema
+db_schema=架构模式
 db_schema_helper=留空则数据库中默认值为("public")。
 ssl_mode=SSL
 path=数据库文件路径
@@ -259,8 +259,8 @@ app_name_helper=在此处输入您的实例名称。它将显示在所有页面
 repo_path=仓库根目录
 repo_path_helper=所有远程 Git 仓库将保存到此目录。
 lfs_path=LFS 根目录
-lfs_path_helper=存储为Git LFS的文件将被存储在此目录。留空禁用LFS
-run_user=以用户运行
+lfs_path_helper=存储为Git LFS的文件将被存储在此目录。留空以禁用LFS。
+run_user=要使用的用户身份
 run_user_helper=输入 Forgejo 运行的操作系统用户名。请注意，此用户必须具有对仓库根路径的访问权限。
 domain=服务器域名
 domain_helper=服务器的域名或主机地址。
@@ -426,7 +426,7 @@ invalid_code=此确认密钥无效或已过期。
 invalid_code_forgot_password=你的确认码无效或者已过期，点击 这里 开始新的会话。
 invalid_password=您的密码与用于创建账户的密码不匹配。
 reset_password_helper=恢复账户
-reset_password_wrong_user=您以 %s 登录，但恢复账号链接是用于 %s。
+reset_password_wrong_user=您以 %s 登录，但恢复账号链接适用于 %s
 password_too_short=密码长度不能少于 %d 位。
 non_local_account=非本地帐户不能通过 Forgejo 的 web 界面更改密码。
 verify=验证
@@ -443,7 +443,7 @@ oauth_signup_submit=完成账号
 oauth_signin_tab=绑定到现有帐号
 oauth_signin_title=登录以授权绑定帐户
 oauth_signin_submit=绑定账号
-oauth.signin.error=处理授权请求时出错。 如果此错误仍然存​​在，请联系站点管理员。
+oauth.signin.error=处理授权请求时出错。如果此错误仍然存在，请联系站点管理员。
 oauth.signin.error.access_denied=授权请求被拒绝。
 oauth.signin.error.temporarily_unavailable=授权失败，因为认证服务器暂时不可用。请稍后再试。
 openid_connect_submit=连接
@@ -675,7 +675,7 @@ Pronouns = 代称
 Biography = 简历
 
 [user]
-change_avatar=修改头像
+change_avatar=修改头像…
 joined_on=加入于 %s
 repositories=仓库列表
 activity=公开活动
@@ -759,7 +759,7 @@ language=界面语言
 ui=主题
 hidden_comment_types=隐藏的评论类型
 hidden_comment_types_description=此处选中的注释类型不会显示在问题页面中。比如，勾选”标签“删除所有 " 添加/删除的 

+

 	{{if .IsRepo}}{{template "repo/header" .}}{{end}}
 	

 		
404

diff --git a/templates/status/413.tmpl b/templates/status/413.tmpl
index 8248f601b2..75cb3d04a6 100644
--- a/templates/status/413.tmpl
+++ b/templates/status/413.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-

+

 	{{if .IsRepo}}{{template "repo/header" .}}{{end}}
 	

 		
413


From aad9e21f57d40edd628471f4035b4958b6453868 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Sun, 6 Oct 2024 00:03:58 +0000
Subject: [PATCH 096/443] Update module github.com/mattn/go-sqlite3 to v1.14.24

---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 1f1618775d..18af63e7c2 100644
--- a/go.mod
+++ b/go.mod
@@ -71,7 +71,7 @@ require (
 	github.com/lib/pq v1.10.9
 	github.com/markbates/goth v1.80.0
 	github.com/mattn/go-isatty v0.0.20
-	github.com/mattn/go-sqlite3 v1.14.22
+	github.com/mattn/go-sqlite3 v1.14.24
 	github.com/meilisearch/meilisearch-go v0.28.0
 	github.com/mholt/archiver/v3 v3.5.1
 	github.com/microcosm-cc/bluemonday v1.0.27
diff --git a/go.sum b/go.sum
index 5c52642881..f07d806d65 100644
--- a/go.sum
+++ b/go.sum
@@ -488,8 +488,8 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
 github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
-github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM=
+github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/meilisearch/meilisearch-go v0.28.0 h1:f3XJ66ZM+R8bANAOLqsjvoq/HhQNpVJPYoNt6QgNzME=
 github.com/meilisearch/meilisearch-go v0.28.0/go.mod h1:Szcc9CaDiKIfjdgdt49jlmDKpEzjD+x+b6Y6heMdlQ0=
 github.com/mholt/acmez/v2 v2.0.1 h1:3/3N0u1pLjMK4sNEAFSI+bcvzbPhRpY383sy1kLHJ6k=

From e4866d9c9a705be84030cfec56c70266363ea5a0 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Sun, 6 Oct 2024 00:04:15 +0000
Subject: [PATCH 097/443] Update actions/cache action to v4.1.0

---
 .forgejo/workflows/renovate.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml
index b455403f94..4f85d77f74 100644
--- a/.forgejo/workflows/renovate.yml
+++ b/.forgejo/workflows/renovate.yml
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Load renovate repo cache
-        uses: https://code.forgejo.org/actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: https://code.forgejo.org/actions/cache/restore@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0
         with:
           path: |
             .tmp/cache/renovate/repository
@@ -60,7 +60,7 @@ jobs:
 
       - name: Save renovate repo cache
         if: always() && env.RENOVATE_DRY_RUN != 'full'
-        uses: https://code.forgejo.org/actions/cache/save@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: https://code.forgejo.org/actions/cache/save@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0
         with:
           path: |
             .tmp/cache/renovate/repository

From 0875dbf3d70ac72e2296497db8c1bd3b3ed14bbc Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Sun, 6 Oct 2024 02:07:00 +0000
Subject: [PATCH 098/443] Update dependency @stylistic/eslint-plugin-js to
 v2.9.0

---
 package-lock.json | 12 ++++++------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 34ef06f317..fb5ec84ed4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -64,7 +64,7 @@
         "@eslint-community/eslint-plugin-eslint-comments": "4.4.0",
         "@playwright/test": "1.47.2",
         "@stoplight/spectral-cli": "6.13.1",
-        "@stylistic/eslint-plugin-js": "2.8.0",
+        "@stylistic/eslint-plugin-js": "2.9.0",
         "@stylistic/stylelint-plugin": "3.1.1",
         "@vitejs/plugin-vue": "5.1.4",
         "@vitest/coverage-v8": "2.1.2",
@@ -4477,14 +4477,14 @@
       }
     },
     "node_modules/@stylistic/eslint-plugin-js": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-js/-/eslint-plugin-js-2.8.0.tgz",
-      "integrity": "sha512-/e7pSzVMrwBd6yzSDsKHwax3TS96+pd/xSKzELaTkOuYqUhYfj/becWdfDbFSBGQD7BBBCiiE4L8L2cUfu5h+A==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-js/-/eslint-plugin-js-2.9.0.tgz",
+      "integrity": "sha512-h08DQybPsXxIvHIvQqU1tFWcu74M7kZK/0S0jVIDdoHSFq7jB+TzxikBWAg5j0lPR17WsGGGHAS8GHFlAAQXHA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "eslint-visitor-keys": "^4.0.0",
-        "espree": "^10.1.0"
+        "eslint-visitor-keys": "^4.1.0",
+        "espree": "^10.2.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
diff --git a/package.json b/package.json
index 6836cdd34c..903bc23e13 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "@eslint-community/eslint-plugin-eslint-comments": "4.4.0",
     "@playwright/test": "1.47.2",
     "@stoplight/spectral-cli": "6.13.1",
-    "@stylistic/eslint-plugin-js": "2.8.0",
+    "@stylistic/eslint-plugin-js": "2.9.0",
     "@stylistic/stylelint-plugin": "3.1.1",
     "@vitejs/plugin-vue": "5.1.4",
     "@vitest/coverage-v8": "2.1.2",

From 2bc47e81a39c64d9712627cb9fe154932fdd14bd Mon Sep 17 00:00:00 2001
From: Jason Song 
Date: Mon, 30 Sep 2024 10:28:09 +0800
Subject: [PATCH 099/443] Ensure `GetCSRF` doesn't return an empty token
 (#32130)

Since page templates keep changing, some pages that contained forms with
CSRF token no longer have them.

It leads to some calls of `GetCSRF` returning an empty string, which
fails the tests. Like

https://github.com/go-gitea/gitea/blob/3269b04d61ffe6a7ce462cd05ee150e4491124e8/tests/integration/attachment_test.go#L62-L63

The test did try to get the CSRF token and provided it, but it was
empty.

(cherry picked from commit 13283873e9d523d5a5557f55d64f702c1a9f76ec)

Conflicts:
	tests/integration/integration_test.go
  trivial context conflict
---
 tests/integration/attachment_test.go  | 9 +++------
 tests/integration/integration_test.go | 7 ++++++-
 tests/integration/org_test.go         | 4 ----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/tests/integration/attachment_test.go b/tests/integration/attachment_test.go
index 7cbc2545d5..7bd3e680f7 100644
--- a/tests/integration/attachment_test.go
+++ b/tests/integration/attachment_test.go
@@ -30,7 +30,7 @@ func generateImg() bytes.Buffer {
 	return buff
 }
 
-func createAttachment(t *testing.T, session *TestSession, repoURL, filename string, buff bytes.Buffer, expectedStatus int) string {
+func createAttachment(t *testing.T, session *TestSession, csrf, repoURL, filename string, buff bytes.Buffer, expectedStatus int) string {
 	body := &bytes.Buffer{}
 
 	// Setup multi-part
@@ -42,8 +42,6 @@ func createAttachment(t *testing.T, session *TestSession, repoURL, filename stri
 	err = writer.Close()
 	require.NoError(t, err)
 
-	csrf := GetCSRF(t, session, repoURL)
-
 	req := NewRequestWithBody(t, "POST", repoURL+"/issues/attachments", body)
 	req.Header.Add("X-Csrf-Token", csrf)
 	req.Header.Add("Content-Type", writer.FormDataContentType())
@@ -60,15 +58,14 @@ func createAttachment(t *testing.T, session *TestSession, repoURL, filename stri
 func TestCreateAnonymousAttachment(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 	session := emptyTestSession(t)
-	// this test is not right because it just doesn't pass the CSRF validation
-	createAttachment(t, session, "user2/repo1", "image.png", generateImg(), http.StatusBadRequest)
+	createAttachment(t, session, GetCSRF(t, session, "/user/login"), "user2/repo1", "image.png", generateImg(), http.StatusSeeOther)
 }
 
 func TestCreateIssueAttachment(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 	const repoURL = "user2/repo1"
 	session := loginUser(t, "user2")
-	uuid := createAttachment(t, session, repoURL, "image.png", generateImg(), http.StatusOK)
+	uuid := createAttachment(t, session, GetCSRF(t, session, repoURL), repoURL, "image.png", generateImg(), http.StatusOK)
 
 	req := NewRequest(t, "GET", repoURL+"/issues/new")
 	resp := session.MakeRequest(t, req, http.StatusOK)
diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go
index e43200f4cb..606df2ed1c 100644
--- a/tests/integration/integration_test.go
+++ b/tests/integration/integration_test.go
@@ -663,12 +663,17 @@ func VerifyJSONSchema(t testing.TB, resp *httptest.ResponseRecorder, schemaFile
 	require.NoError(t, schemaValidation)
 }
 
+// GetCSRF returns CSRF token from body
+// If it fails, it means the CSRF token is not found in the response body returned by the url with the given session.
+// In this case, you should find a better url to get it.
 func GetCSRF(t testing.TB, session *TestSession, urlStr string) string {
 	t.Helper()
 	req := NewRequest(t, "GET", urlStr)
 	resp := session.MakeRequest(t, req, http.StatusOK)
 	doc := NewHTMLParser(t, resp.Body)
-	return doc.GetCSRF()
+	csrf := doc.GetCSRF()
+	require.NotEmpty(t, csrf)
+	return csrf
 }
 
 func GetHTMLTitle(t testing.TB, session *TestSession, urlStr string) string {
diff --git a/tests/integration/org_test.go b/tests/integration/org_test.go
index a1e448be8a..f907b75c72 100644
--- a/tests/integration/org_test.go
+++ b/tests/integration/org_test.go
@@ -204,9 +204,7 @@ func TestTeamSearch(t *testing.T) {
 	var results TeamSearchResults
 
 	session := loginUser(t, user.Name)
-	csrf := GetCSRF(t, session, "/"+org.Name)
 	req := NewRequestf(t, "GET", "/org/%s/teams/-/search?q=%s", org.Name, "_team")
-	req.Header.Add("X-Csrf-Token", csrf)
 	resp := session.MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &results)
 	assert.NotEmpty(t, results.Data)
@@ -217,9 +215,7 @@ func TestTeamSearch(t *testing.T) {
 	// no access if not organization member
 	user5 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5})
 	session = loginUser(t, user5.Name)
-	csrf = GetCSRF(t, session, "/"+org.Name)
 	req = NewRequestf(t, "GET", "/org/%s/teams/-/search?q=%s", org.Name, "team")
-	req.Header.Add("X-Csrf-Token", csrf)
 	session.MakeRequest(t, req, http.StatusNotFound)
 }
 

From 388e7c9719da39cd4761a8c5bf58c43ee4127ec3 Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Sun, 6 Oct 2024 07:35:19 +0200
Subject: [PATCH 100/443] Ensure `GetCSRF` doesn't return an empty token
 (#32130) (followup)

Modifies the calls to createAttachment() for tests that do not exist
in Gitea.
---
 tests/integration/issue_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go
index 909242efc6..c5e24b0c00 100644
--- a/tests/integration/issue_test.go
+++ b/tests/integration/issue_test.go
@@ -500,7 +500,7 @@ func TestIssueCommentAttachment(t *testing.T) {
 	link, exists := htmlDoc.doc.Find("#comment-form").Attr("action")
 	assert.True(t, exists, "The template has changed")
 
-	uuid := createAttachment(t, session, repoURL, "image.png", generateImg(), http.StatusOK)
+	uuid := createAttachment(t, session, GetCSRF(t, session, repoURL), repoURL, "image.png", generateImg(), http.StatusOK)
 
 	commentCount := htmlDoc.doc.Find(".comment-list .comment .render-content").Length()
 

From b67b7c12385059898fc8cb7997755a88b3afa483 Mon Sep 17 00:00:00 2001
From: Zettat123 
Date: Tue, 1 Oct 2024 09:58:55 +0800
Subject: [PATCH 101/443] Fix the logic of finding the latest pull review
 commit ID (#32139)

Fix #31423

(cherry picked from commit f4b8f6fc40ce2869135372a5c6ec6418d27ebfba)

Conflicts:
	models/fixtures/comment.yml
  comment fixtures have to be shifted because there is one more in Forgejo
---
 models/fixtures/comment.yml               | 19 +++++++++++++
 models/fixtures/review.yml                | 19 +++++++++++++
 models/issues/pull.go                     |  2 +-
 models/issues/review.go                   |  2 +-
 models/issues/review_list.go              |  6 ++--
 models/issues/review_test.go              |  4 +--
 routers/api/v1/repo/pull_review.go        |  1 -
 services/pull/pull.go                     |  8 +++++-
 services/pull/review.go                   |  2 +-
 tests/integration/api_pull_review_test.go |  2 +-
 tests/integration/pull_commit_test.go     | 34 +++++++++++++++++++++++
 11 files changed, 88 insertions(+), 11 deletions(-)
 create mode 100644 tests/integration/pull_commit_test.go

diff --git a/models/fixtures/comment.yml b/models/fixtures/comment.yml
index d2a1de6559..f4121284a6 100644
--- a/models/fixtures/comment.yml
+++ b/models/fixtures/comment.yml
@@ -94,3 +94,22 @@
   content: "test markup light/dark-mode-only ![GitHub-Mark-Light](https://user-images.githubusercontent.com/3369400/139447912-e0f43f33-6d9f-45f8-be46-2df5bbc91289.png#gh-dark-mode-only)![GitHub-Mark-Dark](https://user-images.githubusercontent.com/3369400/139448065-39a229ba-4b06-434b-bc67-616e2ed80c8f.png#gh-light-mode-only)"
   created_unix: 946684813
   updated_unix: 946684813
+
+-
+  id: 11
+  type: 22 # review
+  poster_id: 5
+  issue_id: 3 # in repo_id 1
+  content: "reviewed by user5"
+  review_id: 21
+  created_unix: 946684816
+
+-
+  id: 12
+  type: 27 # review request
+  poster_id: 2
+  issue_id: 3 # in repo_id 1
+  content: "review request for user5"
+  review_id: 22
+  assignee_id: 5
+  created_unix: 946684817
diff --git a/models/fixtures/review.yml b/models/fixtures/review.yml
index ac97e24c2b..0438ceadae 100644
--- a/models/fixtures/review.yml
+++ b/models/fixtures/review.yml
@@ -179,3 +179,22 @@
   content: "Review Comment"
   updated_unix: 946684810
   created_unix: 946684810
+
+-
+  id: 21
+  type: 2
+  reviewer_id: 5
+  issue_id: 3
+  content: "reviewed by user5"
+  commit_id: 4a357436d925b5c974181ff12a994538ddc5a269
+  updated_unix: 946684816
+  created_unix: 946684816
+
+-
+  id: 22
+  type: 4
+  reviewer_id: 5
+  issue_id: 3
+  content: "review request for user5"
+  updated_unix: 946684817
+  created_unix: 946684817
diff --git a/models/issues/pull.go b/models/issues/pull.go
index a035cad649..45e2e19434 100644
--- a/models/issues/pull.go
+++ b/models/issues/pull.go
@@ -408,7 +408,7 @@ func (pr *PullRequest) getReviewedByLines(ctx context.Context, writer io.Writer)
 
 	// Note: This doesn't page as we only expect a very limited number of reviews
 	reviews, err := FindLatestReviews(ctx, FindReviewOptions{
-		Type:         ReviewTypeApprove,
+		Types:        []ReviewType{ReviewTypeApprove},
 		IssueID:      pr.IssueID,
 		OfficialOnly: setting.Repository.PullRequest.DefaultMergeMessageOfficialApproversOnly,
 	})
diff --git a/models/issues/review.go b/models/issues/review.go
index ca6fd6035b..a39c12069b 100644
--- a/models/issues/review.go
+++ b/models/issues/review.go
@@ -364,7 +364,7 @@ func GetCurrentReview(ctx context.Context, reviewer *user_model.User, issue *Iss
 		return nil, nil
 	}
 	reviews, err := FindReviews(ctx, FindReviewOptions{
-		Type:       ReviewTypePending,
+		Types:      []ReviewType{ReviewTypePending},
 		IssueID:    issue.ID,
 		ReviewerID: reviewer.ID,
 	})
diff --git a/models/issues/review_list.go b/models/issues/review_list.go
index 0ee28874ec..a5ceb21791 100644
--- a/models/issues/review_list.go
+++ b/models/issues/review_list.go
@@ -92,7 +92,7 @@ func (reviews ReviewList) LoadIssues(ctx context.Context) error {
 // FindReviewOptions represent possible filters to find reviews
 type FindReviewOptions struct {
 	db.ListOptions
-	Type         ReviewType
+	Types        []ReviewType
 	IssueID      int64
 	ReviewerID   int64
 	OfficialOnly bool
@@ -107,8 +107,8 @@ func (opts *FindReviewOptions) toCond() builder.Cond {
 	if opts.ReviewerID > 0 {
 		cond = cond.And(builder.Eq{"reviewer_id": opts.ReviewerID})
 	}
-	if opts.Type != ReviewTypeUnknown {
-		cond = cond.And(builder.Eq{"type": opts.Type})
+	if len(opts.Types) > 0 {
+		cond = cond.And(builder.In("type", opts.Types))
 	}
 	if opts.OfficialOnly {
 		cond = cond.And(builder.Eq{"official": true})
diff --git a/models/issues/review_test.go b/models/issues/review_test.go
index 43dc9ed2c1..51cb940579 100644
--- a/models/issues/review_test.go
+++ b/models/issues/review_test.go
@@ -64,7 +64,7 @@ func TestReviewType_Icon(t *testing.T) {
 func TestFindReviews(t *testing.T) {
 	require.NoError(t, unittest.PrepareTestDatabase())
 	reviews, err := issues_model.FindReviews(db.DefaultContext, issues_model.FindReviewOptions{
-		Type:       issues_model.ReviewTypeApprove,
+		Types:      []issues_model.ReviewType{issues_model.ReviewTypeApprove},
 		IssueID:    2,
 		ReviewerID: 1,
 	})
@@ -76,7 +76,7 @@ func TestFindReviews(t *testing.T) {
 func TestFindLatestReviews(t *testing.T) {
 	require.NoError(t, unittest.PrepareTestDatabase())
 	reviews, err := issues_model.FindLatestReviews(db.DefaultContext, issues_model.FindReviewOptions{
-		Type:    issues_model.ReviewTypeApprove,
+		Types:   []issues_model.ReviewType{issues_model.ReviewTypeApprove},
 		IssueID: 11,
 	})
 	require.NoError(t, err)
diff --git a/routers/api/v1/repo/pull_review.go b/routers/api/v1/repo/pull_review.go
index 39e1d487fa..8fba085ff7 100644
--- a/routers/api/v1/repo/pull_review.go
+++ b/routers/api/v1/repo/pull_review.go
@@ -82,7 +82,6 @@ func ListPullReviews(ctx *context.APIContext) {
 
 	opts := issues_model.FindReviewOptions{
 		ListOptions: utils.GetListOptions(ctx),
-		Type:        issues_model.ReviewTypeUnknown,
 		IssueID:     pr.IssueID,
 	}
 
diff --git a/services/pull/pull.go b/services/pull/pull.go
index 82ca0d7047..6af7d8ba0c 100644
--- a/services/pull/pull.go
+++ b/services/pull/pull.go
@@ -966,6 +966,8 @@ type CommitInfo struct {
 }
 
 // GetPullCommits returns all commits on given pull request and the last review commit sha
+// Attention: The last review commit sha must be from the latest review whose commit id is not empty.
+// So the type of the latest review cannot be "ReviewTypeRequest".
 func GetPullCommits(ctx *gitea_context.Context, issue *issues_model.Issue) ([]CommitInfo, string, error) {
 	pull := issue.PullRequest
 
@@ -1011,7 +1013,11 @@ func GetPullCommits(ctx *gitea_context.Context, issue *issues_model.Issue) ([]Co
 		lastreview, err := issues_model.FindLatestReviews(ctx, issues_model.FindReviewOptions{
 			IssueID:    issue.ID,
 			ReviewerID: ctx.Doer.ID,
-			Type:       issues_model.ReviewTypeUnknown,
+			Types: []issues_model.ReviewType{
+				issues_model.ReviewTypeApprove,
+				issues_model.ReviewTypeComment,
+				issues_model.ReviewTypeReject,
+			},
 		})
 
 		if err != nil && !issues_model.IsErrReviewNotExist(err) {
diff --git a/services/pull/review.go b/services/pull/review.go
index 011c2a3058..927c43150b 100644
--- a/services/pull/review.go
+++ b/services/pull/review.go
@@ -340,7 +340,7 @@ func DismissApprovalReviews(ctx context.Context, doer *user_model.User, pull *is
 	reviews, err := issues_model.FindReviews(ctx, issues_model.FindReviewOptions{
 		ListOptions: db.ListOptionsAll,
 		IssueID:     pull.IssueID,
-		Type:        issues_model.ReviewTypeApprove,
+		Types:       []issues_model.ReviewType{issues_model.ReviewTypeApprove},
 		Dismissed:   optional.Some(false),
 	})
 	if err != nil {
diff --git a/tests/integration/api_pull_review_test.go b/tests/integration/api_pull_review_test.go
index b7e5130cb8..9a395968b0 100644
--- a/tests/integration/api_pull_review_test.go
+++ b/tests/integration/api_pull_review_test.go
@@ -160,7 +160,7 @@ func TestAPIPullReview(t *testing.T) {
 
 	var reviews []*api.PullReview
 	DecodeJSON(t, resp, &reviews)
-	if !assert.Len(t, reviews, 6) {
+	if !assert.Len(t, reviews, 8) {
 		return
 	}
 	for _, r := range reviews {
diff --git a/tests/integration/pull_commit_test.go b/tests/integration/pull_commit_test.go
new file mode 100644
index 0000000000..477f01725d
--- /dev/null
+++ b/tests/integration/pull_commit_test.go
@@ -0,0 +1,34 @@
+// Copyright 2024 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+	"net/http"
+	"net/url"
+	"testing"
+
+	pull_service "code.gitea.io/gitea/services/pull"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestListPullCommits(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		session := loginUser(t, "user5")
+		req := NewRequest(t, "GET", "/user2/repo1/pulls/3/commits/list")
+		resp := session.MakeRequest(t, req, http.StatusOK)
+
+		var pullCommitList struct {
+			Commits             []pull_service.CommitInfo `json:"commits"`
+			LastReviewCommitSha string                    `json:"last_review_commit_sha"`
+		}
+		DecodeJSON(t, resp, &pullCommitList)
+
+		if assert.Len(t, pullCommitList.Commits, 2) {
+			assert.Equal(t, "5f22f7d0d95d614d25a5b68592adb345a4b5c7fd", pullCommitList.Commits[0].ID)
+			assert.Equal(t, "4a357436d925b5c974181ff12a994538ddc5a269", pullCommitList.Commits[1].ID)
+		}
+		assert.Equal(t, "4a357436d925b5c974181ff12a994538ddc5a269", pullCommitList.LastReviewCommitSha)
+	})
+}

From a681daaca291bc78f305b14c3efdfd84c1639999 Mon Sep 17 00:00:00 2001
From: Bruno Sofiato 
Date: Thu, 3 Oct 2024 13:03:36 -0300
Subject: [PATCH 102/443] Fixed race condition when deleting documents by
 repoId in ElasticSearch (#32185)

Resolves #32184

---------

Signed-off-by: Bruno Sofiato 
(cherry picked from commit d266d190bd744b7b6f572bf69a42013e21b9be62)
---
 .../code/elasticsearch/elasticsearch.go       | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/modules/indexer/code/elasticsearch/elasticsearch.go b/modules/indexer/code/elasticsearch/elasticsearch.go
index d64d99433d..5c01034450 100644
--- a/modules/indexer/code/elasticsearch/elasticsearch.go
+++ b/modules/indexer/code/elasticsearch/elasticsearch.go
@@ -20,6 +20,7 @@ import (
 	indexer_internal "code.gitea.io/gitea/modules/indexer/internal"
 	inner_elasticsearch "code.gitea.io/gitea/modules/indexer/internal/elasticsearch"
 	"code.gitea.io/gitea/modules/json"
+	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/timeutil"
 	"code.gitea.io/gitea/modules/typesniffer"
@@ -197,8 +198,33 @@ func (b *Indexer) Index(ctx context.Context, repo *repo_model.Repository, sha st
 	return nil
 }
 
-// Delete deletes indexes by ids
+// Delete entries by repoId
 func (b *Indexer) Delete(ctx context.Context, repoID int64) error {
+	if err := b.doDelete(ctx, repoID); err != nil {
+		// Maybe there is a conflict during the delete operation, so we should retry after a refresh
+		log.Warn("Deletion of entries of repo %v within index %v was erroneus. Trying to refresh index before trying again", repoID, b.inner.VersionedIndexName(), err)
+		if err := b.refreshIndex(ctx); err != nil {
+			return err
+		}
+		if err := b.doDelete(ctx, repoID); err != nil {
+			log.Error("Could not delete entries of repo %v within index %v", repoID, b.inner.VersionedIndexName())
+			return err
+		}
+	}
+	return nil
+}
+
+func (b *Indexer) refreshIndex(ctx context.Context) error {
+	if _, err := b.inner.Client.Refresh(b.inner.VersionedIndexName()).Do(ctx); err != nil {
+		log.Error("Error while trying to refresh index %v", b.inner.VersionedIndexName(), err)
+		return err
+	}
+
+	return nil
+}
+
+// Delete entries by repoId
+func (b *Indexer) doDelete(ctx context.Context, repoID int64) error {
 	_, err := b.inner.Client.DeleteByQuery(b.inner.VersionedIndexName()).
 		Query(elastic.NewTermsQuery("repo_id", repoID)).
 		Do(ctx)

From 1dfe58ad11bc6fdc73a2b5ffb3c1481fbddbf46b Mon Sep 17 00:00:00 2001
From: Job 
Date: Fri, 4 Oct 2024 19:12:48 +0200
Subject: [PATCH 103/443] Fix PR creation on forked repositories (#31863)

Resolves #20475

(cherry picked from commit 7e68bc88238104d2ee8b5a877fc1ad437f1778a4)

Conflicts:
	tests/integration/pull_create_test.go
  add missing testPullCreateDirectly from
  c63060b130d34e3f03f28f4dccbf04d381a95c17 Fix code owners will not be mentioned when a pull request comes from a forked repository (#30476)
---
 routers/api/v1/repo/pull.go           | 17 +++++++--
 tests/integration/pull_create_test.go | 51 +++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go
index 97937fa937..bcb6ef2581 100644
--- a/routers/api/v1/repo/pull.go
+++ b/routers/api/v1/repo/pull.go
@@ -1112,9 +1112,20 @@ func parseCompareInfo(ctx *context.APIContext, form api.CreatePullRequestOption)
 	// Check if current user has fork of repository or in the same repository.
 	headRepo := repo_model.GetForkedRepo(ctx, headUser.ID, baseRepo.ID)
 	if headRepo == nil && !isSameRepo {
-		log.Trace("parseCompareInfo[%d]: does not have fork or in same repository", baseRepo.ID)
-		ctx.NotFound("GetForkedRepo")
-		return nil, nil, nil, "", ""
+		err := baseRepo.GetBaseRepo(ctx)
+		if err != nil {
+			ctx.Error(http.StatusInternalServerError, "GetBaseRepo", err)
+			return nil, nil, nil, "", ""
+		}
+
+		// Check if baseRepo's base repository is the same as headUser's repository.
+		if baseRepo.BaseRepo == nil || baseRepo.BaseRepo.OwnerID != headUser.ID {
+			log.Trace("parseCompareInfo[%d]: does not have fork or in same repository", baseRepo.ID)
+			ctx.NotFound("GetBaseRepo")
+			return nil, nil, nil, "", ""
+		}
+		// Assign headRepo so it can be used below.
+		headRepo = baseRepo.BaseRepo
 	}
 
 	var headGitRepo *git.Repository
diff --git a/tests/integration/pull_create_test.go b/tests/integration/pull_create_test.go
index 8bf48f4f6e..b814642bc7 100644
--- a/tests/integration/pull_create_test.go
+++ b/tests/integration/pull_create_test.go
@@ -72,6 +72,30 @@ func testPullCreate(t *testing.T, session *TestSession, user, repo string, toSel
 	return resp
 }
 
+func testPullCreateDirectly(t *testing.T, session *TestSession, baseRepoOwner, baseRepoName, baseBranch, headRepoOwner, headRepoName, headBranch, title string) *httptest.ResponseRecorder {
+	headCompare := headBranch
+	if headRepoOwner != "" {
+		if headRepoName != "" {
+			headCompare = fmt.Sprintf("%s/%s:%s", headRepoOwner, headRepoName, headBranch)
+		} else {
+			headCompare = fmt.Sprintf("%s:%s", headRepoOwner, headBranch)
+		}
+	}
+	req := NewRequest(t, "GET", fmt.Sprintf("/%s/%s/compare/%s...%s", baseRepoOwner, baseRepoName, baseBranch, headCompare))
+	resp := session.MakeRequest(t, req, http.StatusOK)
+
+	// Submit the form for creating the pull
+	htmlDoc := NewHTMLParser(t, resp.Body)
+	link, exists := htmlDoc.doc.Find("form.ui.form").Attr("action")
+	assert.True(t, exists, "The template has changed")
+	req = NewRequestWithValues(t, "POST", link, map[string]string{
+		"_csrf": htmlDoc.GetCSRF(),
+		"title": title,
+	})
+	resp = session.MakeRequest(t, req, http.StatusOK)
+	return resp
+}
+
 func TestPullCreate(t *testing.T) {
 	onGiteaRun(t, func(t *testing.T, u *url.URL) {
 		session := loginUser(t, "user1")
@@ -505,3 +529,30 @@ func TestRecentlyPushed(t *testing.T) {
 		})
 	})
 }
+
+/*
+Setup:
+The base repository is: user2/repo1
+Fork repository to: user1/repo1
+Push extra commit to: user2/repo1, which changes README.md
+Create a PR on user1/repo1
+
+Test checks:
+Check if pull request can be created from base to the fork repository.
+*/
+func TestPullCreatePrFromBaseToFork(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		sessionFork := loginUser(t, "user1")
+		testRepoFork(t, sessionFork, "user2", "repo1", "user1", "repo1")
+
+		// Edit base repository
+		sessionBase := loginUser(t, "user2")
+		testEditFile(t, sessionBase, "user2", "repo1", "master", "README.md", "Hello, World (Edited)\n")
+
+		// Create a PR
+		resp := testPullCreateDirectly(t, sessionFork, "user1", "repo1", "master", "user2", "repo1", "master", "This is a pull title")
+		// check the redirected URL
+		url := test.RedirectURL(resp)
+		assert.Regexp(t, "^/user1/repo1/pulls/[0-9]*$", url)
+	})
+}

From af901ac7bb03d27f175f2292581fc67fa9c8d567 Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Sat, 5 Oct 2024 02:45:06 +0900
Subject: [PATCH 104/443] Add support for searching users by email (#30908)

Fix #30898

we have an option `SearchByEmail`, so enable it, then we can search user
by email.
Also added a test for it.

(cherry picked from commit 5d6d025c9b8d2abca9ec2bfdc795d1f0c1c6592d)
---
 models/user/search.go                     | 14 ++++++++-
 routers/api/v1/user/user.go               | 11 +++----
 tests/integration/api_user_search_test.go | 36 +++++++++++++++++++++++
 3 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/models/user/search.go b/models/user/search.go
index 04c434e4fa..558daf2e6a 100644
--- a/models/user/search.go
+++ b/models/user/search.go
@@ -69,7 +69,19 @@ func (opts *SearchUserOptions) toSearchQueryBase(ctx context.Context) *xorm.Sess
 			builder.Like{"LOWER(full_name)", lowerKeyword},
 		)
 		if opts.SearchByEmail {
-			keywordCond = keywordCond.Or(builder.Like{"LOWER(email)", lowerKeyword})
+			var emailCond builder.Cond
+			emailCond = builder.Like{"LOWER(email)", lowerKeyword}
+			if opts.Actor == nil {
+				emailCond = emailCond.And(builder.Eq{"keep_email_private": false})
+			} else if !opts.Actor.IsAdmin {
+				emailCond = emailCond.And(
+					builder.Or(
+						builder.Eq{"keep_email_private": false},
+						builder.Eq{"id": opts.Actor.ID},
+					),
+				)
+			}
+			keywordCond = keywordCond.Or(emailCond)
 		}
 
 		cond = cond.And(keywordCond)
diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go
index 831c1436da..0847b4079b 100644
--- a/routers/api/v1/user/user.go
+++ b/routers/api/v1/user/user.go
@@ -69,11 +69,12 @@ func Search(ctx *context.APIContext) {
 		users = []*user_model.User{user_model.NewActionsUser()}
 	default:
 		users, maxResults, err = user_model.SearchUsers(ctx, &user_model.SearchUserOptions{
-			Actor:       ctx.Doer,
-			Keyword:     ctx.FormTrim("q"),
-			UID:         uid,
-			Type:        user_model.UserTypeIndividual,
-			ListOptions: listOptions,
+			Actor:         ctx.Doer,
+			Keyword:       ctx.FormTrim("q"),
+			UID:           uid,
+			Type:          user_model.UserTypeIndividual,
+			SearchByEmail: true,
+			ListOptions:   listOptions,
 		})
 		if err != nil {
 			ctx.JSON(http.StatusInternalServerError, map[string]any{
diff --git a/tests/integration/api_user_search_test.go b/tests/integration/api_user_search_test.go
index 2ecd338987..eb2b6f45f5 100644
--- a/tests/integration/api_user_search_test.go
+++ b/tests/integration/api_user_search_test.go
@@ -130,3 +130,39 @@ func TestAPIUserSearchNotLoggedInUserHidden(t *testing.T) {
 	DecodeJSON(t, resp, &results)
 	assert.Empty(t, results.Data)
 }
+
+func TestAPIUserSearchByEmail(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	// admin can search user with private email
+	adminUsername := "user1"
+	session := loginUser(t, adminUsername)
+	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadUser)
+	query := "user2@example.com"
+	req := NewRequestf(t, "GET", "/api/v1/users/search?q=%s", query).
+		AddTokenAuth(token)
+	resp := MakeRequest(t, req, http.StatusOK)
+
+	var results SearchResults
+	DecodeJSON(t, resp, &results)
+	assert.Equal(t, 1, len(results.Data))
+	assert.Equal(t, query, results.Data[0].Email)
+
+	// no login user can not search user with private email
+	req = NewRequestf(t, "GET", "/api/v1/users/search?q=%s", query)
+	resp = MakeRequest(t, req, http.StatusOK)
+	DecodeJSON(t, resp, &results)
+	assert.Empty(t, results.Data)
+
+	// user can search self with private email
+	user2 := "user2"
+	session = loginUser(t, user2)
+	token = getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadUser)
+	req = NewRequestf(t, "GET", "/api/v1/users/search?q=%s", query).
+		AddTokenAuth(token)
+	resp = MakeRequest(t, req, http.StatusOK)
+
+	DecodeJSON(t, resp, &results)
+	assert.Equal(t, 1, len(results.Data))
+	assert.Equal(t, query, results.Data[0].Email)
+}

From 122baf4de82da1b54d4883a8d738344f8ff065c3 Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Sun, 6 Oct 2024 08:21:41 +0200
Subject: [PATCH 105/443] chore(release-notes): weekly cherry-pick week 2024-41

---
 release-notes/5477.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 release-notes/5477.md

diff --git a/release-notes/5477.md b/release-notes/5477.md
new file mode 100644
index 0000000000..3f735e043f
--- /dev/null
+++ b/release-notes/5477.md
@@ -0,0 +1,3 @@
+feat: [commit](https://codeberg.org/forgejo/forgejo/commit/af901ac7bb03d27f175f2292581fc67fa9c8d567) Add support for searching users by email.
+fix: [commit](https://codeberg.org/forgejo/forgejo/commit/1dfe58ad11bc6fdc73a2b5ffb3c1481fbddbf46b) PR creation on forked repositories.
+fix: [commit](https://codeberg.org/forgejo/forgejo/commit/b67b7c12385059898fc8cb7997755a88b3afa483) the logic of finding the latest pull review commit ID is incorrect.

From 1bee6fa839e0d2000abef39bb6c9fbd6483f864f Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Sun, 6 Oct 2024 08:28:43 +0200
Subject: [PATCH 106/443] Add support for searching users by email (#30908)
 (testifylint)

---
 tests/integration/api_user_search_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/api_user_search_test.go b/tests/integration/api_user_search_test.go
index eb2b6f45f5..63c1f86f27 100644
--- a/tests/integration/api_user_search_test.go
+++ b/tests/integration/api_user_search_test.go
@@ -145,7 +145,7 @@ func TestAPIUserSearchByEmail(t *testing.T) {
 
 	var results SearchResults
 	DecodeJSON(t, resp, &results)
-	assert.Equal(t, 1, len(results.Data))
+	assert.Len(t, results.Data, 1)
 	assert.Equal(t, query, results.Data[0].Email)
 
 	// no login user can not search user with private email
@@ -163,6 +163,6 @@ func TestAPIUserSearchByEmail(t *testing.T) {
 	resp = MakeRequest(t, req, http.StatusOK)
 
 	DecodeJSON(t, resp, &results)
-	assert.Equal(t, 1, len(results.Data))
+	assert.Len(t, results.Data, 1)
 	assert.Equal(t, query, results.Data[0].Email)
 }

From 6488d15860948f8e65a51ec4ecc43f2da20391a2 Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Sun, 6 Oct 2024 10:00:09 +0200
Subject: [PATCH 107/443] Fix the logic of finding the latest pull review
 commit ID (#32139) (followup)

Adjust the tests for review deletion to ignore a newly inserted
fixture. It is a review request and cannot be deleted.
---
 tests/integration/api_pull_review_test.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/integration/api_pull_review_test.go b/tests/integration/api_pull_review_test.go
index 9a395968b0..b66e65ee41 100644
--- a/tests/integration/api_pull_review_test.go
+++ b/tests/integration/api_pull_review_test.go
@@ -60,6 +60,9 @@ func TestAPIPullReviewCreateDeleteComment(t *testing.T) {
 				var reviews []*api.PullReview
 				DecodeJSON(t, resp, &reviews)
 				for _, review := range reviews {
+					if review.State == api.ReviewStateRequestReview {
+						continue
+					}
 					req := NewRequestf(t, http.MethodDelete, "/api/v1/repos/%s/pulls/%d/reviews/%d", repo.FullName(), pullIssue.Index, review.ID).
 						AddTokenAuth(token)
 					MakeRequest(t, req, http.StatusNoContent)
@@ -93,7 +96,7 @@ func TestAPIPullReviewCreateDeleteComment(t *testing.T) {
 				DecodeJSON(t, resp, &getReview)
 				require.EqualValues(t, getReview, review)
 			}
-			requireReviewCount(1)
+			requireReviewCount(2)
 
 			newCommentBody := "first new line"
 			var reviewComment api.PullReviewComment
@@ -140,7 +143,7 @@ func TestAPIPullReviewCreateDeleteComment(t *testing.T) {
 					AddTokenAuth(token)
 				MakeRequest(t, req, http.StatusNoContent)
 			}
-			requireReviewCount(0)
+			requireReviewCount(1)
 		})
 	}
 }

From e9040fafec8398e12ba627c9ff7dbf6da0685449 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Mon, 7 Oct 2024 00:03:30 +0000
Subject: [PATCH 108/443] Update renovate to v38.110.2

---
 .forgejo/workflows/renovate.yml | 2 +-
 Makefile                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml
index 4f85d77f74..67efe160b0 100644
--- a/.forgejo/workflows/renovate.yml
+++ b/.forgejo/workflows/renovate.yml
@@ -23,7 +23,7 @@ jobs:
 
     runs-on: docker
     container:
-      image: code.forgejo.org/forgejo-contrib/renovate:38.101.1
+      image: code.forgejo.org/forgejo-contrib/renovate:38.110.2
 
     steps:
       - name: Load renovate repo cache
diff --git a/Makefile b/Makefile
index 9ebabcca46..9426aed02b 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1 # renovate: datasour
 DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.25.0 # renovate: datasource=go
 GOMOCK_PACKAGE ?= go.uber.org/mock/mockgen@v0.4.0 # renovate: datasource=go
 GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.16.2 # renovate: datasource=go
-RENOVATE_NPM_PACKAGE ?= renovate@38.101.1 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate
+RENOVATE_NPM_PACKAGE ?= renovate@38.110.2 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate
 
 ifeq ($(HAS_GO), yes)
 	CGO_EXTRA_CFLAGS := -DSQLITE_MAX_VARIABLE_NUMBER=32766

From 36c384246c1a6734e36f85c0c14f045f196f04ef Mon Sep 17 00:00:00 2001
From: Otto Richter 
Date: Mon, 7 Oct 2024 03:21:45 +0200
Subject: [PATCH 109/443] chore(ci): update changed-files actions URL for
 consistency

mirrored actions are typically created under the name of the original author; additionally this moves the action to Forgejo's control
---
 .forgejo/workflows/testing.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml
index 55ac4454b5..3440993ce2 100644
--- a/.forgejo/workflows/testing.yml
+++ b/.forgejo/workflows/testing.yml
@@ -110,7 +110,7 @@ jobs:
       - uses: ./.forgejo/workflows-composite/build-backend
       - name: Get changed files
         id: changed-files
-        uses: https://code.forgejo.org/fossdd/changed-files@v45
+        uses: https://code.forgejo.org/tj-actions/changed-files@v45
         with:
           separator: '\n'
       - run: |

From d17db93fbf52360ece6bdc2803d2ae593e58ad0b Mon Sep 17 00:00:00 2001
From: voltagex 
Date: Mon, 7 Oct 2024 16:11:07 +0000
Subject: [PATCH 110/443] i18n: improve 'Verify' error message, stopgap for
 #2809 (#5479)

Signed-off-by: Adam Baxter 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5479
Reviewed-by: Otto 
Co-authored-by: voltagex 
Co-committed-by: voltagex 
---
 options/locale/locale_en-US.ini | 2 ++
 routers/web/web.go              | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index b84cb42b85..a4e653b6ba 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -438,6 +438,8 @@ reset_password_wrong_user = You are signed in as %s, but the account recovery li
 password_too_short = Password length cannot be less than %d characters.
 non_local_account = Non-local users cannot update their password through the Forgejo web interface.
 verify = Verify
+;As https://codeberg.org/forgejo/forgejo/issues/2809 progresses, please update this error message if possible
+unauthorized_credentials = Credentials are incorrect or have expired. Retry your command or see %s for more information
 scratch_code = Scratch code
 use_scratch_code = Use a scratch code
 twofa_scratch_used = You have used your scratch code. You have been redirected to the two-factor settings page so you may remove your device enrollment or generate a new scratch code.
diff --git a/routers/web/web.go b/routers/web/web.go
index 39116b882d..c268f7224d 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -122,7 +122,7 @@ func webAuth(authMethod auth_service.Method) func(*context.Context) {
 		ar, err := common.AuthShared(ctx.Base, ctx.Session, authMethod)
 		if err != nil {
 			log.Error("Failed to verify user: %v", err)
-			ctx.Error(http.StatusUnauthorized, "Verify")
+			ctx.Error(http.StatusUnauthorized, ctx.Locale.TrString("auth.unauthorized_credentials", "https://codeberg.org/forgejo/forgejo/issues/2809"))
 			return
 		}
 		ctx.Doer = ar.Doer

From fcc3dd228de8d22bd98f9dae995d95f10c3635ae Mon Sep 17 00:00:00 2001
From: JakobDev 
Date: Mon, 7 Oct 2024 18:36:07 +0200
Subject: [PATCH 111/443] fix: correct documentation for non 200 responses in
 swagger

---
 services/context/api.go        |  70 ++++++++++++-----
 templates/swagger/v1_json.tmpl | 133 +++++++++++++++++++++++----------
 2 files changed, 146 insertions(+), 57 deletions(-)

diff --git a/services/context/api.go b/services/context/api.go
index 8e255c8573..8d62570e67 100644
--- a/services/context/api.go
+++ b/services/context/api.go
@@ -58,40 +58,69 @@ func init() {
 //            if we need to indicate some errors, we should introduce some new fields like ErrorCode or ErrorType
 // * url:     the swagger document URL
 
+type APIError struct {
+	Message string `json:"message"`
+	URL     string `json:"url"`
+}
+
 // APIError is error format response
 // swagger:response error
-type APIError struct {
+type swaggerAPIError struct {
+	// in:body
+	Body APIError `json:"body"`
+}
+
+type APIValidationError struct {
 	Message string `json:"message"`
 	URL     string `json:"url"`
 }
 
 // APIValidationError is error format response related to input validation
 // swagger:response validationError
-type APIValidationError struct {
-	Message string `json:"message"`
-	URL     string `json:"url"`
+type swaggerAPIValidationError struct {
+	// in:body
+	Body APIValidationError `json:"body"`
+}
+
+type APIInvalidTopicsError struct {
+	Message       string   `json:"message"`
+	InvalidTopics []string `json:"invalidTopics"`
 }
 
 // APIInvalidTopicsError is error format response to invalid topics
 // swagger:response invalidTopicsError
-type APIInvalidTopicsError struct {
-	Message       string   `json:"message"`
-	InvalidTopics []string `json:"invalidTopics"`
+type swaggerAPIInvalidTopicsError struct {
+	// in:body
+	Body APIInvalidTopicsError `json:"body"`
 }
 
 // APIEmpty is an empty response
 // swagger:response empty
 type APIEmpty struct{}
 
-// APIForbiddenError is a forbidden error response
-// swagger:response forbidden
 type APIForbiddenError struct {
 	APIError
 }
 
-// APINotFound is a not found empty response
+// APIForbiddenError is a forbidden error response
+// swagger:response forbidden
+type swaggerAPIForbiddenError struct {
+	// in:body
+	Body APIForbiddenError `json:"body"`
+}
+
+type APINotFound struct {
+	Message string   `json:"message"`
+	URL     string   `json:"url"`
+	Errors  []string `json:"errors"`
+}
+
+// APINotFound is a not found error response
 // swagger:response notFound
-type APINotFound struct{}
+type swaggerAPINotFound struct {
+	// in:body
+	Body APINotFound `json:"body"`
+}
 
 // APIConflict is a conflict empty response
 // swagger:response conflict
@@ -105,12 +134,17 @@ type APIRedirect struct{}
 // swagger:response string
 type APIString string
 
-// APIRepoArchivedError is an error that is raised when an archived repo should be modified
-// swagger:response repoArchivedError
 type APIRepoArchivedError struct {
 	APIError
 }
 
+// APIRepoArchivedError is an error that is raised when an archived repo should be modified
+// swagger:response repoArchivedError
+type swaggerAPIRepoArchivedError struct {
+	// in:body
+	Body APIRepoArchivedError `json:"body"`
+}
+
 // ServerError responds with error message, status is 500
 func (ctx *APIContext) ServerError(title string, err error) {
 	ctx.Error(http.StatusInternalServerError, title, err)
@@ -251,7 +285,7 @@ func APIContexter() func(http.Handler) http.Handler {
 // String will replace message, errors will be added to a slice
 func (ctx *APIContext) NotFound(objs ...any) {
 	message := ctx.Locale.TrString("error.not_found")
-	var errors []string
+	errors := make([]string, 0)
 	for _, obj := range objs {
 		// Ignore nil
 		if obj == nil {
@@ -265,10 +299,10 @@ func (ctx *APIContext) NotFound(objs ...any) {
 		}
 	}
 
-	ctx.JSON(http.StatusNotFound, map[string]any{
-		"message": message,
-		"url":     setting.API.SwaggerURL,
-		"errors":  errors,
+	ctx.JSON(http.StatusNotFound, APINotFound{
+		Message: message,
+		URL:     setting.API.SwaggerURL,
+		Errors:  errors,
 	})
 }
 
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 8c4e7eaf8b..d47f965286 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -19708,6 +19708,86 @@
       },
       "x-go-package": "code.gitea.io/gitea/modules/structs"
     },
+    "APIForbiddenError": {
+      "type": "object",
+      "properties": {
+        "message": {
+          "type": "string",
+          "x-go-name": "Message"
+        },
+        "url": {
+          "type": "string",
+          "x-go-name": "URL"
+        }
+      },
+      "x-go-package": "code.gitea.io/gitea/services/context"
+    },
+    "APIInvalidTopicsError": {
+      "type": "object",
+      "properties": {
+        "invalidTopics": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "x-go-name": "InvalidTopics"
+        },
+        "message": {
+          "type": "string",
+          "x-go-name": "Message"
+        }
+      },
+      "x-go-package": "code.gitea.io/gitea/services/context"
+    },
+    "APINotFound": {
+      "type": "object",
+      "properties": {
+        "errors": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "x-go-name": "Errors"
+        },
+        "message": {
+          "type": "string",
+          "x-go-name": "Message"
+        },
+        "url": {
+          "type": "string",
+          "x-go-name": "URL"
+        }
+      },
+      "x-go-package": "code.gitea.io/gitea/services/context"
+    },
+    "APIRepoArchivedError": {
+      "type": "object",
+      "properties": {
+        "message": {
+          "type": "string",
+          "x-go-name": "Message"
+        },
+        "url": {
+          "type": "string",
+          "x-go-name": "URL"
+        }
+      },
+      "x-go-package": "code.gitea.io/gitea/services/context"
+    },
+    "APIValidationError": {
+      "type": "object",
+      "properties": {
+        "message": {
+          "type": "string",
+          "x-go-name": "Message"
+        },
+        "url": {
+          "type": "string",
+          "x-go-name": "URL"
+        }
+      },
+      "x-go-package": "code.gitea.io/gitea/services/context"
+    },
     "AccessToken": {
       "type": "object",
       "title": "AccessToken represents an API access token.",
@@ -28202,42 +28282,27 @@
     },
     "error": {
       "description": "APIError is error format response",
-      "headers": {
-        "message": {
-          "type": "string"
-        },
-        "url": {
-          "type": "string"
-        }
+      "schema": {
+        "$ref": "#/definitions/APIError"
       }
     },
     "forbidden": {
       "description": "APIForbiddenError is a forbidden error response",
-      "headers": {
-        "message": {
-          "type": "string"
-        },
-        "url": {
-          "type": "string"
-        }
+      "schema": {
+        "$ref": "#/definitions/APIForbiddenError"
       }
     },
     "invalidTopicsError": {
       "description": "APIInvalidTopicsError is error format response to invalid topics",
-      "headers": {
-        "invalidTopics": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "message": {
-          "type": "string"
-        }
+      "schema": {
+        "$ref": "#/definitions/APIInvalidTopicsError"
       }
     },
     "notFound": {
-      "description": "APINotFound is a not found empty response"
+      "description": "APINotFound is a not found error response",
+      "schema": {
+        "$ref": "#/definitions/APINotFound"
+      }
     },
     "parameterBodies": {
       "description": "parameterBodies",
@@ -28265,13 +28330,8 @@
     },
     "repoArchivedError": {
       "description": "APIRepoArchivedError is an error that is raised when an archived repo should be modified",
-      "headers": {
-        "message": {
-          "type": "string"
-        },
-        "url": {
-          "type": "string"
-        }
+      "schema": {
+        "$ref": "#/definitions/APIRepoArchivedError"
       }
     },
     "string": {
@@ -28282,13 +28342,8 @@
     },
     "validationError": {
       "description": "APIValidationError is error format response related to input validation",
-      "headers": {
-        "message": {
-          "type": "string"
-        },
-        "url": {
-          "type": "string"
-        }
+      "schema": {
+        "$ref": "#/definitions/APIValidationError"
       }
     }
   },

From b23217fb3ea564fd2fc2db1c988c79e84f58107d Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Tue, 8 Oct 2024 00:02:57 +0000
Subject: [PATCH 112/443] Update actions/git-backporting action to v4.8.2

---
 .forgejo/workflows/backport.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.forgejo/workflows/backport.yml b/.forgejo/workflows/backport.yml
index 32a93edbc0..0238b6307e 100644
--- a/.forgejo/workflows/backport.yml
+++ b/.forgejo/workflows/backport.yml
@@ -45,7 +45,7 @@ jobs:
           cat <<'EOF'
           ${{ toJSON(github) }}
           EOF
-      - uses: https://code.forgejo.org/actions/git-backporting@v4.8.0
+      - uses: https://code.forgejo.org/actions/git-backporting@v4.8.2
         with:
           target-branch-pattern: "^backport/(?(v.*))$"
           strategy: ort

From 39f6da1a83444c62a38d4880466eeb2a8ac34c03 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Tue, 8 Oct 2024 00:03:27 +0000
Subject: [PATCH 113/443] Update dependency @vitest/eslint-plugin to v1.1.7

---
 package-lock.json | 11 +++++++----
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fb5ec84ed4..1cd2a12f55 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -68,7 +68,7 @@
         "@stylistic/stylelint-plugin": "3.1.1",
         "@vitejs/plugin-vue": "5.1.4",
         "@vitest/coverage-v8": "2.1.2",
-        "@vitest/eslint-plugin": "1.1.6",
+        "@vitest/eslint-plugin": "1.1.7",
         "@vue/test-utils": "2.4.6",
         "eslint": "8.57.1",
         "eslint-plugin-array-func": "4.0.0",
@@ -4906,9 +4906,9 @@
       }
     },
     "node_modules/@vitest/eslint-plugin": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/@vitest/eslint-plugin/-/eslint-plugin-1.1.6.tgz",
-      "integrity": "sha512-sFuAnD9iycnOzLHHhNCULXeb6ejOSo5Lcq/ODhdlUOoUrXkQPcVeYqXurZMA3neOqf+wNCQ6YuU1zyoYH/WEcg==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/@vitest/eslint-plugin/-/eslint-plugin-1.1.7.tgz",
+      "integrity": "sha512-pTWGW3y6lH2ukCuuffpan6kFxG6nIuoesbhMiQxskyQMRcCN5t9SXsKrNHvEw3p8wcCsgJoRqFZVkOTn6TjclA==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -4920,6 +4920,9 @@
       "peerDependenciesMeta": {
         "typescript": {
           "optional": true
+        },
+        "vitest": {
+          "optional": true
         }
       }
     },
diff --git a/package.json b/package.json
index 903bc23e13..5a36db607c 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "@stylistic/stylelint-plugin": "3.1.1",
     "@vitejs/plugin-vue": "5.1.4",
     "@vitest/coverage-v8": "2.1.2",
-    "@vitest/eslint-plugin": "1.1.6",
+    "@vitest/eslint-plugin": "1.1.7",
     "@vue/test-utils": "2.4.6",
     "eslint": "8.57.1",
     "eslint-plugin-array-func": "4.0.0",

From b1901acd3a4c77236eca34593bbc3ba4f270ed3d Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Tue, 8 Oct 2024 02:02:56 +0000
Subject: [PATCH 114/443] Update dependency eslint-plugin-wc to v2.2.0

---
 package-lock.json | 10 +++++-----
 package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fb5ec84ed4..d5ff69ddff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -83,7 +83,7 @@
         "eslint-plugin-vitest-globals": "1.5.0",
         "eslint-plugin-vue": "9.28.0",
         "eslint-plugin-vue-scoped-css": "2.8.1",
-        "eslint-plugin-wc": "2.1.1",
+        "eslint-plugin-wc": "2.2.0",
         "happy-dom": "15.7.4",
         "license-checker-rseidelsohn": "4.4.2",
         "markdownlint-cli": "0.42.0",
@@ -9305,9 +9305,9 @@
       }
     },
     "node_modules/eslint-plugin-wc": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-wc/-/eslint-plugin-wc-2.1.1.tgz",
-      "integrity": "sha512-GfJo05ZgWfwAFbW6Gkf+9CMOIU6fmbd3b4nm+PKESHgUdUTmi7vawlELCrzOhdiQjXUPZxDfFIVxYt9D/v/GdQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-wc/-/eslint-plugin-wc-2.2.0.tgz",
+      "integrity": "sha512-kjPp+aXz23fOl0JZJOJS+6adwhEv98KjZ2FJqWpc4vtmk4Oenz/JJmmNZrGSARgtyR0BLIF/kVWC6GSlHA+5MA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9315,7 +9315,7 @@
         "js-levenshtein-esm": "^1.2.0"
       },
       "peerDependencies": {
-        "eslint": ">=5"
+        "eslint": ">=8.40.0"
       }
     },
     "node_modules/eslint-rule-documentation": {
diff --git a/package.json b/package.json
index 903bc23e13..5d2f2c077c 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "eslint-plugin-vitest-globals": "1.5.0",
     "eslint-plugin-vue": "9.28.0",
     "eslint-plugin-vue-scoped-css": "2.8.1",
-    "eslint-plugin-wc": "2.1.1",
+    "eslint-plugin-wc": "2.2.0",
     "happy-dom": "15.7.4",
     "license-checker-rseidelsohn": "4.4.2",
     "markdownlint-cli": "0.42.0",

From 2bf961876822eb0cdff5480e95791eda683d8859 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Tue, 8 Oct 2024 04:04:20 +0000
Subject: [PATCH 115/443] Update dependency vue to v3.5.11

---
 package-lock.json | 108 +++++++++++++++++++++++-----------------------
 package.json      |   2 +-
 2 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8042629825..c10ec0a5a5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -51,7 +51,7 @@
         "tributejs": "5.1.3",
         "uint8-to-base64": "0.2.0",
         "vanilla-colorful": "0.7.2",
-        "vue": "3.5.10",
+        "vue": "3.5.11",
         "vue-chartjs": "5.3.1",
         "vue-loader": "17.4.2",
         "vue3-calendar-heatmap": "2.0.5",
@@ -5078,39 +5078,39 @@
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.10.tgz",
-      "integrity": "sha512-iXWlk+Cg/ag7gLvY0SfVucU8Kh2CjysYZjhhP70w9qI4MvSox4frrP+vDGvtQuzIcgD8+sxM6lZvCtdxGunTAA==",
+      "version": "3.5.11",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.11.tgz",
+      "integrity": "sha512-PwAdxs7/9Hc3ieBO12tXzmTD+Ln4qhT/56S+8DvrrZ4kLDn4Z/AMUr8tXJD0axiJBS0RKIoNaR0yMuQB9v9Udg==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.25.3",
-        "@vue/shared": "3.5.10",
+        "@vue/shared": "3.5.11",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.2.0"
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.10.tgz",
-      "integrity": "sha512-DyxHC6qPcktwYGKOIy3XqnHRrrXyWR2u91AjP+nLkADko380srsC2DC3s7Y1Rk6YfOlxOlvEQKa9XXmLI+W4ZA==",
+      "version": "3.5.11",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.11.tgz",
+      "integrity": "sha512-pyGf8zdbDDRkBrEzf8p7BQlMKNNF5Fk/Cf/fQ6PiUz9at4OaUfyXW0dGJTo2Vl1f5U9jSLCNf0EZJEogLXoeew==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-core": "3.5.10",
-        "@vue/shared": "3.5.10"
+        "@vue/compiler-core": "3.5.11",
+        "@vue/shared": "3.5.11"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.10.tgz",
-      "integrity": "sha512-to8E1BgpakV7224ZCm8gz1ZRSyjNCAWEplwFMWKlzCdP9DkMKhRRwt0WkCjY7jkzi/Vz3xgbpeig5Pnbly4Tow==",
+      "version": "3.5.11",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.11.tgz",
+      "integrity": "sha512-gsbBtT4N9ANXXepprle+X9YLg2htQk1sqH/qGJ/EApl+dgpUBdTv3yP7YlR535uHZY3n6XaR0/bKo0BgwwDniw==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.25.3",
-        "@vue/compiler-core": "3.5.10",
-        "@vue/compiler-dom": "3.5.10",
-        "@vue/compiler-ssr": "3.5.10",
-        "@vue/shared": "3.5.10",
+        "@vue/compiler-core": "3.5.11",
+        "@vue/compiler-dom": "3.5.11",
+        "@vue/compiler-ssr": "3.5.11",
+        "@vue/shared": "3.5.11",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.30.11",
         "postcss": "^8.4.47",
@@ -5127,63 +5127,63 @@
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.10.tgz",
-      "integrity": "sha512-hxP4Y3KImqdtyUKXDRSxKSRkSm1H9fCvhojEYrnaoWhE4w/y8vwWhnosJoPPe2AXm5sU7CSbYYAgkt2ZPhDz+A==",
+      "version": "3.5.11",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.11.tgz",
+      "integrity": "sha512-P4+GPjOuC2aFTk1Z4WANvEhyOykcvEd5bIj2KVNGKGfM745LaXGr++5njpdBTzVz5pZifdlR1kpYSJJpIlSePA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.10",
-        "@vue/shared": "3.5.10"
+        "@vue/compiler-dom": "3.5.11",
+        "@vue/shared": "3.5.11"
       }
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.10.tgz",
-      "integrity": "sha512-kW08v06F6xPSHhid9DJ9YjOGmwNDOsJJQk0ax21wKaUYzzuJGEuoKNU2Ujux8FLMrP7CFJJKsHhXN9l2WOVi2g==",
+      "version": "3.5.11",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.11.tgz",
+      "integrity": "sha512-Nqo5VZEn8MJWlCce8XoyVqHZbd5P2NH+yuAaFzuNSR96I+y1cnuUiq7xfSG+kyvLSiWmaHTKP1r3OZY4mMD50w==",
       "license": "MIT",
       "dependencies": {
-        "@vue/shared": "3.5.10"
+        "@vue/shared": "3.5.11"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.10.tgz",
-      "integrity": "sha512-9Q86I5Qq3swSkFfzrZ+iqEy7Vla325M7S7xc1NwKnRm/qoi1Dauz0rT6mTMmscqx4qz0EDJ1wjB+A36k7rl8mA==",
+      "version": "3.5.11",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.11.tgz",
+      "integrity": "sha512-7PsxFGqwfDhfhh0OcDWBG1DaIQIVOLgkwA5q6MtkPiDFjp5gohVnJEahSktwSFLq7R5PtxDKy6WKURVN1UDbzA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.10",
-        "@vue/shared": "3.5.10"
+        "@vue/reactivity": "3.5.11",
+        "@vue/shared": "3.5.11"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.10.tgz",
-      "integrity": "sha512-t3x7ht5qF8ZRi1H4fZqFzyY2j+GTMTDxRheT+i8M9Ph0oepUxoadmbwlFwMoW7RYCpNQLpP2Yx3feKs+fyBdpA==",
+      "version": "3.5.11",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.11.tgz",
+      "integrity": "sha512-GNghjecT6IrGf0UhuYmpgaOlN7kxzQBhxWEn08c/SQDxv1yy4IXI1bn81JgEpQ4IXjRxWtPyI8x0/7TF5rPfYQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.10",
-        "@vue/runtime-core": "3.5.10",
-        "@vue/shared": "3.5.10",
+        "@vue/reactivity": "3.5.11",
+        "@vue/runtime-core": "3.5.11",
+        "@vue/shared": "3.5.11",
         "csstype": "^3.1.3"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.10.tgz",
-      "integrity": "sha512-IVE97tt2kGKwHNq9yVO0xdh1IvYfZCShvDSy46JIh5OQxP1/EXSpoDqetVmyIzL7CYOWnnmMkVqd7YK2QSWkdw==",
+      "version": "3.5.11",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.11.tgz",
+      "integrity": "sha512-cVOwYBxR7Wb1B1FoxYvtjJD8X/9E5nlH4VSkJy2uMA1MzYNdzAAB//l8nrmN9py/4aP+3NjWukf9PZ3TeWULaA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-ssr": "3.5.10",
-        "@vue/shared": "3.5.10"
+        "@vue/compiler-ssr": "3.5.11",
+        "@vue/shared": "3.5.11"
       },
       "peerDependencies": {
-        "vue": "3.5.10"
+        "vue": "3.5.11"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.10.tgz",
-      "integrity": "sha512-VkkBhU97Ki+XJ0xvl4C9YJsIZ2uIlQ7HqPpZOS3m9VCvmROPaChZU6DexdMJqvz9tbgG+4EtFVrSuailUq5KGQ==",
+      "version": "3.5.11",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.11.tgz",
+      "integrity": "sha512-W8GgysJVnFo81FthhzurdRAWP/byq3q2qIw70e0JWblzVhjgOMiC2GyovXrZTFQJnFVryYaKGP3Tc9vYzYm6PQ==",
       "license": "MIT"
     },
     "node_modules/@vue/test-utils": {
@@ -16317,16 +16317,16 @@
       "license": "MIT"
     },
     "node_modules/vue": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.10.tgz",
-      "integrity": "sha512-Vy2kmJwHPlouC/tSnIgXVg03SG+9wSqT1xu1Vehc+ChsXsRd7jLkKgMltVEFOzUdBr3uFwBCG+41LJtfAcBRng==",
+      "version": "3.5.11",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.11.tgz",
+      "integrity": "sha512-/8Wurrd9J3lb72FTQS7gRMNQD4nztTtKPmuDuPuhqXmmpD6+skVjAeahNpVzsuky6Sy9gy7wn8UadqPtt9SQIg==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.10",
-        "@vue/compiler-sfc": "3.5.10",
-        "@vue/runtime-dom": "3.5.10",
-        "@vue/server-renderer": "3.5.10",
-        "@vue/shared": "3.5.10"
+        "@vue/compiler-dom": "3.5.11",
+        "@vue/compiler-sfc": "3.5.11",
+        "@vue/runtime-dom": "3.5.11",
+        "@vue/server-renderer": "3.5.11",
+        "@vue/shared": "3.5.11"
       },
       "peerDependencies": {
         "typescript": "*"
diff --git a/package.json b/package.json
index 588ca34604..327f6bd137 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "tributejs": "5.1.3",
     "uint8-to-base64": "0.2.0",
     "vanilla-colorful": "0.7.2",
-    "vue": "3.5.10",
+    "vue": "3.5.11",
     "vue-chartjs": "5.3.1",
     "vue-loader": "17.4.2",
     "vue3-calendar-heatmap": "2.0.5",

From cf3ebab4ba3f2d04d48a1fb6d29fc561a7aff4e1 Mon Sep 17 00:00:00 2001
From: Kidsan 
Date: Mon, 7 Oct 2024 22:47:45 +0200
Subject: [PATCH 116/443] fix: add length limit to discord webhook icon_url

---
 options/locale/locale_en-US.ini |  1 +
 services/webhook/discord.go     | 31 +++++++++++++++++++++++++------
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index a4e653b6ba..115fe589f8 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2358,6 +2358,7 @@ settings.slack_icon_url = Icon URL
 settings.slack_color = Color
 settings.discord_username = Username
 settings.discord_icon_url = Icon URL
+settings.discord_icon_url.exceeds_max_length = Icon URL must be less than or equal to 2048 characters
 settings.event_desc = Trigger on:
 settings.event_push_only = Push events
 settings.event_send_everything = All events
diff --git a/services/webhook/discord.go b/services/webhook/discord.go
index af1dd79927..d2fa7c7d1f 100644
--- a/services/webhook/discord.go
+++ b/services/webhook/discord.go
@@ -14,6 +14,8 @@ import (
 	"strings"
 	"unicode/utf8"
 
+	"gitea.com/go-chi/binding"
+
 	webhook_model "code.gitea.io/gitea/models/webhook"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/json"
@@ -22,6 +24,7 @@ import (
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/util"
 	webhook_module "code.gitea.io/gitea/modules/webhook"
+	gitea_context "code.gitea.io/gitea/services/context"
 	"code.gitea.io/gitea/services/forms"
 	"code.gitea.io/gitea/services/webhook/shared"
 )
@@ -31,13 +34,29 @@ type discordHandler struct{}
 func (discordHandler) Type() webhook_module.HookType { return webhook_module.DISCORD }
 func (discordHandler) Icon(size int) template.HTML   { return shared.ImgIcon("discord.png", size) }
 
-func (discordHandler) UnmarshalForm(bind func(any)) forms.WebhookForm {
-	var form struct {
-		forms.WebhookCoreForm
-		PayloadURL string `binding:"Required;ValidUrl"`
-		Username   string
-		IconURL    string
+type discordForm struct {
+	forms.WebhookCoreForm
+	PayloadURL string `binding:"Required;ValidUrl"`
+	Username   string
+	IconURL    string
+}
+
+var _ binding.Validator = &discordForm{}
+
+// Validate implements binding.Validator.
+func (d *discordForm) Validate(req *http.Request, errs binding.Errors) binding.Errors {
+	ctx := gitea_context.GetWebContext(req)
+	if len([]rune(d.IconURL)) > 2048 {
+		errs = append(errs, binding.Error{
+			FieldNames: []string{"IconURL"},
+			Message:    ctx.Locale.TrString("repo.settings.discord_icon_url.exceeds_max_length"),
+		})
 	}
+	return errs
+}
+
+func (discordHandler) UnmarshalForm(bind func(any)) forms.WebhookForm {
+	var form discordForm
 	bind(&form)
 
 	return forms.WebhookForm{

From 2feb3d03d73a89c0d52a174c92915ca3930f08a7 Mon Sep 17 00:00:00 2001
From: TimedIn 
Date: Tue, 8 Oct 2024 10:39:52 +0200
Subject: [PATCH 117/443] feat: "assign to me" button on PRs and issues

includes:
Tests for assignees on issues
Move assignees selector of new Issue to assignees.tmpl
---
 options/locale/locale_en-US.ini               |  1 +
 services/forms/repo_form.go                   |  2 +-
 templates/repo/issue/new_form.tmpl            | 37 +-------
 .../repo/issue/view_content/sidebar.tmpl      |  2 +-
 .../issue/view_content/sidebar/assignees.tmpl | 37 +++++---
 tests/e2e/issue-sidebar.test.e2e.js           | 85 +++++++++++++++++++
 web_src/js/features/repo-issue.js             | 54 ++++++++++++
 web_src/js/features/repo-legacy.js            | 22 +----
 8 files changed, 172 insertions(+), 68 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index a4e653b6ba..708bd49142 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1509,6 +1509,7 @@ issues.new.closed_milestone = Closed milestones
 issues.new.assignees = Assignees
 issues.new.clear_assignees = Clear assignees
 issues.new.no_assignees = No assignees
+issues.new.assign_to_me = Assign to me
 issues.new.no_reviewers = No reviewers
 issues.edit.already_changed = Unable to save changes to the issue. It appears the content has already been changed by another user. Please refresh the page and try editing again to avoid overwriting their changes
 issues.choose.get_started = Get started
diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go
index c3d9c3edc9..654106c47a 100644
--- a/services/forms/repo_form.go
+++ b/services/forms/repo_form.go
@@ -317,7 +317,7 @@ type WebhookForm struct {
 type CreateIssueForm struct {
 	Title               string `binding:"Required;MaxSize(255)"`
 	LabelIDs            string `form:"label_ids"`
-	AssigneeIDs         string `form:"assignee_ids"`
+	AssigneeIDs         string `form:"assignee_id"`
 	Ref                 string `form:"ref"`
 	MilestoneID         int64
 	ProjectID           int64
diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl
index fe10c1f9b9..c2cf4ee7a7 100644
--- a/templates/repo/issue/new_form.tmpl
+++ b/templates/repo/issue/new_form.tmpl
@@ -140,42 +140,7 @@
 		

 		{{end}}
 		

-			
-			

-				
-					{{ctx.Locale.Tr "repo.issues.new.assignees"}}
-					{{if .HasIssuesOrPullsWritePermission}}
-						{{svg "octicon-gear" 16 "tw-ml-1"}}
-					{{end}}
-				
-				

-					

-						{{svg "octicon-search" 16}}
-						
-					

-					
{{ctx.Locale.Tr "repo.issues.new.clear_assignees"}}

-					{{range .Assignees}}
-						
-							{{svg "octicon-check"}}
-							
-								{{ctx.AvatarUtils.Avatar . 28 "tw-mr-2"}}{{template "repo/search_name" .}}
-							
-						
-					{{end}}
-				

-			

-			

-				
-					{{ctx.Locale.Tr "repo.issues.new.no_assignees"}}
-				
-				

-				{{range .Assignees}}
-					
-						{{ctx.AvatarUtils.Avatar . 28 "tw-mr-2 tw-align-middle"}}{{.GetDisplayName}}
-					
-				{{end}}
-				

-			

+		{{template "repo/issue/view_content/sidebar/assignees" dict "isExistingIssue" false "." .}}
 		{{if and .PageIsComparePull (not (eq .HeadRepo.FullName .BaseCompareRepo.FullName)) .CanWriteToHeadRepo}}
 			

 			

diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index ba15539841..623023bd51 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -17,7 +17,7 @@
 	{{template "repo/issue/view_content/sidebar/projects" .}}
 	

 
-	{{template "repo/issue/view_content/sidebar/assignees" .}}
+	{{template "repo/issue/view_content/sidebar/assignees" dict "isExistingIssue" true "." .}}
 	

 
 	{{if .Participants}}
diff --git a/templates/repo/issue/view_content/sidebar/assignees.tmpl b/templates/repo/issue/view_content/sidebar/assignees.tmpl
index e51bda95de..8e5043c076 100644
--- a/templates/repo/issue/view_content/sidebar/assignees.tmpl
+++ b/templates/repo/issue/view_content/sidebar/assignees.tmpl
@@ -1,12 +1,12 @@
 
-

+

 	
 		{{ctx.Locale.Tr "repo.issues.new.assignees"}}
 		{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
 			{{svg "octicon-gear" 16 "tw-ml-1"}}
 		{{end}}
 	
-	

+	

 		

 			{{svg "octicon-search" 16}}
 			
@@ -31,15 +31,32 @@
 	

 

 

-	{{ctx.Locale.Tr "repo.issues.new.no_assignees"}}
-	

-		{{range .Issue.Assignees}}
-			

-				
-					{{ctx.AvatarUtils.Avatar . 28 "tw-mr-2"}}
-					{{.GetDisplayName}}
+	
+		{{ctx.Locale.Tr "repo.issues.new.no_assignees"}}
+		{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
+			{{with index .Assignees 0}}
+				–
+				
+					{{ctx.Locale.Tr "repo.issues.new.assign_to_me"}}
 				
-			

+			{{end}}
+		{{end}}
+	
+	

+		{{if .isExistingIssue}}
+			{{range .Issue.Assignees}}
+				

+					
+						{{ctx.AvatarUtils.Avatar . 28 "tw-mr-2"}}{{.GetDisplayName}}
+					
+				

+			{{end}}
+		{{else}}
+			{{range .Assignees}}
+				
+					{{ctx.AvatarUtils.Avatar . 28 "tw-mr-2"}}{{.GetDisplayName}}
+				
+			{{end}}
 		{{end}}
 	

 

diff --git a/tests/e2e/issue-sidebar.test.e2e.js b/tests/e2e/issue-sidebar.test.e2e.js
index f9e8380fd4..0409eab9e1 100644
--- a/tests/e2e/issue-sidebar.test.e2e.js
+++ b/tests/e2e/issue-sidebar.test.e2e.js
@@ -103,6 +103,91 @@ test('Issue: Labels', async ({browser}, workerInfo) => {
   await expect(labelList.filter({hasText: 'label1'})).toBeVisible();
 });
 
+test('Issue: Assignees', async ({browser}, workerInfo) => {
+  test.skip(workerInfo.project.name === 'Mobile Safari', 'Unable to get tests working on Safari Mobile, see https://codeberg.org/forgejo/forgejo/pulls/3445#issuecomment-1789636');
+  const page = await login({browser}, workerInfo);
+  // select label list in sidebar only
+  const assigneesList = page.locator('.issue-content-right .assignees.list .selected .item a');
+
+  const response = await page.goto('/org3/repo3/issues/1');
+  await expect(response?.status()).toBe(200);
+  // preconditions
+  await expect(assigneesList.filter({hasText: 'user2'})).toBeVisible();
+  await expect(assigneesList.filter({hasText: 'user4'})).toBeHidden();
+  await expect(page.locator('.ui.assignees.list .item.no-select')).toBeHidden();
+
+  // Clear all assignees
+  await page.locator('.select-assignees-modify.dropdown').click();
+  await page.locator('.select-assignees-modify.dropdown .no-select.item').click();
+  await page.waitForLoadState('networkidle');
+  await expect(assigneesList.filter({hasText: 'user2'})).toBeHidden();
+  await expect(assigneesList.filter({hasText: 'user4'})).toBeHidden();
+  await expect(page.locator('.ui.assignees.list .item.no-select')).toBeVisible();
+
+  // Assign other user (with searchbox)
+  await page.locator('.select-assignees-modify.dropdown').click();
+  await page.type('.select-assignees-modify .menu .search input', 'user4');
+  await expect(page.locator('.select-assignees-modify .menu .item').filter({hasText: 'user2'})).toBeHidden();
+  await expect(page.locator('.select-assignees-modify .menu .item').filter({hasText: 'user4'})).toBeVisible();
+  await page.locator('.select-assignees-modify .menu .item').filter({hasText: 'user4'}).click();
+  await page.locator('.select-assignees-modify.dropdown').click();
+  await page.waitForLoadState('networkidle');
+  await expect(assigneesList.filter({hasText: 'user4'})).toBeVisible();
+
+  // remove user4
+  await page.locator('.select-assignees-modify.dropdown').click();
+  await page.locator('.select-assignees-modify .menu .item').filter({hasText: 'user4'}).click();
+  await page.locator('.select-assignees-modify.dropdown').click();
+  await page.waitForLoadState('networkidle');
+  await expect(page.locator('.ui.assignees.list .item.no-select')).toBeVisible();
+  await expect(assigneesList.filter({hasText: 'user4'})).toBeHidden();
+
+  // Test assign me
+  await page.locator('.ui.assignees .select-assign-me').click();
+  await page.waitForLoadState('networkidle');
+  await expect(assigneesList.filter({hasText: 'user2'})).toBeVisible();
+  await expect(page.locator('.ui.assignees.list .item.no-select')).toBeHidden();
+});
+
+test('New Issue: Assignees', async ({browser}, workerInfo) => {
+  test.skip(workerInfo.project.name === 'Mobile Safari', 'Unable to get tests working on Safari Mobile, see https://codeberg.org/forgejo/forgejo/pulls/3445#issuecomment-1789636');
+  const page = await login({browser}, workerInfo);
+  // select label list in sidebar only
+  const assigneesList = page.locator('.issue-content-right .assignees.list .selected .item');
+
+  const response = await page.goto('/org3/repo3/issues/new');
+  await expect(response?.status()).toBe(200);
+  // preconditions
+  await expect(page.locator('.ui.assignees.list .item.no-select')).toBeVisible();
+  await expect(assigneesList.filter({hasText: 'user2'})).toBeHidden();
+  await expect(assigneesList.filter({hasText: 'user4'})).toBeHidden();
+
+  // Assign other user (with searchbox)
+  await page.locator('.select-assignees.dropdown').click();
+  await page.type('.select-assignees .menu .search input', 'user4');
+  await expect(page.locator('.select-assignees .menu .item').filter({hasText: 'user2'})).toBeHidden();
+  await expect(page.locator('.select-assignees .menu .item').filter({hasText: 'user4'})).toBeVisible();
+  await page.locator('.select-assignees .menu .item').filter({hasText: 'user4'}).click();
+  await page.locator('.select-assignees.dropdown').click();
+  await expect(assigneesList.filter({hasText: 'user4'})).toBeVisible();
+
+  // remove user4
+  await page.locator('.select-assignees.dropdown').click();
+  await page.locator('.select-assignees .menu .item').filter({hasText: 'user4'}).click();
+  await page.locator('.select-assignees.dropdown').click();
+  await expect(page.locator('.ui.assignees.list .item.no-select')).toBeVisible();
+  await expect(assigneesList.filter({hasText: 'user4'})).toBeHidden();
+
+  // Test assign me
+  await page.locator('.ui.assignees .select-assign-me').click();
+  await expect(assigneesList.filter({hasText: 'user2'})).toBeVisible();
+  await expect(page.locator('.ui.assignees.list .item.no-select')).toBeHidden();
+
+  await page.locator('.select-assignees.dropdown').click();
+  await page.fill('.select-assignees .menu .search input', '');
+  await page.locator('.select-assignees.dropdown .no-select.item').click();
+});
+
 test('Issue: Milestone', async ({browser}, workerInfo) => {
   test.skip(workerInfo.project.name === 'Mobile Safari', 'Unable to get tests working on Safari Mobile, see https://codeberg.org/forgejo/forgejo/pulls/3445#issuecomment-1789636');
   const page = await login({browser}, workerInfo);
diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js
index feba449c16..c4bd70b71d 100644
--- a/web_src/js/features/repo-issue.js
+++ b/web_src/js/features/repo-issue.js
@@ -12,6 +12,26 @@ import {emojiHTML} from './emoji.js';
 
 const {appSubUrl} = window.config;
 
+// if there are draft comments, confirm before reloading, to avoid losing comments
+export function reloadConfirmDraftComment() {
+  const commentTextareas = [
+    document.querySelector('.edit-content-zone:not(.tw-hidden) textarea'),
+    document.querySelector('#comment-form textarea'),
+  ];
+  for (const textarea of commentTextareas) {
+    // Most users won't feel too sad if they lose a comment with 10 chars, they can re-type these in seconds.
+    // But if they have typed more (like 50) chars and the comment is lost, they will be very unhappy.
+    if (textarea && textarea.value.trim().length > 10) {
+      textarea.parentElement.scrollIntoView();
+      if (!window.confirm('Page will be reloaded, but there are draft comments. Continuing to reload will discard the comments. Continue?')) {
+        return;
+      }
+      break;
+    }
+  }
+  window.location.reload();
+}
+
 export function initRepoIssueTimeTracking() {
   $(document).on('click', '.issue-add-time', () => {
     $('.issue-start-time-modal').modal({
@@ -668,6 +688,40 @@ export function initRepoIssueBranchSelect() {
   });
 }
 
+export function initRepoIssueAssignMe() {
+  // Assign to me button
+  document.querySelector('.ui.assignees.list .item.no-select .select-assign-me')
+    ?.addEventListener('click', (e) => {
+      e.preventDefault();
+      const selectMe = e.target;
+      const noSelect = selectMe.parentElement;
+      const selectorList = document.querySelector('.ui.select-assignees .menu');
+
+      if (selectMe.getAttribute('data-action') === 'update') {
+        (async () => {
+          await updateIssuesMeta(
+            selectMe.getAttribute('data-update-url'),
+            selectMe.getAttribute('data-action'),
+            selectMe.getAttribute('data-issue-id'),
+            selectMe.getAttribute('data-id'),
+          );
+          reloadConfirmDraftComment();
+        })();
+      } else {
+        for (const item of selectorList.querySelectorAll('.item')) {
+          if (item.getAttribute('data-id') === selectMe.getAttribute('data-id')) {
+            item.classList.add('checked');
+            item.querySelector('.octicon-check').classList.remove('tw-invisible');
+          }
+        }
+        document.querySelector(selectMe.getAttribute('data-id-selector')).classList.remove('tw-hidden');
+        noSelect.classList.add('tw-hidden');
+        document.querySelector(selectorList.getAttribute('data-id')).value = selectMe.getAttribute('data-id');
+        return false;
+      }
+    });
+}
+
 export function initSingleCommentEditor($commentForm) {
   // pages:
   // * normal new issue/pr page, no status-button
diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js
index b25fc28dea..cb92fcedb5 100644
--- a/web_src/js/features/repo-legacy.js
+++ b/web_src/js/features/repo-legacy.js
@@ -4,6 +4,7 @@ import {
   initRepoIssueComments, initRepoIssueDependencyDelete, initRepoIssueReferenceIssue,
   initRepoIssueTitleEdit, initRepoIssueWipToggle,
   initRepoPullRequestUpdate, updateIssuesMeta, handleReply, initIssueTemplateCommentEditors, initSingleCommentEditor,
+  initRepoIssueAssignMe, reloadConfirmDraftComment,
 } from './repo-issue.js';
 import {initUnicodeEscapeButton} from './repo-unicode-escape.js';
 import {svg} from '../svg.js';
@@ -29,26 +30,6 @@ import {POST, GET} from '../modules/fetch.js';
 
 const {csrfToken} = window.config;
 
-// if there are draft comments, confirm before reloading, to avoid losing comments
-function reloadConfirmDraftComment() {
-  const commentTextareas = [
-    document.querySelector('.edit-content-zone:not(.tw-hidden) textarea'),
-    document.querySelector('#comment-form textarea'),
-  ];
-  for (const textarea of commentTextareas) {
-    // Most users won't feel too sad if they lose a comment with 10 chars, they can re-type these in seconds.
-    // But if they have typed more (like 50) chars and the comment is lost, they will be very unhappy.
-    if (textarea && textarea.value.trim().length > 10) {
-      textarea.parentElement.scrollIntoView();
-      if (!window.confirm('Page will be reloaded, but there are draft comments. Continuing to reload will discard the comments. Continue?')) {
-        return;
-      }
-      break;
-    }
-  }
-  window.location.reload();
-}
-
 export function initRepoCommentForm() {
   const $commentForm = $('.comment.form');
   if (!$commentForm.length) return;
@@ -243,6 +224,7 @@ export function initRepoCommentForm() {
   // Init labels and assignees
   initListSubmits('select-label', 'labels');
   initListSubmits('select-assignees', 'assignees');
+  initRepoIssueAssignMe();
   initListSubmits('select-assignees-modify', 'assignees');
   initListSubmits('select-reviewers-modify', 'assignees');
 

From 6ea6f224b8fee02706cffa6e56e293d3413c709d Mon Sep 17 00:00:00 2001
From: Kidsan 
Date: Mon, 7 Oct 2024 22:47:52 +0200
Subject: [PATCH 118/443] fix: improve discord webhook api conformance

This commit corrects some cases in the discord webhook payload that do
not align with the discord documentation
---
 services/webhook/discord.go            | 24 ++++++++------
 services/webhook/discord_test.go       | 43 ++++++++++++++++++++++++++
 services/webhook/general_test.go       | 17 ++++++++--
 templates/webhook/new/discord.tmpl     |  4 +--
 tests/integration/repo_webhook_test.go |  1 +
 5 files changed, 76 insertions(+), 13 deletions(-)

diff --git a/services/webhook/discord.go b/services/webhook/discord.go
index d2fa7c7d1f..b0142b8509 100644
--- a/services/webhook/discord.go
+++ b/services/webhook/discord.go
@@ -14,8 +14,6 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"gitea.com/go-chi/binding"
-
 	webhook_model "code.gitea.io/gitea/models/webhook"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/json"
@@ -27,6 +25,8 @@ import (
 	gitea_context "code.gitea.io/gitea/services/context"
 	"code.gitea.io/gitea/services/forms"
 	"code.gitea.io/gitea/services/webhook/shared"
+
+	"gitea.com/go-chi/binding"
 )
 
 type discordHandler struct{}
@@ -37,8 +37,8 @@ func (discordHandler) Icon(size int) template.HTML   { return shared.ImgIcon("di
 type discordForm struct {
 	forms.WebhookCoreForm
 	PayloadURL string `binding:"Required;ValidUrl"`
-	Username   string
-	IconURL    string
+	Username   string `binding:"Required;MaxSize(80)"`
+	IconURL    string `binding:"ValidUrl"`
 }
 
 var _ binding.Validator = &discordForm{}
@@ -75,7 +75,7 @@ func (discordHandler) UnmarshalForm(bind func(any)) forms.WebhookForm {
 type (
 	// DiscordEmbedFooter for Embed Footer Structure.
 	DiscordEmbedFooter struct {
-		Text string `json:"text"`
+		Text string `json:"text,omitempty"`
 	}
 
 	// DiscordEmbedAuthor for Embed Author Structure
@@ -99,16 +99,16 @@ type (
 		Color       int                 `json:"color"`
 		Footer      DiscordEmbedFooter  `json:"footer"`
 		Author      DiscordEmbedAuthor  `json:"author"`
-		Fields      []DiscordEmbedField `json:"fields"`
+		Fields      []DiscordEmbedField `json:"fields,omitempty"`
 	}
 
 	// DiscordPayload represents
 	DiscordPayload struct {
-		Wait      bool           `json:"wait"`
-		Content   string         `json:"content"`
+		Wait      bool           `json:"-"`
+		Content   string         `json:"-"`
 		Username  string         `json:"username"`
 		AvatarURL string         `json:"avatar_url,omitempty"`
-		TTS       bool           `json:"tts"`
+		TTS       bool           `json:"-"`
 		Embeds    []DiscordEmbed `json:"embeds"`
 	}
 
@@ -341,6 +341,12 @@ func parseHookPullRequestEventType(event webhook_module.HookEventType) (string,
 }
 
 func (d discordConvertor) createPayload(s *api.User, title, text, url string, color int) DiscordPayload {
+	if len([]rune(title)) > 256 {
+		title = fmt.Sprintf("%.253s...", title)
+	}
+	if len([]rune(text)) > 4096 {
+		text = fmt.Sprintf("%.4093s...", text)
+	}
 	return DiscordPayload{
 		Username:  d.Username,
 		AvatarURL: d.AvatarURL,
diff --git a/services/webhook/discord_test.go b/services/webhook/discord_test.go
index cc5ec8a3e0..680f7806a9 100644
--- a/services/webhook/discord_test.go
+++ b/services/webhook/discord_test.go
@@ -120,6 +120,49 @@ func TestDiscordPayload(t *testing.T) {
 		assert.Equal(t, p.Sender.UserName, pl.Embeds[0].Author.Name)
 		assert.Equal(t, setting.AppURL+p.Sender.UserName, pl.Embeds[0].Author.URL)
 		assert.Equal(t, p.Sender.AvatarURL, pl.Embeds[0].Author.IconURL)
+
+		j, err := json.Marshal(pl)
+		require.NoError(t, err)
+
+		unsetFields := struct {
+			Content *string `json:"content"`
+			TTS     *bool   `json:"tts"`
+			Wait    *bool   `json:"wait"`
+			Fields  []any   `json:"fields"`
+			Footer  struct {
+				Text *string `json:"text"`
+			} `json:"footer"`
+		}{}
+
+		err = json.Unmarshal(j, &unsetFields)
+		require.NoError(t, err)
+		assert.Nil(t, unsetFields.Content)
+		assert.Nil(t, unsetFields.TTS)
+		assert.Nil(t, unsetFields.Wait)
+		assert.Nil(t, unsetFields.Fields)
+		assert.Nil(t, unsetFields.Footer.Text)
+	})
+
+	t.Run("Issue with long title", func(t *testing.T) {
+		p := issueTestPayloadWithLongTitle()
+
+		p.Action = api.HookIssueOpened
+		pl, err := dc.Issue(p)
+		require.NoError(t, err)
+
+		assert.Len(t, pl.Embeds, 1)
+		assert.Len(t, pl.Embeds[0].Title, 256)
+	})
+
+	t.Run("Issue with long body", func(t *testing.T) {
+		p := issueTestPayloadWithLongBody()
+
+		p.Action = api.HookIssueOpened
+		pl, err := dc.Issue(p)
+		require.NoError(t, err)
+
+		assert.Len(t, pl.Embeds, 1)
+		assert.Len(t, pl.Embeds[0].Description, 4096)
 	})
 
 	t.Run("IssueComment", func(t *testing.T) {
diff --git a/services/webhook/general_test.go b/services/webhook/general_test.go
index 2d991f8300..6dcd787fab 100644
--- a/services/webhook/general_test.go
+++ b/services/webhook/general_test.go
@@ -4,6 +4,7 @@
 package webhook
 
 import (
+	"strings"
 	"testing"
 
 	api "code.gitea.io/gitea/modules/structs"
@@ -113,6 +114,18 @@ func pushTestPayloadWithCommitMessage(message string) *api.PushPayload {
 }
 
 func issueTestPayload() *api.IssuePayload {
+	return issuePayloadWithTitleAndBody("crash", "issue body")
+}
+
+func issueTestPayloadWithLongBody() *api.IssuePayload {
+	return issuePayloadWithTitleAndBody("crash", strings.Repeat("issue body", 4097))
+}
+
+func issueTestPayloadWithLongTitle() *api.IssuePayload {
+	return issuePayloadWithTitleAndBody(strings.Repeat("a", 257), "issue body")
+}
+
+func issuePayloadWithTitleAndBody(title, body string) *api.IssuePayload {
 	return &api.IssuePayload{
 		Index: 2,
 		Sender: &api.User{
@@ -129,8 +142,8 @@ func issueTestPayload() *api.IssuePayload {
 			Index:   2,
 			URL:     "http://localhost:3000/api/v1/repos/test/repo/issues/2",
 			HTMLURL: "http://localhost:3000/test/repo/issues/2",
-			Title:   "crash",
-			Body:    "issue body",
+			Title:   title,
+			Body:    body,
 			Poster: &api.User{
 				UserName:  "user1",
 				AvatarURL: "http://localhost:3000/user1/avatar",
diff --git a/templates/webhook/new/discord.tmpl b/templates/webhook/new/discord.tmpl
index 48ac84fc6b..455a96c1f4 100644
--- a/templates/webhook/new/discord.tmpl
+++ b/templates/webhook/new/discord.tmpl
@@ -5,9 +5,9 @@
 		
 		
 	

-	

+	

 		
-		
+		
 	

 	

 		
diff --git a/tests/integration/repo_webhook_test.go b/tests/integration/repo_webhook_test.go
index b98fce0f4a..8f65b5c34f 100644
--- a/tests/integration/repo_webhook_test.go
+++ b/tests/integration/repo_webhook_test.go
@@ -172,6 +172,7 @@ func TestWebhookForms(t *testing.T) {
 	}))
 
 	t.Run("discord/required", testWebhookForms("discord", session, map[string]string{
+		"username":    "john",
 		"payload_url": "https://discord.example.com",
 	}))
 	t.Run("discord/optional", testWebhookForms("discord", session, map[string]string{

From 89aa9c30c07562f5b414625f23fdbaa3c30ae82f Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Wed, 9 Oct 2024 02:02:53 +0000
Subject: [PATCH 119/443] Update dependency @playwright/test to v1.48.0

---
 package-lock.json | 24 ++++++++++++------------
 package.json      |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c10ec0a5a5..8ea76b3cf9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -62,7 +62,7 @@
       "devDependencies": {
         "@axe-core/playwright": "4.10.0",
         "@eslint-community/eslint-plugin-eslint-comments": "4.4.0",
-        "@playwright/test": "1.47.2",
+        "@playwright/test": "1.48.0",
         "@stoplight/spectral-cli": "6.13.1",
         "@stylistic/eslint-plugin-js": "2.9.0",
         "@stylistic/stylelint-plugin": "3.1.1",
@@ -3632,13 +3632,13 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.47.2",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.47.2.tgz",
-      "integrity": "sha512-jTXRsoSPONAs8Za9QEQdyjFn+0ZQFjCiIztAIF6bi1HqhBzG9Ma7g1WotyiGqFSBRZjIEqMdT8RUlbk1QVhzCQ==",
+      "version": "1.48.0",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.48.0.tgz",
+      "integrity": "sha512-W5lhqPUVPqhtc/ySvZI5Q8X2ztBOUgZ8LbAFy0JQgrXZs2xaILrUcNO3rQjwbLPfGK13+rZsDa1FpG+tqYkT5w==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.47.2"
+        "playwright": "1.48.0"
       },
       "bin": {
         "playwright": "cli.js"
@@ -12891,13 +12891,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.47.2",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.47.2.tgz",
-      "integrity": "sha512-nx1cLMmQWqmA3UsnjaaokyoUpdVaaDhJhMoxX2qj3McpjnsqFHs516QAKYhqHAgOP+oCFTEOCOAaD1RgD/RQfA==",
+      "version": "1.48.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.48.0.tgz",
+      "integrity": "sha512-qPqFaMEHuY/ug8o0uteYJSRfMGFikhUysk8ZvAtfKmUK3kc/6oNl/y3EczF8OFGYIi/Ex2HspMfzYArk6+XQSA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.47.2"
+        "playwright-core": "1.48.0"
       },
       "bin": {
         "playwright": "cli.js"
@@ -12910,9 +12910,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.47.2",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.47.2.tgz",
-      "integrity": "sha512-3JvMfF+9LJfe16l7AbSmU555PaTl2tPyQsVInqm3id16pdDfvZ8TTZ/pyzmkbDrZTQefyzU7AIHlZqQnxpqHVQ==",
+      "version": "1.48.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.48.0.tgz",
+      "integrity": "sha512-RBvzjM9rdpP7UUFrQzRwR8L/xR4HyC1QXMzGYTbf1vjw25/ya9NRAVnXi/0fvFopjebvyPzsmoK58xxeEOaVvA==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
diff --git a/package.json b/package.json
index 327f6bd137..4603ab67e8 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
   "devDependencies": {
     "@axe-core/playwright": "4.10.0",
     "@eslint-community/eslint-plugin-eslint-comments": "4.4.0",
-    "@playwright/test": "1.47.2",
+    "@playwright/test": "1.48.0",
     "@stoplight/spectral-cli": "6.13.1",
     "@stylistic/eslint-plugin-js": "2.9.0",
     "@stylistic/stylelint-plugin": "3.1.1",

From 5b25a882e02881f3e16e3be4aad0a16e02d41e49 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Wed, 9 Oct 2024 02:03:22 +0000
Subject: [PATCH 120/443] Update module golang.org/x/image to v0.21.0

---
 go.mod | 4 ++--
 go.sum | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index 18af63e7c2..2ca84bdebc 100644
--- a/go.mod
+++ b/go.mod
@@ -101,11 +101,11 @@ require (
 	github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
 	go.uber.org/mock v0.4.0
 	golang.org/x/crypto v0.27.0
-	golang.org/x/image v0.20.0
+	golang.org/x/image v0.21.0
 	golang.org/x/net v0.29.0
 	golang.org/x/oauth2 v0.23.0
 	golang.org/x/sys v0.25.0
-	golang.org/x/text v0.18.0
+	golang.org/x/text v0.19.0
 	golang.org/x/tools v0.25.0
 	google.golang.org/grpc v1.66.2
 	google.golang.org/protobuf v1.34.2
diff --git a/go.sum b/go.sum
index f07d806d65..c890adaf2a 100644
--- a/go.sum
+++ b/go.sum
@@ -734,8 +734,8 @@ golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
 golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
 golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA=
 golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
-golang.org/x/image v0.20.0 h1:7cVCUjQwfL18gyBJOmYvptfSHS8Fb3YUDtfLIZ7Nbpw=
-golang.org/x/image v0.20.0/go.mod h1:0a88To4CYVBAHp5FXJm8o7QbUl37Vd85ply1vyD8auM=
+golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s=
+golang.org/x/image v0.21.0/go.mod h1:vUbsLavqK/W303ZroQQVKQ+Af3Yl6Uz1Ppu5J/cLz78=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -822,8 +822,8 @@ golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

From 80d41ee2e1e7ae89dd4fadbe41a465f1edab9441 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Wed, 9 Oct 2024 04:54:02 +0000
Subject: [PATCH 121/443] Update actions/cache action to v4.1.1 (forgejo)
 (#5498)

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5498
Reviewed-by: Michael Kriese 
Co-authored-by: Renovate Bot 
Co-committed-by: Renovate Bot 
---
 .forgejo/workflows/renovate.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml
index 67efe160b0..d05495d317 100644
--- a/.forgejo/workflows/renovate.yml
+++ b/.forgejo/workflows/renovate.yml
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Load renovate repo cache
-        uses: https://code.forgejo.org/actions/cache/restore@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0
+        uses: https://code.forgejo.org/actions/cache/restore@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
         with:
           path: |
             .tmp/cache/renovate/repository
@@ -60,7 +60,7 @@ jobs:
 
       - name: Save renovate repo cache
         if: always() && env.RENOVATE_DRY_RUN != 'full'
-        uses: https://code.forgejo.org/actions/cache/save@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0
+        uses: https://code.forgejo.org/actions/cache/save@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
         with:
           path: |
             .tmp/cache/renovate/repository

From 1fc5e41592029a223d318b1b50aaae2c06f30244 Mon Sep 17 00:00:00 2001
From: JakobDev 
Date: Wed, 9 Oct 2024 04:56:40 +0000
Subject: [PATCH 122/443] [Feat]Add link to show all Issues/PullRequests
 (#4125)

The Issue and PullRequest list has 3 states:
- open: This lists all open Issues/PullRequests
- closed: This lists all closed Issues/PullRequests
- all: This lists all open and closed Issues/PullRequests

If you want to get to the all state, you need to click Open while in open state or Closed while in closed state, which is very unintuitive. This PR adss a third button to get to this state.

![grafik](/attachments/4ff59e4c-e318-40f0-80ba-f921ce098919)

I'm not sure if the eye icon fits well, but I couldn't find a better one.

Tests will be added once #4124 is merged.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4125
Reviewed-by: Earl Warren 
Co-authored-by: JakobDev 
Co-committed-by: JakobDev 
---
 models/issues/issue_stats.go        | 23 +++++++++++++++--------
 models/issues/issue_stats_test.go   |  1 +
 options/locale/locale_en-US.ini     |  1 +
 release-notes/4125.md               |  1 +
 routers/web/repo/issue.go           |  1 +
 templates/repo/issue/openclose.tmpl |  8 ++++++--
 tests/integration/issue_test.go     | 18 ++++++++++++++++++
 7 files changed, 43 insertions(+), 10 deletions(-)
 create mode 100644 release-notes/4125.md

diff --git a/models/issues/issue_stats.go b/models/issues/issue_stats.go
index dc634cf00e..fdc06b05d1 100644
--- a/models/issues/issue_stats.go
+++ b/models/issues/issue_stats.go
@@ -15,13 +15,13 @@ import (
 
 // IssueStats represents issue statistic information.
 type IssueStats struct {
-	OpenCount, ClosedCount int64
-	YourRepositoriesCount  int64
-	AssignCount            int64
-	CreateCount            int64
-	MentionCount           int64
-	ReviewRequestedCount   int64
-	ReviewedCount          int64
+	OpenCount, ClosedCount, AllCount int64
+	YourRepositoriesCount            int64
+	AssignCount                      int64
+	CreateCount                      int64
+	MentionCount                     int64
+	ReviewRequestedCount             int64
+	ReviewedCount                    int64
 }
 
 // Filter modes.
@@ -104,6 +104,7 @@ func GetIssueStats(ctx context.Context, opts *IssuesOptions) (*IssueStats, error
 		}
 		accum.OpenCount += stats.OpenCount
 		accum.ClosedCount += stats.ClosedCount
+		accum.AllCount += stats.AllCount
 		accum.YourRepositoriesCount += stats.YourRepositoriesCount
 		accum.AssignCount += stats.AssignCount
 		accum.CreateCount += stats.CreateCount
@@ -131,7 +132,13 @@ func getIssueStatsChunk(ctx context.Context, opts *IssuesOptions, issueIDs []int
 	stats.ClosedCount, err = applyIssuesOptions(sess, opts, issueIDs).
 		And("issue.is_closed = ?", true).
 		Count(new(Issue))
-	return stats, err
+	if err != nil {
+		return stats, err
+	}
+
+	stats.AllCount = stats.OpenCount + stats.ClosedCount
+
+	return stats, nil
 }
 
 func applyIssuesOptions(sess *xorm.Session, opts *IssuesOptions, issueIDs []int64) *xorm.Session {
diff --git a/models/issues/issue_stats_test.go b/models/issues/issue_stats_test.go
index fda75a6b47..9967557337 100644
--- a/models/issues/issue_stats_test.go
+++ b/models/issues/issue_stats_test.go
@@ -25,6 +25,7 @@ func TestGetIssueStats(t *testing.T) {
 
 	assert.Equal(t, int64(4), stats.OpenCount)
 	assert.Equal(t, int64(1), stats.ClosedCount)
+	assert.Equal(t, int64(5), stats.AllCount)
 	assert.Equal(t, int64(0), stats.YourRepositoriesCount)
 	assert.Equal(t, int64(0), stats.AssignCount)
 	assert.Equal(t, int64(0), stats.CreateCount)
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 708bd49142..2279efa279 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1608,6 +1608,7 @@ issues.previous = Previous
 issues.next = Next
 issues.open_title = Open
 issues.closed_title = Closed
+issues.all_title = All
 issues.draft_title = Draft
 issues.num_comments_1 = %d comment
 issues.num_comments = %d comments
diff --git a/release-notes/4125.md b/release-notes/4125.md
new file mode 100644
index 0000000000..4e1e401285
--- /dev/null
+++ b/release-notes/4125.md
@@ -0,0 +1 @@
+Added link to show all Issues/PullRequests
diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
index 5d13ccc97c..2f077572ac 100644
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@@ -456,6 +456,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt
 	ctx.Data["IssueStats"] = issueStats
 	ctx.Data["OpenCount"] = issueStats.OpenCount
 	ctx.Data["ClosedCount"] = issueStats.ClosedCount
+	ctx.Data["AllCount"] = issueStats.AllCount
 	linkStr := "%s?q=%s&type=%s&sort=%s&state=%s&labels=%s&milestone=%d&project=%d&assignee=%d&poster=%d&archived=%t"
 	ctx.Data["AllStatesLink"] = fmt.Sprintf(linkStr, ctx.Link,
 		url.QueryEscape(keyword), url.QueryEscape(viewType), url.QueryEscape(sortType), "all", url.QueryEscape(selectLabels),
diff --git a/templates/repo/issue/openclose.tmpl b/templates/repo/issue/openclose.tmpl
index eb2d6e09ee..5de1d1f639 100644
--- a/templates/repo/issue/openclose.tmpl
+++ b/templates/repo/issue/openclose.tmpl
@@ -1,5 +1,5 @@
 

-	
+	
 		{{if .PageIsMilestones}}
 			{{svg "octicon-milestone" 16 "tw-mr-2"}}
 		{{else if .PageIsPullList}}
@@ -9,8 +9,12 @@
 		{{end}}
 		{{ctx.Locale.PrettyNumber .OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}}
 	
-	
+	
 		{{svg "octicon-check" 16 "tw-mr-2"}}
 		{{ctx.Locale.PrettyNumber .ClosedCount}} {{ctx.Locale.Tr "repo.issues.closed_title"}}
 	
+	
+		{{svg "octicon-eye" 16 "tw-mr-2"}}
+		{{ctx.Locale.PrettyNumber (.AllCount)}} {{ctx.Locale.Tr "repo.issues.all_title"}}
+	
 

diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go
index 909242efc6..f6713519c6 100644
--- a/tests/integration/issue_test.go
+++ b/tests/integration/issue_test.go
@@ -1301,3 +1301,21 @@ func TestIssueUserDashboard(t *testing.T) {
 		htmlDoc.AssertElement(t, sel, true)
 	}
 }
+
+func TestIssueCount(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	req := NewRequest(t, "GET", "/user2/repo1/issues")
+	resp := MakeRequest(t, req, http.StatusOK)
+
+	htmlDoc := NewHTMLParser(t, resp.Body)
+
+	openCount := htmlDoc.doc.Find("a[data-test-name='open-issue-count']").Text()
+	assert.Contains(t, openCount, "1\u00a0Open")
+
+	closedCount := htmlDoc.doc.Find("a[data-test-name='closed-issue-count']").Text()
+	assert.Contains(t, closedCount, "1\u00a0Closed")
+
+	allCount := htmlDoc.doc.Find("a[data-test-name='all-issue-count']").Text()
+	assert.Contains(t, allCount, "2\u00a0All")
+}

From 82b1ab56de93afeb6eb010058101098aee34e355 Mon Sep 17 00:00:00 2001
From: ehshi 
Date: Wed, 9 Oct 2024 09:28:37 +0000
Subject: [PATCH 123/443] update git book link to v2 (#5503)

## Checklist

The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org).

### Tests

- I added test coverage for Go changes...
  - [ ] in their respective `*_test.go` for unit tests.
  - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server.
- I added test coverage for JavaScript changes...
  - [ ] in `web_src/js/*.test.js` if it can be unit tested.
  - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)).

### Documentation

- [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change.
- [x] I did not document these changes and I do not expect someone else to do it.

### Release notes

- [ ] I do not want this change to show in the release notes.
- [ ] I want the title to show in the release notes with a link to this pull request.
- [ ] I want the content of the `release-notes/.md` to be be used for the release notes instead of the title.

Co-authored-by: Ehsan Shirvanian 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5503
Reviewed-by: Earl Warren 
Co-authored-by: ehshi 
Co-committed-by: ehshi 
---
 modules/git/git.go        | 4 ++--
 templates/repo/empty.tmpl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/git/git.go b/modules/git/git.go
index 851b563e88..f1174e67b9 100644
--- a/modules/git/git.go
+++ b/modules/git/git.go
@@ -97,12 +97,12 @@ func SetExecutablePath(path string) error {
 	}
 
 	if gitVersion.LessThan(versionRequired) {
-		moreHint := "get git: https://git-scm.com/download/"
+		moreHint := "get git: https://git-scm.com/downloads"
 		if runtime.GOOS == "linux" {
 			// there are a lot of CentOS/RHEL users using old git, so we add a special hint for them
 			if _, err = os.Stat("/etc/redhat-release"); err == nil {
 				// ius.io is the recommended official(git-scm.com) method to install git
-				moreHint = "get git: https://git-scm.com/download/linux and https://ius.io"
+				moreHint = "get git: https://git-scm.com/downloads/linux and https://ius.io"
 			}
 		}
 		return fmt.Errorf("installed git version %q is not supported, Gitea requires git version >= %q, %s", gitVersion.Original(), RequiredVersion, moreHint)
diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl
index cb2a5ba1e9..7613643351 100644
--- a/templates/repo/empty.tmpl
+++ b/templates/repo/empty.tmpl
@@ -24,7 +24,7 @@
 					
 					

 						

-							
{{ctx.Locale.Tr "repo.clone_this_repo"}} {{ctx.Locale.Tr "repo.clone_helper" "http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository"}}

+							
{{ctx.Locale.Tr "repo.clone_this_repo"}} {{ctx.Locale.Tr "repo.clone_helper" "http://git-scm.com/book/en/v2/Git-Basics-Getting-a-Git-Repository"}}

 
 							

 								{{if and .CanWriteCode (not .Repository.IsArchived)}}

From e988a25237bece5a1235d40f739900f633ce9dc4 Mon Sep 17 00:00:00 2001
From: TimedIn 
Date: Wed, 9 Oct 2024 14:12:46 +0200
Subject: [PATCH 124/443] Small fixes and rename for #5482 - New Issue Fixed
 assign me being hidden after assignees were cleared
 https://codeberg.org/forgejo/forgejo/pulls/5482/files#issuecomment-2365431 -
 Test for verifying the above - Removed wait for network idle from e2e test -
 Renamed templ key assigneeId to assigneeIds

---
 services/forms/repo_form.go                              | 2 +-
 templates/repo/issue/view_content/sidebar/assignees.tmpl | 6 +++---
 tests/e2e/issue-sidebar.test.e2e.js                      | 6 ++----
 web_src/js/features/repo-legacy.js                       | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go
index 654106c47a..c3d9c3edc9 100644
--- a/services/forms/repo_form.go
+++ b/services/forms/repo_form.go
@@ -317,7 +317,7 @@ type WebhookForm struct {
 type CreateIssueForm struct {
 	Title               string `binding:"Required;MaxSize(255)"`
 	LabelIDs            string `form:"label_ids"`
-	AssigneeIDs         string `form:"assignee_id"`
+	AssigneeIDs         string `form:"assignee_ids"`
 	Ref                 string `form:"ref"`
 	MilestoneID         int64
 	ProjectID           int64
diff --git a/templates/repo/issue/view_content/sidebar/assignees.tmpl b/templates/repo/issue/view_content/sidebar/assignees.tmpl
index 8e5043c076..7a928fae46 100644
--- a/templates/repo/issue/view_content/sidebar/assignees.tmpl
+++ b/templates/repo/issue/view_content/sidebar/assignees.tmpl
@@ -1,4 +1,4 @@
-
+
 

 	
 		{{ctx.Locale.Tr "repo.issues.new.assignees"}}
@@ -6,7 +6,7 @@
 			{{svg "octicon-gear" 16 "tw-ml-1"}}
 		{{end}}
 	
-	

+	

 		

 			{{svg "octicon-search" 16}}
 			
@@ -36,7 +36,7 @@
 		{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
 			{{with index .Assignees 0}}
 				–
-				
+				
 					{{ctx.Locale.Tr "repo.issues.new.assign_to_me"}}
 				
 			{{end}}
diff --git a/tests/e2e/issue-sidebar.test.e2e.js b/tests/e2e/issue-sidebar.test.e2e.js
index 0409eab9e1..7fd60555be 100644
--- a/tests/e2e/issue-sidebar.test.e2e.js
+++ b/tests/e2e/issue-sidebar.test.e2e.js
@@ -119,10 +119,10 @@ test('Issue: Assignees', async ({browser}, workerInfo) => {
   // Clear all assignees
   await page.locator('.select-assignees-modify.dropdown').click();
   await page.locator('.select-assignees-modify.dropdown .no-select.item').click();
-  await page.waitForLoadState('networkidle');
   await expect(assigneesList.filter({hasText: 'user2'})).toBeHidden();
   await expect(assigneesList.filter({hasText: 'user4'})).toBeHidden();
   await expect(page.locator('.ui.assignees.list .item.no-select')).toBeVisible();
+  await expect(page.locator('.select-assign-me')).toBeVisible();
 
   // Assign other user (with searchbox)
   await page.locator('.select-assignees-modify.dropdown').click();
@@ -131,20 +131,17 @@ test('Issue: Assignees', async ({browser}, workerInfo) => {
   await expect(page.locator('.select-assignees-modify .menu .item').filter({hasText: 'user4'})).toBeVisible();
   await page.locator('.select-assignees-modify .menu .item').filter({hasText: 'user4'}).click();
   await page.locator('.select-assignees-modify.dropdown').click();
-  await page.waitForLoadState('networkidle');
   await expect(assigneesList.filter({hasText: 'user4'})).toBeVisible();
 
   // remove user4
   await page.locator('.select-assignees-modify.dropdown').click();
   await page.locator('.select-assignees-modify .menu .item').filter({hasText: 'user4'}).click();
   await page.locator('.select-assignees-modify.dropdown').click();
-  await page.waitForLoadState('networkidle');
   await expect(page.locator('.ui.assignees.list .item.no-select')).toBeVisible();
   await expect(assigneesList.filter({hasText: 'user4'})).toBeHidden();
 
   // Test assign me
   await page.locator('.ui.assignees .select-assign-me').click();
-  await page.waitForLoadState('networkidle');
   await expect(assigneesList.filter({hasText: 'user2'})).toBeVisible();
   await expect(page.locator('.ui.assignees.list .item.no-select')).toBeHidden();
 });
@@ -186,6 +183,7 @@ test('New Issue: Assignees', async ({browser}, workerInfo) => {
   await page.locator('.select-assignees.dropdown').click();
   await page.fill('.select-assignees .menu .search input', '');
   await page.locator('.select-assignees.dropdown .no-select.item').click();
+  await expect(page.locator('.select-assign-me')).toBeVisible();
 });
 
 test('Issue: Milestone', async ({browser}, workerInfo) => {
diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js
index cb92fcedb5..73aaa457f2 100644
--- a/web_src/js/features/repo-legacy.js
+++ b/web_src/js/features/repo-legacy.js
@@ -256,7 +256,7 @@ export function initRepoCommentForm() {
         icon = svg('octicon-milestone', 18, 'tw-mr-2');
       } else if (input_id === '#project_id') {
         icon = svg('octicon-project', 18, 'tw-mr-2');
-      } else if (input_id === '#assignee_id') {
+      } else if (input_id === '#assignee_ids') {
         icon = `avatar`;
       }
 
@@ -296,7 +296,7 @@ export function initRepoCommentForm() {
   // Milestone, Assignee, Project
   selectItem('.select-project', '#project_id');
   selectItem('.select-milestone', '#milestone_id');
-  selectItem('.select-assignee', '#assignee_id');
+  selectItem('.select-assignee', '#assignee_ids');
 }
 
 async function onEditContent(event) {

From e39d7a1ee9764442a8d12b7bb4057b1c64bc7cfd Mon Sep 17 00:00:00 2001
From: kytta 
Date: Wed, 9 Oct 2024 12:20:29 +0000
Subject: [PATCH 125/443] Do not change stroke size in the loading animation

Signed-off-by: kytta 
---
 public/assets/img/forgejo-loading.svg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/assets/img/forgejo-loading.svg b/public/assets/img/forgejo-loading.svg
index 919552ebb5..f85fb37c8d 100644
--- a/public/assets/img/forgejo-loading.svg
+++ b/public/assets/img/forgejo-loading.svg
@@ -1,6 +1,6 @@
 
   
   
     

From ba5ec661823b2a0cd806db8bb2e864f86e47f7fd Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Thu, 10 Oct 2024 00:03:17 +0000
Subject: [PATCH 126/443] Update module golang.org/x/net to v0.30.0

---
 go.mod |  6 +++---
 go.sum | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/go.mod b/go.mod
index 2ca84bdebc..b335745e93 100644
--- a/go.mod
+++ b/go.mod
@@ -100,11 +100,11 @@ require (
 	github.com/yuin/goldmark v1.7.4
 	github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
 	go.uber.org/mock v0.4.0
-	golang.org/x/crypto v0.27.0
+	golang.org/x/crypto v0.28.0
 	golang.org/x/image v0.21.0
-	golang.org/x/net v0.29.0
+	golang.org/x/net v0.30.0
 	golang.org/x/oauth2 v0.23.0
-	golang.org/x/sys v0.25.0
+	golang.org/x/sys v0.26.0
 	golang.org/x/text v0.19.0
 	golang.org/x/tools v0.25.0
 	google.golang.org/grpc v1.66.2
diff --git a/go.sum b/go.sum
index c890adaf2a..9a83587b52 100644
--- a/go.sum
+++ b/go.sum
@@ -730,8 +730,8 @@ golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2Uz
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
-golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
-golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
 golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA=
 golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
 golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s=
@@ -757,8 +757,8 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
-golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
 golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -798,8 +798,8 @@ golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
@@ -809,8 +809,8 @@ golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
-golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
-golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
+golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
+golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

From 4252035f78edcd241a2fa74fe087dcadd2bafbbc Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Thu, 10 Oct 2024 00:03:34 +0000
Subject: [PATCH 127/443] Update module golang.org/x/sys to v0.26.0

---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 2ca84bdebc..aef29ec2f3 100644
--- a/go.mod
+++ b/go.mod
@@ -104,7 +104,7 @@ require (
 	golang.org/x/image v0.21.0
 	golang.org/x/net v0.29.0
 	golang.org/x/oauth2 v0.23.0
-	golang.org/x/sys v0.25.0
+	golang.org/x/sys v0.26.0
 	golang.org/x/text v0.19.0
 	golang.org/x/tools v0.25.0
 	google.golang.org/grpc v1.66.2
diff --git a/go.sum b/go.sum
index c890adaf2a..19c4a523eb 100644
--- a/go.sum
+++ b/go.sum
@@ -798,8 +798,8 @@ golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=

From b1dcd28b7e4289ead9152714c85141707c006e2e Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Thu, 10 Oct 2024 02:04:07 +0000
Subject: [PATCH 128/443] Update module google.golang.org/protobuf to v1.35.1

---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 2ca84bdebc..546a29b174 100644
--- a/go.mod
+++ b/go.mod
@@ -108,7 +108,7 @@ require (
 	golang.org/x/text v0.19.0
 	golang.org/x/tools v0.25.0
 	google.golang.org/grpc v1.66.2
-	google.golang.org/protobuf v1.34.2
+	google.golang.org/protobuf v1.35.1
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	gopkg.in/ini.v1 v1.67.0
 	gopkg.in/yaml.v3 v3.0.1
diff --git a/go.sum b/go.sum
index c890adaf2a..2de10429c7 100644
--- a/go.sum
+++ b/go.sum
@@ -852,8 +852,8 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

From 90182a62045de664e11ed98dde9a2d88a2033224 Mon Sep 17 00:00:00 2001
From: Codeberg Translate 
Date: Thu, 10 Oct 2024 05:22:07 +0000
Subject: [PATCH 129/443] i18n: update of translations from Codeberg Translate
 (#5471)

Co-authored-by: 413x1nkp <413x1nkp@users.noreply.translate.codeberg.org>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: Juno Takano 
Co-authored-by: feroli 
Co-authored-by: pgmtx 
Co-authored-by: kwoot 
Co-authored-by: atarwn 
Co-authored-by: Benny 
Co-authored-by: Fjuro 
Co-authored-by: JoseDouglas26 
Co-authored-by: Outbreak2096 
Co-authored-by: whitecold 
Co-authored-by: sinsky 
Co-authored-by: William_Weber_Berrutti 
Co-authored-by: eldyj 
Co-authored-by: CDN18 
Co-authored-by: jaahas 
Co-authored-by: aleksi 
Co-authored-by: stevenroose 
Co-authored-by: lumi200 
Co-authored-by: marcoaraujojunior 
Co-authored-by: SmolLemon 
Co-authored-by: timedin 
Co-authored-by: Vaclovas Intas 
Co-authored-by: thodorisl 
Co-authored-by: SerikaFrame 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5471
Reviewed-by: Earl Warren 
Co-authored-by: Codeberg Translate 
Co-committed-by: Codeberg Translate 
---
 options/locale/locale_ar.ini    |  13 +-
 options/locale/locale_cs-CZ.ini |   5 +
 options/locale/locale_de-DE.ini |   5 +
 options/locale/locale_el-GR.ini |   2 +
 options/locale/locale_eo.ini    | 198 ++++++++++++++-------
 options/locale/locale_es-ES.ini |   7 +-
 options/locale/locale_fi-FI.ini |  13 +-
 options/locale/locale_fr-FR.ini |  80 ++++++++-
 options/locale/locale_hu-HU.ini |  60 ++++++-
 options/locale/locale_it-IT.ini |  10 +-
 options/locale/locale_ja-JP.ini | 181 +++++++++++++------
 options/locale/locale_lt.ini    |  17 +-
 options/locale/locale_nl-NL.ini |   3 +
 options/locale/locale_pl-PL.ini |  58 +++---
 options/locale/locale_pt-BR.ini | 301 ++++++++++++++++++++++++++------
 options/locale/locale_pt-PT.ini |   2 +
 options/locale/locale_ru-RU.ini |  98 ++++++-----
 options/locale/locale_uk-UA.ini | 290 ++++++++++++++++++++++++++----
 options/locale/locale_vi.ini    |   6 +-
 options/locale/locale_zh-CN.ini |  24 ++-
 20 files changed, 1061 insertions(+), 312 deletions(-)

diff --git a/options/locale/locale_ar.ini b/options/locale/locale_ar.ini
index 00d7b9486e..76fe2a3fdd 100644
--- a/options/locale/locale_ar.ini
+++ b/options/locale/locale_ar.ini
@@ -142,6 +142,11 @@ filter.not_fork = ليست اشتقاقات
 filter.not_archived = ليس مؤرشف
 filter.public = علني
 filter.private = خاص
+new_repo.title = مستودع جديد
+new_migrate.title = انتقال جديد
+new_org.title = منظمة جديدة
+new_repo.link = مستودع جديد
+new_migrate.link = انتقال جديد
 
 [install]
 db_name = اسم قاعدة البيانات
@@ -1982,4 +1987,10 @@ match_tooltip = قم بتضمين النتائج التي تطابق مصطلح
 repo_kind = بحث في المستودعات...
 user_kind = بحث عن المستخدمين...
 team_kind = بحث عن الفرق ...
-code_kind = بحث في الكود...
\ No newline at end of file
+code_kind = بحث في الكود...
+project_kind = البحث ضمن المشاريع...
+branch_kind = البحث ضمن الفروع...
+no_results = لا توجد نتائج مطابقة.
+issue_kind = البحث ضمن الأعطال...
+pull_kind = البحث ضمن طلبات السحب...
+keyword_search_unavailable = البحث من خلال الكلمات المفتاحية ليس متوفر حالياً. رجاءاً تواصل مع مشرف الموقع.
\ No newline at end of file
diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
index 0eb5e1afef..ead5c68d95 100644
--- a/options/locale/locale_cs-CZ.ini
+++ b/options/locale/locale_cs-CZ.ini
@@ -478,6 +478,7 @@ hint_register = Nemáte účet? Zaregistrujte se nyní.
 sign_up_button = Zaregistrujte se nyní.
 back_to_sign_in = Zpět na přihlášení
 sign_in_openid = Pokračovat s OpenID
+unauthorized_credentials = Údaje jsou nesprávné nebo vypršely. Opakujte svůj příkaz nebo se podívejte na %s pro více informací
 
 [mail]
 view_it_on=Zobrazit na %s
@@ -2841,6 +2842,8 @@ mirror_denied_combination = Nelze použít kombinaci ověřování pomocí veře
 mirror_public_key = Veřejný klíč SSH
 settings.mirror_settings.push_mirror.none_ssh = Žádné
 mirror_use_ssh.not_available = Ověřování SSH není dostupné.
+issues.new.assign_to_me = Přiřadit mně
+issues.all_title = Vše
 
 [graphs]
 component_loading_info = Tohle může chvíli trvat…
@@ -3970,6 +3973,8 @@ pull_kind = Hledat pully...
 union = Sdružené
 union_tooltip = Zahrnout výsledky, které odpovídají jakýmkoli slovům odděleným mezerami
 milestone_kind = Hledat milníky...
+regexp = RegExp
+regexp_tooltip = Interpretovat hledaný výraz jako regulární výraz
 
 [markup]
 filepreview.lines = Řádky %[1]d až %[2]d v souboru %[3]s
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
index a0c2c0c1fa..4e194d646c 100644
--- a/options/locale/locale_de-DE.ini
+++ b/options/locale/locale_de-DE.ini
@@ -476,6 +476,7 @@ back_to_sign_in = Zurück zur Anmeldung
 sign_in_openid = Mit OpenID fortfahren
 hint_login = Hast du bereits ein Konto? Jetzt anmelden!
 hint_register = Brauchst du ein Konto? Jetzt registrieren.
+unauthorized_credentials = Die Zugangsdaten sind inkorrekt oder abgelaufen. Versuchen es erneut oder siehe %s für mehr Informationen
 
 [mail]
 view_it_on=Auf %s ansehen
@@ -2826,6 +2827,8 @@ mirror_denied_combination = Authentifizierung mittels öffentlichem Schlüssel u
 settings.mirror_settings.push_mirror.none_ssh = Nichts
 settings.mirror_settings.push_mirror.copy_public_key = Öffentlichen Schlüssel kopieren
 mirror_use_ssh.not_available = SSH-Authentifizierung ist nicht verfügbar.
+issues.new.assign_to_me = Mir selbst zuweisen
+issues.all_title = Alle
 
 [graphs]
 
@@ -3947,6 +3950,8 @@ pull_kind = Pulls durchsuchen …
 union = Vereinigungsmenge
 union_tooltip = Ergebnisse, die auf ein beliebiges von den Whitespace getrennten Schlüsselwörtern passen, einbinden
 milestone_kind = Meilensteine suchen …
+regexp = RegExp
+regexp_tooltip = Suchbegriff als regulären Ausdruck interpretieren
 
 [markup]
 filepreview.line = Zeile %[1]d in %[2]s
diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini
index 5227c8a7fc..05af282d5a 100644
--- a/options/locale/locale_el-GR.ini
+++ b/options/locale/locale_el-GR.ini
@@ -2815,6 +2815,8 @@ no_eol.tooltip = Αυτό το αρχείο δεν περιέχει έναν χ
 release.add_external_asset = Προσθήκη εξωτερικού αρχείου
 milestones.filter_sort.name = Όνομα
 release.type_external_asset = Εξωτερικό αρχείο
+mirror_public_key = Δημόσιο κλειδί SSH
+mirror_use_ssh.helper = το Forgejo θα κατοπτρίσει το αποθετήριο μέσω Git με τη χρήση SSH και θα δημιουργήσει ένα ζεύγος κλειδιών. Πρέπει να εξασφαλίσετε πως το δημιουργημένο κλειδί είναι εξουσιοδοτημένο να ωθεί στο αποθετήριο προορισμού. Εφόσον το έχετε επιλέξει, δε μπορείτε να χρησιμοποιήσετε εξουσιοδότηση συνθηματικού.
 
 [graphs]
 component_loading_failed = Δεν ήταν δυνατή η φόρτωση του %s
diff --git a/options/locale/locale_eo.ini b/options/locale/locale_eo.ini
index 2c7105270b..5210c2c428 100644
--- a/options/locale/locale_eo.ini
+++ b/options/locale/locale_eo.ini
@@ -29,7 +29,7 @@ your_profile = Profilo
 sign_out = Adiaŭi
 settings = Agordoj
 logo = Emblemo
-toc = Listo de enhavo
+toc = Enhavotabelo
 admin_panel = Retejadministrado
 webauthn_unsupported_browser = Via retfoliumilo ne jam subtenas la salutmanieron WebAuthn.
 new_org = Novan organizaĵon
@@ -53,7 +53,7 @@ template = Ŝablono
 webauthn_press_button = Bonvolu premi la butonon sur via sekurŝlosilo…
 signed_in_as = Salutinta kiel
 sign_up = Registriĝi
-enable_javascript = Ĉi tiu retejo bezonas JavaScript’on.
+enable_javascript = Ĉi tiu retejo bezonas JavaSkripton.
 home = Hejmo
 email = Retpoŝtadreso
 your_settings = Agordoj
@@ -65,7 +65,7 @@ collaborative = Kunlaboraj
 pull_requests = Tirpetoj
 cancel = Nuligi
 preview = Antaŭvido
-disabled = Malŝaltita
+disabled = Malaktivigita
 go_back = Reiri
 copy_content = Kopii enhavon
 archived = Arĥivita
@@ -108,12 +108,12 @@ unknown = Nekonata
 issues = Eraroj
 error404 = Aŭ tiu ĉi paĝo ne ekzistas aŭ vi ne rajtas vidi ĝin.
 retry = Reprovi
-activities = Agoj
+activities = Aktivecoj
 confirm_delete_selected = Konfirmi forigon de ĉiu elektito?
-forks = Disbranĉiĝaj
+forks = Disbranĉigoj
 new_mirror = Novan spegulon
 re_type = Retajpu pasvorton
-new_fork = Novan disbranĉiĝon de deponejo
+new_fork = Novan disbranĉiĝo de deponejo
 new_project_column = Novan kolumnon
 new_migrate = Novan enporton
 mirror = Spegulo
@@ -122,12 +122,12 @@ remove = Forigi
 filter = Filtri
 filter.is_archived = Arĥivita
 filter.not_archived = Nearĥivita
-filter.is_fork = Disbranĉigita
-filter.not_fork = Nedisbranĉigita
-filter.is_mirror = Spegulita
-filter.not_mirror = Nespegulita
-filter.is_template = Ŝablono
-filter.not_template = Neŝablono
+filter.is_fork = Disbranĉigoj
+filter.not_fork = Ne disbranĉigoj
+filter.is_mirror = Speguloj
+filter.not_mirror = Ne speguloj
+filter.is_template = Ŝablonoj
+filter.not_template = Ne ŝablonoj
 filter.public = Publika
 filter.private = Privata
 dashboard = Labortablo
@@ -142,6 +142,14 @@ copy_generic = Kopii al tondujo
 confirm_delete_artifact = Ĉu vi certas, ke vi volas forigi la artefakton "%s"?
 artifacts = Artefaktoj
 new_repo.title = Novan deponejon
+filter.clear = Forigi filtrilojn
+new_migrate.title = Novan migrigon
+new_org.title = Novan organizaĵon
+new_repo.link = Novan deponejon
+new_migrate.link = Novan migrigon
+new_org.link = Novan organizaĵon
+error413 = Vi plenkonsumis vian kvoton.
+twofa_scratch = Sukuranta kodo por duobla aŭtentikigo
 
 [editor]
 buttons.list.ordered.tooltip = Aldoni nombran liston
@@ -158,10 +166,12 @@ buttons.mention.tooltip = Mencii uzanton aŭ grupon
 buttons.italic.tooltip = Aldoni oblikvan tekston
 buttons.link.tooltip = Aldoni ligilon
 buttons.disable_monospace_font = Malsalti egallarĝan signoformaron
+buttons.indent.tooltip = Krommarĝeni erojn je unu nivelo
+buttons.unindent.tooltip = Malkrommarĝeni erojn je unu nivelo
 
 [aria]
 navbar = Esplora breto
-footer.software = Pri programaro
+footer.software = Pri ĉi tiu programaro
 footer.links = Ligiloj
 footer = Piedo
 
@@ -176,13 +186,16 @@ network_error = Reteraro
 invalid_csrf = Malvalida peto: malvalida CSRF-kodo
 occurred = Eraris iel
 missing_csrf = Malvalida peto: neniu CSRF-kodo
-server_internal = Eraris interno de servilo
+server_internal = Ena servila eraro
 
 [heatmap]
 less = Malpli
 number_of_contributions_in_the_last_12_months = %s kontribuoj dum la pasintaj 12 monatoj
 contributions_zero = Neniu kontribuo
 more = Pli
+contributions_format = {contributions} la {day}-an de {month} {year}
+contributions_one = kontribuaĵo
+contributions_few = kontribuaĵoj
 
 [startpage]
 app_desc = Senpena kaj memgastigebla Git-servo
@@ -199,37 +212,37 @@ license_desc = Ek, prenu gvidpaĝojn antaŭ ajna agordoŝanĝo.
@@ -245,67 +258,71 @@ federated_avatar_lookup = Ŝalti federajn profilbildojn
 optional_title = Malnepraj agordoj
 domain_helper = Retnomo aŭ adreso de la servilo.
 mail_notify = Ŝalti retpoŝtajn sciigojn
-app_url = Forgejo Baza URL
+app_url = Baza URL
 ssl_mode = SSL
 db_title = Datumbazaj agordoj
 err_empty_db_path = La datumbazovojo de SQLite3 ne malplenu.
-openid_signin.description = Ŝaltas salutadon per OpenID.
+openid_signin.description = Permesas al la uzantoj ensaluti per OpenID.
 smtp_from_helper = Retpoŝtadreson kiun uzos Forgejo. Enmetu ordinaran adreson aŭ laŭ la formo «"Name" ».
-enable_captcha.description = Postulas teston de homeco dum registriĝoj.
-ssh_port_helper = Adresporda numero kiun atentas via SSH-servilo. Lasu malplena por malŝalti.
+enable_captcha.description = Postuli teston de homeco al la uzantoj kreantaj kontojn.
+ssh_port_helper = Adresporda numero kiu estos uzata de la SSH-servilo. Lasu malplena por malaktivigi la SSH-servilon.
 lfs_path = Git LFS dosiervojo
-app_name_helper = Vi povas enmeti la nomon de via kompanio ĉi tien.
-http_port_helper = Adresporda numero kiun atentos la HTTP-servilo de Forgejo.
-http_port = Forgejo HTTP adrespordo
+app_name_helper = Vi povas enmeti la nomon de via kompanio ĉi tien. Ĝi montriĝos en ĉiuj retpaĝoj.
+http_port_helper = Adresporda numero kiu estos uzta de la HTTP-servilo de Forgejo.
+http_port = HTTP adrespordo
 db_schema_helper = Lasu malplena por implicita («public»).
 ssh_port = SSH adrespordo
 err_admin_name_is_reserved = Uzantonomo de administranto malvalidas, tiu uzantonomo estas rezerva
-openid_signup.description = Ŝaltas uzantregistriĝon per OpenID.
+openid_signup.description = Permesi al la uzantoj krei kontojn per OpenID se reĝitriĝo aktivas.
 db_type = Datumbazospeco
 email_title = Retpoŝtaj agordoj
 offline_mode = Ŝalti lokan reĝimon
 reinstall_confirm_check_1 = La datumoj ĉifritaj per la ŝlosilo SECRET_KEY en app.ini eble perdiĝos; eblas ke uzantoj ne povos saluti per dumaniera-saluto aŭ unufojaj pasvortoj, kaj ke spegulado ne funkcios ĝuste. Ŝaltinte tiun ĉi skatolon, vi asertas ke la nuna app.ini dosiero enhavas la ĝustan SECRET_KEY.
 app_name = Retejonomo
 server_service_title = Servilaj kaj fremdservaj agordoj
-require_sign_in_view = Postuli saluton por vidi paĝojn
+require_sign_in_view = Postuli saluton por vidi instancan enhavon
 register_confirm = Postuli retpoŝtan kontrolon por registri
 admin_password = Pasvorto
 admin_title = Administrantaj kontagordoj
 admin_email = Retpoŝtadreso
 install_btn_confirm = Instali Forgejon
-require_sign_in_view.description = Kaŝi paĝon de ajna nesalutinto. Vizitantoj sole vidos salutajn kaj registriĝajn paĝojn.
+require_sign_in_view.description = Kaŝi paĝon de ajna nesalutinto. Vizitantoj nur vidos salutajn kaj registriĝajn paĝojn.
 invalid_db_setting = La datumbazaj agordoj malvalidas: %v
 invalid_db_table = La datumbaza tabelo «%s» malvalidas: %v
 sqlite3_not_available = Ĉi tiu versio de Forgejo ne subtenas SQLite3. Bonvolu elŝuti la oficialan ruldosieron de %s (ne la version «gobuild»).
 invalid_app_data_path = La programdatuma dosiervojo malvalidas: %s
-test_git_failed = Ne povis testi programon «git»: %v
+test_git_failed = Ne povis testi "git" komandon: %v
 confirm_password = Konfirmi pasvorton
 invalid_repo_path = La deponeja dosiervojo malvalidas: %v
-admin_name = Administranto uzantonomo
-admin_setting.description = Krei administranton estas malnepra. La unue registrota uzanto memage iĝos administranto.
-run_user_not_match = La «rulu kiel» uzantonomo ne samas al la nuna uzantonomo: %s -> %s
+admin_name = Administranta uzantnomo
+admin_setting.description = Krei administrantan konton malnepras. La unua registrota uzanto aŭtomate iĝos administranto.
+run_user_not_match = La "ruli kiel tiu uzanto" uzantnomo ne samas al la nuna uzantnomo: %s -> %s
 secret_key_failed = Malsukcesis kreante sekretan ŝlosilon: %v
 save_config_failed = Malsukcesis konservante agordojn: %v
 invalid_admin_setting = Agordoj de administranta konto malvalidas: %v
-enable_update_checker_helper_forgejo = Foje serĉas novajn versiojn de Forgejo per kontrolado de DNS TXT registraĵo ĉe release.forgejo.org.
+enable_update_checker_helper_forgejo = Periode serĉos novajn versiojn de Forgejo kontrolante DNS TXT registraĵon ĉe release.forgejo.org.
 invalid_log_root_path = La protokola dosiervojo malvalidas: %v
-default_enable_timetracking = Ŝalti tempospuradon implicite
-default_enable_timetracking.description = Ŝaltus tempospuradon por novaj deponejoj implicite.
-default_keep_email_private.description = Kaŝus retpoŝtadresojn de novaj kontoj implicite.
-default_allow_create_organization = Permesi kreadon de organizaĵoj implicite
+default_enable_timetracking = Aktivigi tempospuradon defaŭlte
+default_enable_timetracking.description = Aktivigas tempospuradon por novaj deponejoj defaŭlte.
+default_keep_email_private.description = Kaŝi defaŭlte retpoŝtadresojn por novaj uzantoj por ke iliaj informoj ne senprokraste likiĝas post reĝistriĝo.
+default_allow_create_organization = Permesi kreadon de organizaĵoj defaŭlte
 allow_dots_in_usernames = Permesi ĉeeston de punktoj en uzantonomoj. Ne efikas je jamaj kontoj.
-no_reply_address = Retnomo de retpoŝtaj kaŝadresoj
-default_keep_email_private = Kaŝi retpoŝtadresojn implicite
-default_allow_create_organization.description = Permesus novajn uzantojn krei organizaĵojn implicite.
+no_reply_address = Retnomo por kaŝitaj retpoŝtadresoj
+default_keep_email_private = Kaŝi retpoŝtadresojn defaŭlte
+default_allow_create_organization.description = Permesi al novaj uzantoj krei organizaĵojn defaŭlte. Kiam ĉi tiu opcio malaktiviĝas, administranto devos permesi al novaj uzantoj krei organizaĵojn.
 env_config_keys_prompt = La jenaj mediaj variantoj ankaŭ fandiĝos kun via agordodosiero:
 no_reply_address_helper = Retnomo kiu uziĝus por uzantoj kun kaŝita retpoŝtadreso. Ekzemple, la uzanto «adamo» protokoliĝus je Git kiel «adamo@nerespondu.ekzemplo.org» se la adreskaŝa retnomo estus «nerespondu.ekzemplo.org».
-enable_update_checker = Ŝalti novversian kontrolanton
+enable_update_checker = Aktivigi novversian kontrolanton
 password_algorithm = Pasvorthaketiga algoritmo
 env_config_keys = Mediagordoj
 invalid_password_algorithm = Malvalida pasvorthakeita algoritmo
 password_algorithm_helper = Agordas la pasvorthaketigan algoritmon. Algoritmoj havas malsamajn postulojn kaj efikecojn. La algoritmo argon2 sufiĉe sekuras, sed postulas multan memoron kaj eble ne taŭgas por nepotencaj serviloj.
 internal_token_failed = Malsukcesis krei internan ĵetonon: %v
 smtp_from_invalid = La «Sendu retleterojn kiel» adreso malvalidas
+allow_only_external_registration = Permesi registriĝon nur per fremdaj servoj
+app_slogan = Instanca frapfrazo
+app_slogan_helper = Enigu vian instancan frapfrazon ĉi tien. Lasu malplena por malaktivigi.
+config_location_hint = Ĉi tiuj agordoj konserviĝos en:
 
 [admin]
 config.app_data_path = Programdatuja doseiervojo
@@ -315,8 +332,8 @@ config.allow_dots_in_usernames = Permesi ĉeeston de punktoj en uzantonomoj. Ne
 filter = Aliaj filtriloj
 show_archived = Arĥivita
 search_repos = Serĉi deponejon…
-my_orgs = Miaj organizaĵoj
-uname_holder = Uzantonomo aŭ Retpoŝtadreso
+my_orgs = Organizaĵoj
+uname_holder = Uzantnomo aŭ retpoŝtadreso
 my_repos = Deponejoj
 show_both_archived_unarchived = Montras arĥivitajn kaj nearĥivitajn
 feed_of = Fluo de «%s»
@@ -333,7 +350,7 @@ show_only_unarchived = Montras sole nearĥivitajn
 my_mirrors = Miaj speguloj
 show_only_archived = Montras sole arĥivitajn
 view_home = Vidi %s
-switch_dashboard_context = Ŝanĝi labortablon
+switch_dashboard_context = Baskuli la kuntekston de la kontrolpanelo
 
 [explore]
 search.match.tooltip = Inkluzivu sole rezultojn kiuj akordas precize la serĉomendon
@@ -355,22 +372,26 @@ code_search_results = Serĉrezultoj je «%s»
 relevant_repositories = Sole montras aktualajn deponejojn, montri senfiltrajn rezultojn.
 code_last_indexed_at = Plejfreŝe esplorita je %s
 code_no_results = Neniu fontkodo akorda laŭ via serĉomendo trovita.
+forks_few = %d disbranĉigoj
+stars_one = %d stelo
+forks_one = %d disbranĉigo
+stars_few = %d steloj
 
 [auth]
-disable_register_mail = Retpoŝta konfirmado dum registriĝo estas malŝaltita.
+disable_register_mail = Retpoŝta konfirmado dum registriĝo estas malaktivigita.
 sign_up_successful = Konto sukcese kreita. Bonvenon!
 forgot_password = Ĉu forgesis pasvorton?
 sign_up_now = Ĉu bezonas konton? Registriĝu nun.
 forgot_password_title = Forgesis pasvorton
 social_register_helper_msg = Ĉu vi jam havas konton? Alligu ĝin nun!
 create_new_account = Registri konton
-disable_register_prompt = Registrado estas malŝaltita. Bonvolu sciigi vian retejestron.
+disable_register_prompt = Registrado estas malaktivigita. Bonvolu sciigi vian retejestron.
 register_helper_msg = Ĉu vi jam havas konton? Salutu nun!
 manual_activation_only = Kunparolu vian retejestron por finpretigi vian konton.
 authorization_failed_desc = La aprobo malsukcesis ĉar ni rimarkis malvalidan peton. Bonvolu sciigi la prizorganton de la programo kiun vi provis aprobi.
-oauth_signin_tab = LIgi al jama konto
+oauth_signin_tab = Ligi al jama konto
 invalid_password = Via pasvorto ne samas tiun uzitan dum kreiĝo de via konto.
-send_reset_mail = Sendi retleteron por rehavigo de konto
+send_reset_mail = Sendi retleteron de rehavigo
 oauth_signin_title = Salutu por aprobi kontligiĝon
 reset_password_helper = Rehavigi konton
 tab_openid = OpenID
@@ -382,7 +403,7 @@ login_userpass = Saluti
 password_too_short = Pasvortoj devas longi minimume %d signojn.
 resend_mail = Klaki ĉi tien por resendi vian konfirmleteron
 change_unconfirmed_email_error = Ne povis ŝanĝi la retpoŝtadreson: %v
-authorize_application_description = Se vi permesus aliron, ĝi povos aliri kaj redakti ĉiujn viajn kontinformojn, inkluzivante privatajn deponejojn kaj organizaĵojn.
+authorize_application_description = Se vi permesus aliron, ĝi povos aliri kaj redakti ĉiujn viajn kontinformojn, inkluzive privatajn deponejojn kaj organizaĵojn.
 allow_password_change = Postuli novan pasvorton de la uzanto (rekomendita)
 oauth.signin.error.access_denied = La aprobpeto malakceptiĝis.
 authorize_title = Aprobi aliron de via konto al «%s»?
@@ -394,15 +415,15 @@ disable_forgot_password_mail = Rehavigo de konto estas malsaltita ĉar neniu ret
 last_admin = Vi ne povas forigi la lastan administranton. Nepras havi almenaŭ unu administranton.
 reset_password_wrong_user = Vi salutis kiel %s, sed la kontrehaviga ligilo estas celata al %s
 openid_connect_title = Konekti jaman konton
-confirmation_mail_sent_prompt = Sendis novan konfirmleteron al %s. Bonvolu kontroli vian retleterkeston antaŭ la venonta %s. Se la retpoŝtadreso malĝustas, vi povus saluti kaj peti sendon de plia konfirmletero al alian adreson.
+confirmation_mail_sent_prompt = Sendis konfirmleteron al %s. Por fini la reĝistriĝon, bonvolu kontroli vian retleterkeston kaj sekvi la provizotan ligilon antaŭ la venonta %s. Se la retletero malĝustas, vi povas saluti kaj peti ke alian konfirmleteron estas sendota al malsama retpoŝtadreso.
 password_pwned = La pasvorton kiun vi elektis listiĝas ĉe listo de ŝtelitaj pasvortoj kiu publikiĝis pro datumŝtelo. Bonvolu reprovi kun alia pasvorto, kaj konsideru anstataŭigon de ĉi tiu pasvorto ĉe aliaj kontoj.
 authorize_application_created_by = Ĉi tiun programon kreis %s.
-prohibit_login = Salutado malpermesita
+prohibit_login = La konto estas suspendita
 openid_register_title = Krei novan konton
 email_domain_blacklisted = Vi ne povas registriĝi per via retpoŝtadreso.
 verify = Konfirmi
 oauth_signup_submit = Finfari konton
-prohibit_login_desc = Salutado per via konto estas malpermesita, bonvolu kunparoli vian retejestron.
+prohibit_login_desc = Via konto estas suspendita kaj ne povas interagi kun la instanco. Bonvolu kontakti vian retejestron por regajni aliron.
 openid_connect_desc = La elektita OpenID URI estas nekonata. Ligu ĝin al nova konto ĉi tie.
 oauth.signin.error = Eraris traktante aprobpeton. Se plu eraros, bonvolu kunparoli la retejestron.
 invalid_code = Via konfirmkodo malvalidas aŭ eksdatiĝis.
@@ -412,7 +433,7 @@ email_not_associate = Tiu retpoŝtadreso estas ligita al neniu konto.
 openid_signin_desc = Enmetu vian OpenID URI. Ekzemple: sofia.openid.example.org aŭ https://openid.example.org/sofia.
 disable_forgot_password_mail_admin = Rehavigo de konto sole uzeblas se retpoŝto estas agordita. Bonvolu agordi retpoŝton por ŝalti kontrehavigon.
 change_unconfirmed_email = Se vi donis la malĝustan retpoŝtadreson dum registriĝo, vi povas ŝanĝi ĝin sube, kaj konfirmletero sendiĝus al tiu anstataŭe.
-reset_password_mail_sent_prompt = Sendis novan konfirmleteron al %s. Bonvolu kontroli vian retleterkeston antaŭ la venonta %s, por daŭrigi rehavigon de konto.
+reset_password_mail_sent_prompt = Sendis konfirmleteron al %s. Por fini la rehavigon de konto, bonvolu kontroli vian retleterkeston kaj sekvi la provizotan ligilon antaŭ la venonta %s.
 openid_register_desc = La elektita OpenID URI estas nekonata. Ligi ĝin al nova konto ĉi tie.
 reset_password = Rehavigo de konto
 sspi_auth_failed = SSPI aŭtentikigo malsukcesis
@@ -424,6 +445,16 @@ change_unconfirmed_email_summary = Ŝanĝi al retpoŝtadreson al kiu la aktiviga
 invalid_code_forgot_password = Via konfirmkodo malvalidas aŭ jam eksdatiĝis. Klaku ĉi tien por komenci novan saluton.
 authorize_redirect_notice = Vi alidirektiĝos al %s se vi aprobus ĉi tiun programon.
 active_your_account = Aktivigi vian konton
+unauthorized_credentials = Viaj salutiloj malĝustas aŭ eksdatiĝis. Reprovu vian komandon aŭ vidu %s por pli da informoj
+scratch_code = Sukuranta kodo
+use_scratch_code = Uzi sukurantan kodon
+twofa_scratch_used = Vi uzis vian sukurantan kodon. Vi redirektiĝis al la agorda retpaĝo por forigi la duoblan aŭtentikigon el via aparato aŭ generi novan sukurantan kodon.
+twofa_passcode_incorrect = Via paskodo malĝustas. Se vi mislokis vian aparaton, uzu vian sukurantan kodo por saluti.
+twofa_scratch_token_incorrect = Via sukuranta kodo malĝustas.
+hint_login = Ĉu vi jam havas konton? Salutu nun!
+hint_register = Ĉu vi bezonas konton? Reĝistriĝi nun.
+sign_up_button = Reĝistriĝi nun.
+sign_in_openid = Daŭrigi kun OpenID
 
 [mail]
 activate_account.text_1 = Saluton %[1]s, dankon pro via registriĝo ĉe %[2]s!
@@ -459,7 +490,7 @@ admin.new_user.subject = Nova uzanto %s ĵus registriĝis
 register_notify.text_3 = Se iu alia kreis ĉi tiun konton anstataŭ vi, bonvolu ŝanĝi vian pasvorton tuj.
 release.new.subject = %s en %s eldoniĝis
 view_it_on = Vidu ĝin ĉe %s
-register_notify.text_2 = Vi nun povas saluti per la uzantonomo: %s.
+register_notify.text_2 = Vi povas saluti per la uzantonomo: %s
 team_invite.text_1 = %[1]s invitis vin aliĝi grupon %[2]s en organizaĵo %[3]s.
 reset_password.title = %s, vi petis rehavigon de via konto
 repo.collaborator.added.text = Vi aldoniĝis kiel kunlaboranto de deponejo:
@@ -475,6 +506,13 @@ issue.action.push_n = @%[1]s puŝis %[3]d enmetojn al %[2]s
 activate_account = Bonvolu aktivigi vian konton
 activate_account.title = %s, bonvolu aktivigi vian konton
 activate_account.text_2 = Bonvolu klaki la jenan ligilon por aktivigi vian konton antaŭ %s:
+primary_mail_change.text_1 = La ĉefa retpoŝtadreso de via konto ĵus ŝanĝiĝis en %[1]s. Tio volas diri ke ĉi tiu retpoŝtadreso ne ricevos plu sciigojn pri via konto.
+totp_disabled.subject = TOTP ĵus malaktiviĝis
+password_change.subject = Via pasvorto ŝanĝiĝis
+password_change.text_1 = La pasvorto de via konto ĵus ŝanĝiĝis.
+primary_mail_change.subject = Via ĉefa retpoŝtadreso ŝanĝiĝis
+totp_disabled.text_1 = La tempobazita unufoja pasvorto (TOTP) en via konto ĵus malaktiviĝis.
+admin.new_user.text = Bonvolu klaki ĉi tie por konduki ĉi tiun uzanton el la administranta agordilo.
 
 [form]
 TeamName = Gruponomo
@@ -559,7 +597,7 @@ yes = Jes
 [settings]
 applications = Programoj
 password = Pasvorto
-twofa_disabled = Duobla aŭtentikigo malŝaltita.
+twofa_disabled = Duobla aŭtentikigo malaktivigita.
 appearance = Aspekto
 repos = Deponejoj
 delete = Forigi konton
@@ -574,11 +612,11 @@ account_link = Ligitaj kontoj
 organization = Organizaĵoj
 public_profile = Publika profilo
 openid_desc = OpenID povigas vin utiligi foran servilon por aŭtentikigo.
-twofa_disable_note = Vi povas malŝalti duoblan aŭtentikigon, laŭbezone.
+twofa_disable_note = Vi povas malaktivigi duoblan aŭtentikigon, laŭbezone.
 security = Sekureco
 account = Konto
 ssh_gpg_keys = SSH / GPG-ŝlosiloj
-twofa_disable = Malŝalti duoblan aŭtentikigon
+twofa_disable = Malaktivigi duoblan aŭtentikigon
 twofa_enroll = Ŝalti duoblan aŭtentikigon
 orgs = Mastrumi organizaĵojn
 blocked_users = Blokitaj uzantoj
@@ -647,7 +685,7 @@ update_user_avatar_success = Profilbildo de uzanto ĝisdatigita.
 manage_oauth2_applications = Mastrumi OAuth2-programojn
 activations_pending = Atendas konfirmiĝon
 primary = Ĉefa
-ssh_disabled = SSH malŝaltita
+ssh_disabled = SSH malaktivigita
 update_avatar_success = Via profilbildo konserviĝis.
 keep_email_private = Kaŝi retpoŝtadreson
 manage_openid = Mastrumi OpenID-adresojn
@@ -813,4 +851,30 @@ npm.details.tag = Etikedo
 
 
 [search]
-search = Serĉi...
\ No newline at end of file
+search = Serĉi...
+regexp = RegEsp
+milestone_kind = Serĉi celojn...
+code_search_by_git_grep = Nunaj rezultoj de kodoserĉo estas provizitaj de "git grep". Eble estas plibonaj rezultoj se la retejestro aktivigas la indeksilon de kodo.
+code_search_unavailable = Kodoserĉo ne haveblas nune. Bonvolu kontakti la retejestron.
+package_kind = Serĉi pakojn...
+type_tooltip = Serĉotipo
+user_kind = Serĉi uzantojn...
+fuzzy_tooltip = Inkluzivas rezultojn proksime kongruantajn kun la serĉoterminoj
+repo_kind = Serĉi deponejojn...
+org_kind = Serĉi organizaĵojn...
+code_kind = Serĉi kodon...
+project_kind = Serĉi projektojn...
+team_kind = Serĉi teamojn...
+keyword_search_unavailable = Serĉo per ŝlosilvortoj ne haveblas nune. Bonvolu kontakti la retejestron.
+union = Ŝlosilvortoj
+union_tooltip = Inkluzivas rezultojn kongruantajn kun la ajnaj blankaspacitaj ŝlosilvortoj
+commit_kind = Serĉi enmetojn...
+no_results = Ne trovis kongruantajn rezultojn.
+exact = Ĝusta
+exact_tooltip = Inkluzivas nur rezultojn kongruantajn kun la ĝustaj serĉoterminoj
+issue_kind = Serĉi erarojn...
+regexp_tooltip = Interpretas la serĉoterminoj kiel regulesprimo
+fuzzy = Svaga
+branch_kind = Serĉi disbranĉigojn...
+runner_kind = Serĉi rulantojn...
+pull_kind = Serĉi tirpetojn...
\ No newline at end of file
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
index 6c55dcb1c6..d890914e8c 100644
--- a/options/locale/locale_es-ES.ini
+++ b/options/locale/locale_es-ES.ini
@@ -3770,6 +3770,7 @@ variables.id_not_exist = Variable con id %d no existe.
 type-1.display_name=Proyecto individual
 type-2.display_name=Proyecto repositorio
 type-3.display_name=Proyecto de organización
+deleted.display_name = Proyecto borrado
 
 [git.filemode]
 changed_filemode=%[1]s → %[2]s
@@ -3807,4 +3808,8 @@ exact = Exacto
 exact_tooltip = Incluir sólo los resultados que corresponden al término de búsqueda exacto
 issue_kind = Buscar incidencias…
 fuzzy = Difusa
-runner_kind = Buscar ejecutores…
\ No newline at end of file
+runner_kind = Buscar ejecutores…
+
+[markup]
+filepreview.lines = Líneas %[1]d a %[2]d en %[3]s
+filepreview.line = Línea %[1]d en %[2]s
\ No newline at end of file
diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini
index 75ee89b545..2fb63b50c0 100644
--- a/options/locale/locale_fi-FI.ini
+++ b/options/locale/locale_fi-FI.ini
@@ -52,7 +52,7 @@ organization=Organisaatio
 mirror=Peili
 new_repo=Uusi repo
 new_migrate=Uusi migraatio
-new_mirror=Uusi peilaus
+new_mirror=Uusi peilipalvelin
 new_fork=Uusi repositorio
 new_org=Uusi organisaatio
 new_project=Uusi projekti
@@ -152,6 +152,12 @@ new_org.title = Uusi organisaatio
 new_org.link = Uusi organisaatio
 new_repo.link = Uusi repositorio
 new_migrate.link = Uusi siirto
+rerun_all = Uudelleensuorita kaikki työt
+artifacts = Artifaktit
+confirm_delete_artifact = Oletko varma, että haluat poistaa artifaktin "%s" ?
+new_migrate.title = Uusi migraatio
+test = Testi
+concept_system_global = Globaali
 
 [aria]
 footer.links = Linkit
@@ -1806,4 +1812,7 @@ runs.commit=Commit
 
 [search]
 search = Hae...
-type_tooltip = Haun tyyppi
\ No newline at end of file
+type_tooltip = Haun tyyppi
+fuzzy_tooltip = Sisällytä tulokset, jotka myös melkein vastaavat hakusanaa
+regexp = RegExp
+regexp_tooltip = Tulkitse hakutermi säännöllisenä lausekkeena
\ No newline at end of file
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
index 3921d118e3..ec67e8fb92 100644
--- a/options/locale/locale_fr-FR.ini
+++ b/options/locale/locale_fr-FR.ini
@@ -478,6 +478,7 @@ sign_up_button = Creation d'un compte.
 hint_login = Vous avez déjà un compte ? Connectez vous maintenant !
 back_to_sign_in = Retour à la connexion
 sign_in_openid = Continuer avec OpenID
+unauthorized_credentials = Vos identifiants sont invalides ou ont expiré. Réessayez votre commande, ou allez à %s pour plus d'informations
 
 [mail]
 view_it_on=Voir sur %s
@@ -2074,7 +2075,7 @@ activity.unresolved_conv_label=Ouvrir
 activity.title.releases_1=%d publication
 activity.title.releases_n=%d publications
 activity.title.releases_published_by=%s publiée par %s
-activity.published_release_label=Publiée
+activity.published_release_label=Publication
 activity.no_git_activity=Il n'y a pas eu de nouvelle révision dans cette période.
 activity.git_stats_exclude_merges=En excluant les fusions,
 activity.git_stats_author_1=%d auteur
@@ -2434,7 +2435,7 @@ settings.protect_merge_whitelist_committers_desc=N'autoriser que les utilisateur
 settings.protect_merge_whitelist_users=Utilisateurs en liste blanche pour fusionner
 settings.protect_merge_whitelist_teams=Équipes en liste blanche pour fusionner
 settings.protect_check_status_contexts=Activer le contrôle de status
-settings.protect_status_check_patterns=Motifs de vérification des statuts :
+settings.protect_status_check_patterns=Motifs de vérification des statuts
 settings.protect_status_check_patterns_desc=Entrez des motifs pour spécifier quelles vérifications doivent réussir avant que des branches puissent être fusionnées. Un motif par ligne. Un motif ne peut être vide.
 settings.protect_check_status_contexts_desc=Exiger le status « succès » avant de fusionner. Quand activée, une branche protégée ne peux accepter que des soumissions ou des fusions ayant le status « succès ». Lorsqu'il n'y a pas de contexte, la dernière révision fait foi.
 settings.protect_check_status_contexts_list=Contrôles qualité trouvés au cours de la semaine dernière pour ce dépôt
@@ -2835,6 +2836,14 @@ release.invalid_external_url = URL externe non valable : « %s »
 milestones.filter_sort.name = Nom
 settings.mirror_settings.push_mirror.none_ssh = Aucun
 settings.protect_new_rule = Créer une nouvelle règle de protection de branche
+pulls.cmd_instruction_merge_warning = Avertissement : Le paramètre "détection automatique de la fusion manuelle" n'est pas activé pour ce dépôt, vous devrez marquer cette demande d'ajout comme manuellement fusionnée après.
+release.type_external_asset = Actif Externe
+activity.published_prerelease_label = Pré-version
+activity.published_tag_label = Étiquette
+release.asset_name = Nom de l'Actif
+release.add_external_asset = Ajouter un Actif Externe
+issues.new.assign_to_me = Assigner à moi-même
+issues.all_title = Tous
 
 [graphs]
 component_loading=Chargement de %s…
@@ -2921,7 +2930,7 @@ teams.leave.detail=Êtes vous certain·e de vouloir quitter l'équipe «%s» ?
 teams.can_create_org_repo=Créer des dépôts
 teams.can_create_org_repo_helper=Les membres peuvent créer de nouveaux dépôts dans l'organisation. Le créateur obtiendra l'accès administrateur au nouveau dépôt.
 teams.none_access=Aucun accès
-teams.none_access_helper=Les membres ne peuvent voir ou faire quoi que ce soit sur cette partie. Sans effet pour les dépôts publics.
+teams.none_access_helper=L'option "aucun accès" n'agit que sur les dépôts privés.
 teams.general_access=Accès personnalisé
 teams.general_access_helper=Les permissions des membres seront déterminées par la table des permissions ci-dessous.
 teams.read_access=Lecture
@@ -3067,10 +3076,10 @@ dashboard.delete_old_actions.started=Suppression de toutes les anciennes activit
 dashboard.update_checker=Vérificateur de mise à jour
 dashboard.delete_old_system_notices=Supprimer toutes les anciennes observations de la base de données
 dashboard.gc_lfs=Épousseter les métaobjets LFS
-dashboard.stop_zombie_tasks=Arrêter les tâches zombies
-dashboard.stop_endless_tasks=Arrêter les tâches sans fin
-dashboard.cancel_abandoned_jobs=Annuler les jobs abandonnés
-dashboard.start_schedule_tasks=Démarrer les tâches planifiées
+dashboard.stop_zombie_tasks=Arrêter les actions zombies
+dashboard.stop_endless_tasks=Arrêter les actions sans fin
+dashboard.cancel_abandoned_jobs=Annuler les actions abandonnées
+dashboard.start_schedule_tasks=Démarrer les actions planifiées
 dashboard.sync_branch.started=Début de la synchronisation des branches
 dashboard.sync_tag.started=Synchronisation des étiquettes
 dashboard.rebuild_issue_indexer=Reconstruire l’indexeur des tickets
@@ -3524,6 +3533,16 @@ config.cache_test_slow = Test du cache réussi, mais le temps de réponse est le
 config.cache_test_failed = Échec du contrôle du cache : %v.
 config.cache_test = Tester le cache
 config.cache_test_succeeded = Test du cache réussi, réponse obtenue en %s.
+emails.delete_desc = Êtes-vous sûr de vouloir supprimer cette adresse e-mail ?
+users.organization_creation.description = Autoriser la création de nouvelles organisations.
+emails.deletion_success = L'adresse e-mail a été supprimée.
+emails.delete = Supprimer l'Email
+emails.delete_primary_email_error = Vous ne pouvez pas supprimer l'adresse e-mail principale.
+users.activated.description = Achèvement de la vérification de l'email. Le propriétaire d'un compte non activé ne pourra pas se connecter tant que la vérification de l'email n'est pas terminée.
+users.block.description = Bloquer cet utilisateur d'interagir avec ce service via son compte et interdire la connexion.
+users.admin.description = Accorder à cet utilisateur un accès complet à toutes les fonctionnalités administratives disponibles via l'interface web et l'API.
+users.restricted.description = Autoriser uniquement l'interaction avec les dépôts et les organisations où cet utilisateur est ajouté en tant que collaborateur. Cela empêche l'accès aux dépôts publics sur cette instance.
+users.local_import.description = Autoriser l'importation de dépôts à partir du système de fichiers local du serveur. Cela peut poser un problème de sécurité.
 
 [action]
 create_repo=a créé le dépôt %s
@@ -3770,6 +3789,22 @@ rpm.repository.architectures = Architectures
 rpm.repository.multiple_groups = Ce paquet est disponible dans plusieurs groupes.
 owner.settings.cargo.rebuild.no_index = Incapable de reconstruire, index non initialisé.
 npm.dependencies.bundle = Bundles de dépendances
+arch.pacman.helper.gpg = Ajouter un certificat de confiance pour pacman :
+arch.pacman.repo.multi = %s a la même version dans différentes distributions.
+arch.pacman.repo.multi.item = Configuration pour %s
+arch.pacman.conf = Ajouter un serveur associées à la distribution et l'architecture dans /etc/pacman.conf :
+arch.pacman.sync = Synchroniser le paquet avec pacman :
+arch.version.properties = Propriétés de Version
+arch.version.description = Description
+arch.version.provides = Fournit
+arch.version.groups = Groupe
+arch.version.depends = Dépend
+arch.version.optdepends = Dépendances optionnelles
+arch.version.checkdepends = Vérifier les dépendances
+arch.version.conflicts = Conflits
+arch.version.replaces = Remplace
+arch.version.backup = Sauvegarde
+arch.version.makedepends = Créer des dépendances
 
 [secrets]
 secrets=Secrets
@@ -3789,7 +3824,7 @@ management=Gestion des secrets
 [actions]
 actions=Actions
 
-unit.desc=Gérer l'intégration continue avec Forgejo Actions
+unit.desc=Gérer l'intégration continue avec Forgejo Actions.
 
 status.unknown=Inconnu
 status.waiting=En attente
@@ -3890,11 +3925,13 @@ workflow.dispatch.success = L'exécution du workflow a bien été demandée.
 workflow.dispatch.input_required = Le champ "%s" est obligatoire.
 workflow.dispatch.invalid_input_type = Type invalide pour le champ "%s".
 workflow.dispatch.warn_input_limit = Affichage des %d premiers champs seulement.
+runs.expire_log_message = Les journaux ont été purgés car ils étaient trop anciens.
 
 [projects]
 type-1.display_name=Projet personnel
 type-2.display_name=Projet du dépôt
 type-3.display_name=Projet de l'organisation
+deleted.display_name = Projet Supprimé
 
 [git.filemode]
 changed_filemode=%[1]s → %[2]s
@@ -3946,6 +3983,8 @@ union = Union
 union_tooltip = Inclus les résultats contenant au moins un des mots clé séparés par des espaces
 pull_kind = Rechercher dans les demande d'ajout...
 milestone_kind = Recherche dans les jalons...
+regexp_tooltip = Interpréter le terme de recherche comme une expression régulière
+regexp = RegExp
 
 
 [munits.data]
@@ -3960,4 +3999,27 @@ eib = Eio
 [markup]
 filepreview.line = Ligne %[1]d dans %[2]s
 filepreview.lines = Lignes %[1]d jusqu'à %[2]d dans %[3]s
-filepreview.truncated = L'aperçu a été tronqué
\ No newline at end of file
+filepreview.truncated = L'aperçu a été tronqué
+
+[repo.permissions]
+pulls.write = Écrire : Fermer des demandes de tirage et gérer les métadonnées telles que les étiquettes, les jalons, les assignés, les dates d'échéance et les dépendances.
+actions.read = Lire : Voir les pipelines CI/CD intégrés et leurs journaux.
+releases.read = Lire: Voir et télécharger les versions.
+releases.write = Écrire : Publier, modifier et supprimer des versions et leurs ressources.
+projects.write = Écrire : Créer des projets, des colonnes et les modifier.
+code.read = Lire : Accéder au code du dépôt et le cloner.
+ext_issues = Accéder au lien vers un système externe de suivi des problèmes. Les autorisations sont gérées de manière externe.
+code.write = Écrire : Pousser vers le dépôt, créer des branches et des étiquettes.
+issues.read = Lire : Lire et créer des problèmes et des commentaires.
+wiki.read = Lire : Lire le wiki intégré et son historique.
+wiki.write = Écrire : Créer, mettre à jour et supprimer des pages dans le wiki intégré.
+projects.read = Lire : Accéder aux tableaux de projet du dépôt.
+packages.read = Lire : Voir et télécharger les paquets assignés au dépôt.
+packages.write = Écrire : Publier et supprimer des paquets assignés au dépôt.
+actions.write = Écrire : Déclencher manuellement, redémarrer, annuler ou approuver les pipelines CI/CD en attente.
+ext_wiki = Accéder au lien vers un wiki externe. Les autorisations sont gérées de manière externe.
+issues.write = Écrire : Fermer des problèmes et gérer les métadonnées telles que les étiquettes, les jalons, les assignés, les dates d'échéance et les dépendances.
+pulls.read = Lire : Lire et créer des demandes de tirage.
+
+[translation_meta]
+test = Ceci est une chaîne de test. Elle n'est pas affichée dans l'interface de Forgejo mais est utilisée à des fins de test. N'hésitez pas à entrer 'ok' pour gagner du temps (ou un fait amusant de votre choix) pour atteindre ce doux 100 % de complétion :)
\ No newline at end of file
diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini
index 85b9105128..c7f2dc2820 100644
--- a/options/locale/locale_hu-HU.ini
+++ b/options/locale/locale_hu-HU.ini
@@ -128,14 +128,51 @@ ok = OK
 copy_generic = Másolás vágólapra
 copy_url = URL másolása
 webauthn_error_insecure = A WebAuthn csak biztonságos kapcsolatokat támogat. HTTP-n keresztüli tesztelés esetén használja a "localhost" vagy "127.0.0.1"-es elérési pontokat
+filter.clear = Szűrők törlése
+enable_javascript = Az oldal működéséhez engedélyezni kell a JavaScriptet.
+webauthn_sign_in = Nyomja meg a gombot a biztonsági kulcsán! Ha nincs rajta gomb, próbálja meg újra behelyezni!
+webauthn_use_twofa = Kétlépcsős bejelentkezési kód használata telefonról
+webauthn_error_timeout = Időtúllépés a kulcs beolvasása közben. Kérjük töltse be újra ezt az oldalt, és próbálkozzon újra.
+copy_branch = Elágazás nevének másolása
+test = Teszt
+copy_type_unsupported = Ezt a fájltípust nem lehet másolni
+copy_error = Sikertelen másolás
+invalid_data = Érvénytelen adatok: %v
+unpin = Rögzítés feloldása
+concept_user_individual = Egyéni
+toggle_menu = Menü megjelenítése/elrejtése
+concept_system_global = Globális
+error413 = Felhasználta a kvótáját.
+remove_label_str = "%s" eltávolítása
+rerun_all = Minden feladat újrafuttatása
+rerun = Újrafuttatás
+show_full_screen = Teljes képernyő
+rss_feed = RSS csatorna
+copy = Másolás
+retry = Újra
+new_repo.title = Új tároló
+new_repo.link = Új tároló
+new_migrate.title = Új migráció
+new_migrate.link = Új migráció
+new_org.title = Új szervezet
+new_org.link = Új szervezet
+filter.is_fork = Másolatok
+webauthn_error_duplicated = A biztonsági kulcs nem engedélyezett ehhez a kéréshez. Kérlek győződj meg róla, hogy a kulcs nincs-e már használatban.
+filter.is_mirror = Tükrök
 
 [aria]
 footer.links = Hivatkozások
 footer = Lábléc
+navbar = Navigációs eszközsor
+footer.software = A programról
 
 [heatmap]
 less = Kevesebb
 more = Több
+number_of_contributions_in_the_last_12_months = %s hozzájárulás az elmúlt 12 hónapban
+contributions_zero = Nincsenek hozzájárulások
+contributions_one = hozzájárulás
+contributions_few = hozzájárulás
 
 [editor]
 buttons.heading.tooltip = Fejléc hozzáadása
@@ -145,6 +182,12 @@ buttons.italic.tooltip = Dőlt szöveg hozzáadása
 buttons.quote.tooltip = Szöveg idézése
 buttons.link.tooltip = Hivatkozás hozzáadása
 buttons.indent.tooltip = Elemek behúzása egy szinttel
+buttons.mention.tooltip = Felhasználó vagy csapat említése
+buttons.list.ordered.tooltip = Számozott lista hozzáadása
+buttons.list.task.tooltip = Feladatlista hozzáadása
+buttons.list.unordered.tooltip = Felsorolás hozzáadása
+buttons.switch_to_legacy.tooltip = A régi szerkesztő használata
+buttons.unindent.tooltip = Elemek behúzásának csökkentése egy szinttel
 
 [filter]
 string.asc = A - Z
@@ -154,6 +197,7 @@ string.desc = Z - A
 occurred = Hiba történt
 server_internal = Belső szerverhiba
 network_error = Hálózati hiba
+not_found = A cél nem található.
 
 [startpage]
 app_desc=Fájdalommentes, saját gépre telepíthető Git szolgáltatás
@@ -1726,6 +1770,9 @@ runs.commit=Commit
 ; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", …
 symbolic_link=Szimbolikus hivatkozás
 submodule = Almodul
+executable_file = Futtatható fájl
+normal_file = Általános fájl
+directory = Könyvtár
 
 
 
@@ -1740,4 +1787,15 @@ user_kind = Felhasználók keresése...
 repo_kind = Tárak keresése...
 org_kind = Szervezetek keresése...
 team_kind = Csapatok keresése...
-exact = Pontos
\ No newline at end of file
+exact = Pontos
+code_search_by_git_grep = A kódkeresés jelenleg a "git grep" parancsot használja. Lehet, hogy jobb találatok is lennének, ha a webhely adminisztrátora bekapcsolja a forráskód indexelését.
+milestone_kind = Mérföldkövek keresése...
+fuzzy_tooltip = A keresési kifejezéshez hasonló találatok mutatása
+fuzzy = Hasonlók
+union = Kulcsszavakra
+union_tooltip = A szóközzel elválasztott kulcsszavak bármelyikét tartalmazó találatok mutatása
+branch_kind = Ágak keresése...
+no_results = Nincsenek megfelelő találatok.
+issue_kind = Hibajegyek keresése...
+exact_tooltip = Csak a keresési kifejezést pontosan tartalmazó találatok mutatása
+keyword_search_unavailable = A kulcsszó alapú keresés jelenleg nem elérhető. Kérlek értesítsd az oldal rendszergazdáját.
\ No newline at end of file
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
index 6b7de91462..6c97d5193e 100644
--- a/options/locale/locale_it-IT.ini
+++ b/options/locale/locale_it-IT.ini
@@ -340,7 +340,7 @@ allow_dots_in_usernames = Consenti l'uso del punto nel nome utente. Non impatta
 config_location_hint = Queste opzioni di configurazione saranno salvate in:
 allow_only_external_registration = Permetti la registrazione solo tramite servizi esterni
 app_slogan = Slogan dell'istanza
-app_slogan_helper = Inserire qui lo slogan dell'istanza. Lasciare vuoto per disabilitare.
+app_slogan_helper = Inserisci qui lo slogan della tua istanza. Lasciala vuota per disabilitarlo.
 
 [home]
 uname_holder=Nome utente o indirizzo e-mail
@@ -406,10 +406,12 @@ remember_me=Ricorda questo dispositivo
 forgot_password_title=Password dimenticata
 forgot_password=Password dimenticata?
 sign_up_now=Hai bisogno di un account? Registrati adesso.
-confirmation_mail_sent_prompt=Una nuova email di conferma è stata inviata a %s. Per favore controlla la tua posta in arrivo nelle prossime %s per completare il processo di registrazione.
+confirmation_mail_sent_prompt=Una nuova e-mail di conferma è stata inviata a %s.
+        Per completare la registrazione, controlla la tua posta in arrivo e clicca sul link in allegato entro i prossimi %s secondi.
+        Se la tua e-mail è errata o incorretta, puoi accedere all'account e richiedere un'altra e-mail di conferma ad un'altro indirizzo.
 must_change_password=Aggiorna la tua password
 allow_password_change=Richiede all'utente di cambiare la password (scelta consigliata)
-reset_password_mail_sent_prompt=Una email di conferma è stata inviata a %s. Per favore controlla la tua posta in arrivo nelle prossime %s per completare il processo di reset della password.
+reset_password_mail_sent_prompt=Un'e-mail di conferma è stata inviata a %s.  Per completare il processo di recupero dell'account, controlla la tua posta in arrivo e clicca sul link entro i prossimi %s secondi.
 active_your_account=Attiva il tuo account
 account_activated=L'account è stato attivato
 prohibit_login=L'accesso è proibito
@@ -2651,7 +2653,7 @@ wiki.page_title = Titolo della pagina
 wiki.page_content = Contenuto della pagina
 settings.mirror_settings.pushed_repository = Repositorio immesso
 settings.mirror_settings.push_mirror.edit_sync_time = Modifica intervallo di sincronizzazione degli specchi
-settings.units.units = Unità del repositorio
+settings.units.units = Unità della repository
 settings.units.add_more = Aggiungi ancora...
 settings.wiki_globally_editable = Consenti a tutti di modificare la wiki
 settings.pull_mirror_sync_in_progress = Prelevando cambiamenti dal progetto remoto %s.
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
index b7cd2ae5d1..73b74fae24 100644
--- a/options/locale/locale_ja-JP.ini
+++ b/options/locale/locale_ja-JP.ini
@@ -165,6 +165,7 @@ new_repo.link = 新しいリポジトリ
 new_migrate.link = 新しいマイグレーション
 new_org.link = 新しい組織
 test = テスト
+error413 = 割り当て量を使い切りしました。
 
 [aria]
 navbar=ナビゲーションバー
@@ -196,6 +197,8 @@ buttons.ref.tooltip=イシューまたはプルリクエストを参照
 buttons.switch_to_legacy.tooltip=レガシーエディタを使用する
 buttons.enable_monospace_font=等幅フォントを有効にする
 buttons.disable_monospace_font=等幅フォントを無効にする
+buttons.unindent.tooltip = アイテムを1つずつネストの解除をする
+buttons.indent.tooltip = アイテムを1つずつネストする
 
 [filter]
 string.asc=A - Z
@@ -252,7 +255,7 @@ err_admin_name_is_invalid=管理者のユーザー名が不正です
 
 general_title=基本設定
 app_name=インスタンス名
-app_name_helper=企業名をここに入れることができます。
+app_name_helper=ここにインスタンス名を入力します。これはすべてのページに表示されます。
 repo_path=リポジトリのルートパス
 repo_path_helper=リモートGitリポジトリはこのディレクトリに保存されます。
 lfs_path=Git LFSルートパス
@@ -286,7 +289,7 @@ offline_mode.description=外部のCDNサービスを使わず、すべてのリ
 disable_gravatar=Gravatarを無効にする
 disable_gravatar.description=Gravatarと外部のアバターソースを無効にします。 アバターをローカルにアップロードしていないユーザーには、デフォルトのアバターが使用されます。
 federated_avatar_lookup=フェデレーテッド・アバターを有効にする
-federated_avatar_lookup.description=Libravatarを使用したフェデレーテッド・アバター検索を有効にします。
+federated_avatar_lookup.description=Libravatar を使用してアバターを検索します。
 disable_registration=セルフ登録を無効にする
 disable_registration.description=管理者だけが新しいユーザー アカウントを作成できます。誰もが利用できるパブリックインスタンスをホストし、大量のスパムアカウントに対処する準備ができていない限り、登録を無効にしておくことを強くお勧めします。
 allow_only_external_registration.description=設定された外部サービスを使用してのみ新しいアカウントを作成できます。
@@ -405,14 +408,14 @@ forgot_password_title=パスワードを忘れた
 forgot_password=パスワードをお忘れですか？
 sign_up_now=アカウントが必要ですか？ 今すぐ登録しましょう。
 sign_up_successful=アカウントは無事に作成されました。ようこそ!
-confirmation_mail_sent_prompt=%s に確認メールを送信しました。 %s以内に受信トレイを確認し、登録手続きを完了してください。
+confirmation_mail_sent_prompt=新しい確認メールが %s に送信されました。登録プロセスを完了するには、受信トレイを確認し、 %s 以内に提供されたリンクをクリックして下さい。メールが間違っている場合は、ログインして別のアドレスに確認メールを再送信するようリクエストできます。
 must_change_password=パスワードの更新
 allow_password_change=ユーザーはパスワードの変更が必要 (推奨)
-reset_password_mail_sent_prompt=%s に確認メールを送信しました。 %s以内に受信トレイを確認し、アカウント回復手続きを完了してください。
+reset_password_mail_sent_prompt=確認メールが %s に送信されました。アカウント回復手続きを完了するには、受信トレイを確認し、%s 以内に提供されたリンクに従ってください。
 active_your_account=アカウントの有効化
 account_activated=アカウントがアクティベートされました
-prohibit_login=サインイン禁止
-prohibit_login_desc=あなたのアカウントはサインインを禁止されています。 サイト管理者にお問い合わせください。
+prohibit_login=アカウントが停止されました
+prohibit_login_desc=あなたのアカウントはインスタンスとのやり取りが停止されています。アクセスを回復するには、インスタンス管理者に問い合わせてください。
 resent_limit_prompt=少し前に、あなたからアクティベーションメールが要求されています。 3分待ったのち、もう一度試してください。
 has_unconfirmed_mail=こんにちは %s さん、あなたのメール アドレス (%s) は確認がとれていません。 確認メールを受け取っていない場合や、改めて送信したい場合は、下のボタンをクリックしてください。
 resend_mail=アクティベーションメールを再送信するにはここをクリック
@@ -455,7 +458,7 @@ email_domain_blacklisted=あなたのメールアドレスでは登録するこ
 authorize_application=アプリケーションを許可
 authorize_redirect_notice=このアプリケーションを許可すると %s にリダイレクトします。
 authorize_application_created_by=このアプリケーションは %s が作成しました。
-authorize_application_description=アクセスを許可すると、このアプリケーションは、プライベート リポジトリや組織を含むあなたのすべてのアカウント情報に対して、アクセスと書き込みができるようになります。
+authorize_application_description=アクセスを許可すると、プライベートリポジトリや組織を含むすべてのアカウント情報にアクセスして書き込むことができるようになります。
 authorize_title=`"%s"にあなたのアカウントへのアクセスを許可しますか？`
 authorization_failed=認可失敗
 authorization_failed_desc=無効なリクエストを検出したため認可が失敗しました。 認可しようとしたアプリの開発者に連絡してください。
@@ -468,6 +471,12 @@ change_unconfirmed_email_summary = アクティベーションメールの送信
 last_admin=最後の管理者は削除できません。少なくとも一人の管理者が必要です。
 tab_signin = サインイン
 tab_signup = サインアップ
+sign_in_openid = OpenIDで続行
+back_to_sign_in = サインインに戻る
+unauthorized_credentials = 資格情報が正しくないか、期限が切れています。コマンドを再試行するか、詳細については %s を参照してください
+sign_up_button = 今すぐ登録して下さい。
+hint_login = すでにアカウントをお持ちですか? 今すぐサインイン!
+hint_register = アカウントが必要ですか? 今すぐ登録してください。
 
 [mail]
 view_it_on=%s で見る
@@ -537,6 +546,21 @@ team_invite.text_3=注: この招待は %[1]s 宛です。 招待に心当たり
 admin.new_user.user_info = ユーザー情報
 admin.new_user.subject = 新しいユーザー、 %sがサインアップしました
 admin.new_user.text = 管理パネルからこのユーザーを管理するには、ここをクリックしてください。
+totp_enrolled.text_1.has_webauthn = アカウントで TOTP が有効になりました。今後のアカウントへのログインで、2要素認証として TOTP を使用したり、任意のセキュリティ キーを使用することができます。
+totp_enrolled.subject = 2要素認証としてTOTPを有効にしました
+totp_enrolled.text_1.no_webauthn = アカウントで TOTP が有効になりました。今後アカウントにログインするときに、2要素認証として TOTP を使用する必要があります。
+password_change.text_1 = アカウントのパスワードが変更されました。
+password_change.subject = パスワードが変更されました
+primary_mail_change.subject = プライマリメールが変更されました
+primary_mail_change.text_1 = あなたのアカウントのプライマリメールが %[1]s に変更されました。これにより、この電子メール アドレスはあなたのアカウントに関する電子メール通知を受信しなくなります。
+totp_disabled.subject = TOTPが無効になりました
+totp_disabled.text_1 = あなたのアカウントの時間ベースのワンタイムパスワード (TOTP) が無効になりました。
+totp_disabled.no_2fa = 他の 2要素認証は設定されていないため、2要素認証を使用してアカウントにログインする必要はなくなりました。
+removed_security_key.subject = セキュリティキーが削除されました
+removed_security_key.text_1 = セキュリティキー "%[1]s" がアカウントから削除されました。
+account_security_caution.text_1 = もしこれがあなたの操作であれば、このメールは無視しても問題ありません。
+account_security_caution.text_2 = もしこれがあなたの操作でない場合、アカウントが不正利用されている可能性があります。このサイトの管理者に連絡してください。
+removed_security_key.no_2fa = 他の 2要素認証は設定されていないため、2要素認証を使用してアカウントにログインする必要はなくなりました。
 
 [modal]
 yes=はい
@@ -675,16 +699,24 @@ settings=ユーザー設定
 form.name_reserved=ユーザー名 "%s" は予約されています。
 form.name_pattern_not_allowed=`"%s" の形式はユーザー名に使用できません。`
 form.name_chars_not_allowed=ユーザー名 "%s" には無効な文字が含まれています。
-block_user.detail_2 = このユーザーは、リポジトリ、作成されたイシュー、コメントを操作できません。
-block_user.detail_1 = このユーザーからのフォローが解除されています。
+block_user.detail_2 = このユーザーは、あなたが所有するリポジトリや、あなたが作成した問題やコメントを操作することはできません。
+block_user.detail_1 = お互いのフォローが停止され、フォローできなくなります。
 follow_blocked_user = あなたはこのユーザーをフォローできません。なぜなら、あなたはこのユーザーをブロックしたか、このユーザーはあなたをブロックしているからです。
-block_user.detail_3 = このユーザーはあなたをコラボレーターとして追加することはできませんし、あなたも彼らをコラボレーターに追加できません。
+block_user.detail_3 = お互いをリポジトリの共同作業者として追加することはできません。
 block_user = ユーザーをブロック
 unblock = ブロックを解除
 block = ブロック
-block_user.detail = このユーザーをブロックした場合、下記の事などが起こります。例えば：
+block_user.detail = ユーザーをブロックすると、次のような影響があります：
 followers_one = %d 人のフォロワー
 following_one = %d 人をフォロー中
+public_activity.visibility_hint.self_public = あなたのアクティビティは、プライベート スペースでのやり取りを除き、すべてのユーザーに表示されます。設定。
+public_activity.visibility_hint.admin_public = このアクティビティは誰でも見ることができますが、管理者はプライベート スペースでのやり取りも見ることができます。
+public_activity.visibility_hint.self_private = あなたのアクティビティはあなたとインスタンス管理者にのみ表示されます。設定。
+public_activity.visibility_hint.admin_private = このアクティビティは管理者であるあなたには表示されますが、ユーザーは非公開にしたいと考えています。
+following.title.one = フォロー中
+following.title.few = フォロー中
+followers.title.one = フォロワー
+followers.title.few = フォロワー
 
 [settings]
 profile=プロフィール
@@ -794,12 +826,12 @@ add_new_email=新しいメールアドレスを追加
 add_new_openid=新しいOpenID URIを追加
 add_email=メールアドレスを追加
 add_openid=OpenID URIを追加する
-add_email_confirmation_sent=`"%s" に確認メールを送信しました。 %s以内に受信トレイを確認し、メールアドレス確認を行ってください。`
+add_email_confirmation_sent=確認メールが"%s"に送信されました。メールアドレスを確認するには、受信トレイを確認し、%s以内に提供されたリンクをクリックしてください。
 add_email_success=新しいメールアドレスを追加しました。
 email_preference_set_success=メール設定を保存しました。
 add_openid_success=新しいOpenIDアドレスを追加しました。
 keep_email_private=メールアドレスを隠す
-keep_email_private_popup=これによりプロフィールでメールアドレスが隠され、Webインターフェースでのプルリクエスト作成やファイル編集でもメールアドレスが隠されます。 プッシュ済みのコミットは変更されません。
+keep_email_private_popup=これにより、プロフィールからメールアドレスが非表示になります。ファイルのアップロードや編集など、ウェブインターフェース経由で行われるコミットのデフォルトとして使用されなくなり、マージコミットにも使用されません。代わりに、コミットをあなたのアカウントに関連付けるために特別なアドレス%sを使用できます。このオプションを変更しても、既存のコミットには影響しないことに注意してください。
 openid_desc=OpenIDを使うと外部プロバイダーに認証を委任することができます。
 
 manage_ssh_keys=SSHキーの管理
@@ -1012,6 +1044,9 @@ update_hints_success = ヒントが更新されました。
 hints = ヒント
 additional_repo_units_hint = リポジトリでより多くの機能を有効にすることを推奨する
 language.title = 既定の言語
+keep_activity_private.description = 公開アクティビティは、あなたとインスタンス管理者にのみ表示されます。
+language.description = この言語はアカウントに保存され、ログイン後にデフォルトとして使用されます。
+language.localization_project = Forgejo をあなたの言語に翻訳するのを手伝ってください。詳細はこちら。
 
 [repo]
 new_repo_helper=リポジトリには、プロジェクトのすべてのファイルとリビジョン履歴が入ります。 すでにほかの場所でホストしていますか？ リポジトリを移行 もどうぞ。
@@ -1028,7 +1063,7 @@ visibility=公開/非公開
 visibility_description=オーナー、または権限を持つ組織のメンバーだけが、リポジトリを見ることができます。
 visibility_helper=リポジトリをプライベートにする
 visibility_helper_forced=サイト管理者の設定により、新しいリポジトリは強制的にプライベートになります。
-visibility_fork_helper=(この変更はすべてのフォークに適用されます)
+visibility_fork_helper=(この変更はすべてのフォークの可視性に影響します。)
 clone_helper=クローンに関してお困りであればヘルプを参照しましょう。
 fork_repo=リポジトリをフォーク
 fork_from=フォーク元
@@ -1050,15 +1085,15 @@ repo_desc_helper=簡単な説明を入力してください (オプション)
 repo_lang=言語
 repo_gitignore_helper=.gitignoreテンプレートを選択してください。
 repo_gitignore_helper_desc=一般的な言語のテンプレートリストから、追跡しないファイルの設定を選択します。 各言語のビルドツールが生成する典型的なファイルが、デフォルトで.gitignoreに含まれます。
-issue_labels=イシューラベル
-issue_labels_helper=イシューのラベルセットを選択
+issue_labels=ラベル
+issue_labels_helper=ラベルセットを選択
 license=ライセンス
-license_helper=ライセンス ファイルを選択してください。
+license_helper=ライセンス ファイルを選択してください
 license_helper_desc=ライセンスにより、他人があなたのコードに対して何ができて何ができないのかを規定します。 どれがプロジェクトにふさわしいか迷っていますか？ ライセンス選択サイト も確認してみてください。
 object_format=オブジェクトのフォーマット
-object_format_helper=リポジトリのオブジェクトフォーマット。後で変更することはできません。SHA1 は最も互換性があります。
+object_format_helper=リポジトリのオブジェクトフォーマット。後で変更することはできません。SHA1 が最も互換性があります。
 readme=README
-readme_helper=READMEファイル テンプレートを選択してください。
+readme_helper=READMEファイル テンプレートを選択してください
 readme_helper_desc=プロジェクトについての説明をひととおり書く場所です。
 auto_init=リポジトリの初期設定 (.gitignore、ライセンスファイル、READMEファイルの追加)
 trust_model_helper=署名検証のトラストモデルを選択します。 選択肢は次のとおりです:
@@ -1390,7 +1425,7 @@ commitstatus.failure=失敗
 commitstatus.pending=保留
 commitstatus.success=成功
 
-ext_issues=外部イシューへのアクセス
+ext_issues=外部イシュー
 ext_issues.desc=外部のイシュートラッカーへのリンク。
 
 projects=プロジェクト
@@ -1425,7 +1460,7 @@ projects.column.set_default_desc=この列を未分類のイシューやプル
 projects.column.unset_default=デフォルトを解除
 projects.column.unset_default_desc=この列からデフォルト列の設定を解除します
 projects.column.delete=列を削除
-projects.column.deletion_desc=プロジェクト列を削除すると、関連するすべてのイシューが '未分類' に移動します。 続行しますか？
+projects.column.deletion_desc=プロジェクト列を削除すると、関連するすべてのイシューがデフォルトの列に移動します。 続行しますか？
 projects.column.color=カラー
 projects.open=オープン
 projects.close=クローズ
@@ -1473,10 +1508,10 @@ issues.new_label=新しいラベル
 issues.new_label_placeholder=ラベル名
 issues.new_label_desc_placeholder=説明
 issues.create_label=ラベルを作成
-issues.label_templates.title=定義済みラベルセットの読み込み
-issues.label_templates.info=ラベルがまだありません。"新しいラベル"でラベルを作成するか、次の定義済みのラベルセットを使用してください:
-issues.label_templates.helper=ラベルセットを選択
-issues.label_templates.use=ラベルセットを使用
+issues.label_templates.title=ラベルプリセットを読み込む
+issues.label_templates.info=ラベルがまだありません。"新しいラベル"でラベルを作成するか、ラベルプリセットを使用してください:
+issues.label_templates.helper=ラベルプリセットを選択する
+issues.label_templates.use=ラベルプリセットを使用
 issues.label_templates.fail_to_load_file=ラベルテンプレート "%s" を読み込めませんでした: %v
 issues.add_label=がラベル %s を追加 %s
 issues.add_labels=がラベル %s を追加 %s
@@ -1596,7 +1631,7 @@ issues.role.collaborator_helper=このユーザーはリポジトリ上で共同
 issues.role.first_time_contributor=初めての貢献者
 issues.role.first_time_contributor_helper=これは、このユーザーによるリポジトリへの最初の貢献です。
 issues.role.contributor=貢献者
-issues.role.contributor_helper=このユーザーは以前にリポジトリにコミットしています。
+issues.role.contributor_helper=このユーザーは以前にこのリポジトリにコミットしています。
 issues.re_request_review=レビューを再依頼
 issues.is_stale=このレビューのあと、このPRに変更がありました
 issues.remove_request_review=レビュー依頼を取り消し
@@ -1611,7 +1646,7 @@ issues.label_title=名前
 issues.label_description=説明
 issues.label_color=カラー
 issues.label_exclusive=排他
-issues.label_archive=アーカイブ ラベル
+issues.label_archive=ラベルをアーカイブ
 issues.label_archived_filter=アーカイブされたラベルを表示
 issues.label_archive_tooltip=アーカイブされたラベルは、ラベルによる検索時のサジェストからデフォルトで除外されます。
 issues.label_exclusive_desc=ラベル名を スコープ/アイテム の形にすることで、他の スコープ/ ラベルと排他的になります。
@@ -1643,8 +1678,8 @@ issues.lock.unknown_reason=未定義の理由ではイシューをロックで
 issues.lock_duplicate=イシューは二重にロックできません。
 issues.unlock_error=ロックされていないイシューをアンロックできません。
 issues.lock_with_reason=が%sのためロックし会話を共同作業者に限定 %s
-issues.lock_no_reason=がロックして会話を共同作業者に限定 %s
-issues.unlock_comment=がこの会話をアンロック %s
+issues.lock_no_reason=ロックされており、会話が共同作業者に制限されています %s
+issues.unlock_comment=この会話のロックを解除 %s
 issues.lock_confirm=ロック
 issues.unlock_confirm=アンロック
 issues.lock.notice_1=- 他のユーザーはこのイシューに新しいコメントを追加できません。
@@ -1669,9 +1704,9 @@ issues.stop_tracking=タイマー 終了
 issues.stop_tracking_history=`が作業を終了 %s`
 issues.cancel_tracking=中止
 issues.cancel_tracking_history=`がタイムトラッキングを中止 %s`
-issues.add_time=手で時間を入力
+issues.add_time=手動で時間を入力
 issues.del_time=このタイムログを削除
-issues.add_time_short=時間入力
+issues.add_time_short=時間を入力
 issues.add_time_cancel=キャンセル
 issues.add_time_history=`が作業時間を追加 %s`
 issues.del_time_history=`が作業時間を削除 %s`
@@ -1698,7 +1733,7 @@ issues.due_date_added=が期日 %s を追加 %s
 issues.due_date_modified=が期日を %[2]s から %[1]s に変更 %[3]s
 issues.due_date_remove=が期日 %s を削除 %s
 issues.due_date_overdue=期日は過ぎています
-issues.due_date_invalid=期日が正しくないか範囲を超えています。 'yyyy-mm-dd' の形式で入力してください。
+issues.due_date_invalid=期日が正しくないか範囲を超えています。 "yyyy-mm-dd" の形式で入力してください。
 issues.dependency.title=依存関係
 issues.dependency.issue_no_dependencies=依存関係が設定されていません。
 issues.dependency.pr_no_dependencies=依存関係が設定されていません。
@@ -1716,7 +1751,7 @@ issues.dependency.issue_closing_blockedby=このイシューのクローズは
 issues.dependency.issue_close_blocks=このイシューは、これらのイシューのクローズをブロックしています
 issues.dependency.pr_close_blocks=このプルリクエストは、これらのイシューのクローズをブロックしています
 issues.dependency.issue_close_blocked=このイシューをクローズするには、ブロックしているイシューをすべてクローズする必要があります。
-issues.dependency.issue_batch_close_blocked=選択したイシューの一括クローズはできません。 イシュー #%d に、まだオープン中の依存関係があります。
+issues.dependency.issue_batch_close_blocked=イシュー #%d にまだ依存関係があるため、選択したイシューを一括で閉じることはできません
 issues.dependency.pr_close_blocked=このプルリクエストを操作するには、ブロックしているイシューをすべてクローズする必要があります。
 issues.dependency.blocks_short=ブロック対象
 issues.dependency.blocked_by_short=依存先
@@ -1831,7 +1866,7 @@ pulls.required_status_check_administrator=管理者であるため、このプ
 pulls.blocked_by_approvals=このプルリクエストはまだ承認数が足りません。 %[1]d/%[2]dの承認を得ています。
 pulls.blocked_by_rejection=このプルリクエストは公式レビューアにより変更要請されています。
 pulls.blocked_by_official_review_requests=このプルリクエストには公式レビュー依頼があります。
-pulls.blocked_by_outdated_branch=このプルリクエストは遅れのためブロックされています。
+pulls.blocked_by_outdated_branch=このプルリクエストは古いためブロックされています。
 pulls.blocked_by_changed_protected_files_1=このプルリクエストは保護しているファイルを変更するためブロックされています：
 pulls.blocked_by_changed_protected_files_n=このプルリクエストは保護しているファイルを変更するためブロックされています：
 pulls.can_auto_merge_desc=このプルリクエストは自動的にマージできます。
@@ -1861,17 +1896,17 @@ pulls.merge_commit_id=マージコミットID
 pulls.require_signed_wont_sign=ブランチでは署名されたコミットが必須ですが、このマージでは署名がされません
 
 pulls.invalid_merge_option=このプルリクエストでは、指定したマージ方法は使えません。
-pulls.merge_conflict=マージ失敗: マージ中にコンフリクトがありました。 ヒント: 別のストラテジーを試してみてください
+pulls.merge_conflict=マージ失敗: マージ中にコンフリクトがありました。 ヒント: 別の方法を試してみてください
 pulls.merge_conflict_summary=エラーメッセージ
-pulls.rebase_conflict=マージ失敗: コミット %[1]s のリベース中にコンフリクトがありました。 ヒント: 別のストラテジーを試してみてください
+pulls.rebase_conflict=マージ失敗: コミット %[1]s のリベース中にコンフリクトがありました。 ヒント: 別の方法を試してみてください
 pulls.rebase_conflict_summary=エラーメッセージ
-pulls.unrelated_histories=マージ失敗: マージHEADとベースには共通する履歴がありません。 ヒント: 別のストラテジーを試してみてください
-pulls.merge_out_of_date=マージ失敗: マージの生成中にベースが更新されました。 ヒント: もう一度試してみてください
-pulls.head_out_of_date=マージ失敗: マージの生成中に head が更新されました。 ヒント: もう一度試してみてください
+pulls.unrelated_histories=マージ失敗: マージHEADとベースには共通する履歴がありません。 ヒント: 別の方法を試してみてください
+pulls.merge_out_of_date=マージ失敗: マージの生成中にベースが更新されました。 ヒント: もう一度試してみてください。
+pulls.head_out_of_date=マージ失敗: マージの生成中に head が更新されました。 ヒント: もう一度試してみてください。
 pulls.has_merged=失敗: プルリクエストはマージされていました。再度マージしたり、ターゲットブランチを変更することはできません。
 pulls.push_rejected=マージ失敗: プッシュは拒否されました。 このリポジトリのGitフックを見直してください。
 pulls.push_rejected_summary=拒否メッセージ全体:
-pulls.push_rejected_no_message=マージ失敗: プッシュは拒否され、リモートからのメッセージはありません。
このリポジトリのGitフックを見直してください
+pulls.push_rejected_no_message=マージ失敗: プッシュは拒否され、リモートからのメッセージはありません。このリポジトリのGitフックを確認して下さい
 pulls.open_unmerged_pull_exists=`同じ条件のプルリクエスト (#%d) が未処理のため、再オープンはできません。`
 pulls.status_checking=いくつかのステータスチェックが待機中です
 pulls.status_checks_success=ステータスチェックはすべて成功しました
@@ -1890,7 +1925,7 @@ pulls.outdated_with_base_branch=このブランチはベースブランチに対
 pulls.close=プルリクエストをクローズ
 pulls.closed_at=`がプルリクエストをクローズ %[2]s`
 pulls.reopened_at=`がプルリクエストを再オープン %[2]s`
-pulls.cmd_instruction_hint=`コマンドラインの手順 を表示します。`
+pulls.cmd_instruction_hint=コマンドラインの手順を表示
 pulls.cmd_instruction_checkout_title=チェックアウト
 pulls.cmd_instruction_checkout_desc=プロジェクトリポジトリから新しいブランチをチェックアウトし、変更内容をテストします。
 pulls.cmd_instruction_merge_title=マージ
@@ -1949,7 +1984,7 @@ milestones.filter_sort.least_issues=イシューの少ない順
 
 signing.will_sign=このコミットは鍵 "%s" で署名されます。
 signing.wont_sign.error=コミットの署名可否を確認中にエラーが発生しました。
-signing.wont_sign.nokey=このコミットに署名するための鍵がありません。
+signing.wont_sign.nokey=このインスタンスには、このコミットに署名するための鍵がありません。
 signing.wont_sign.never=コミットが署名されることはありません。
 signing.wont_sign.always=コミットは常に署名されます。
 signing.wont_sign.pubkey=アカウントに公開鍵が登録されていないため、コミットは署名されません。
@@ -1961,7 +1996,7 @@ signing.wont_sign.commitssigned=関連するコミットすべてが署名され
 signing.wont_sign.approved=PRが未承認のため、マージは署名されません。
 signing.wont_sign.not_signed_in=サインインしていません。
 
-ext_wiki=外部Wikiへのアクセス
+ext_wiki=外部Wiki
 ext_wiki.desc=外部Wikiへのリンク。
 
 wiki=Wiki
@@ -1979,8 +2014,8 @@ wiki.save_page=ページを保存
 wiki.last_commit_info=%s が %s にこのページを編集
 wiki.edit_page_button=編集
 wiki.new_page_button=新規ページ
-wiki.file_revision=ページ・リビジョン
-wiki.wiki_page_revisions=Wikiページのリビジョン
+wiki.file_revision=ページの改訂履歴
+wiki.wiki_page_revisions=Wikiページの改訂履歴
 wiki.back_to_wiki=Wikiページに戻る
 wiki.delete_page_button=ページを削除
 wiki.delete_page_notice_1=Wikiページ "%s" の削除は元に戻せません。 続行しますか？
@@ -2034,7 +2069,7 @@ activity.unresolved_conv_label=オープン
 activity.title.releases_1=%d件のリリース
 activity.title.releases_n=%d件のリリース
 activity.title.releases_published_by=%sが%sによって発行されました
-activity.published_release_label=発行
+activity.published_release_label=リリース
 activity.no_git_activity=この期間にはコミットのアクティビティがありません。
 activity.git_stats_exclude_merges=マージを除くと、
 activity.git_stats_author_1=%d人の作成者
@@ -2110,12 +2145,12 @@ settings.sync_mirror=今すぐ同期
 settings.pull_mirror_sync_in_progress=現在、リモート %s から変更をプルしています。
 settings.push_mirror_sync_in_progress=現在、リモート %s へ変更をプッシュしています。
 settings.site=Webサイト
-settings.update_settings=設定を更新
+settings.update_settings=設定を保存
 settings.update_mirror_settings=ミラーリング設定を更新
 settings.branches.switch_default_branch=デフォルトブランチを切り替え
 settings.branches.update_default_branch=デフォルトブランチを更新
 settings.branches.add_new_rule=新しいルールを追加
-settings.advanced_settings=拡張設定
+settings.advanced_settings=詳細設定
 settings.wiki_desc=Wikiを有効にする
 settings.use_internal_wiki=ビルトインのWikiを使用する
 settings.use_external_wiki=外部のWikiを使用する
@@ -2146,10 +2181,10 @@ settings.pulls.allow_rebase_update=リベースでプルリクエストのブラ
 settings.pulls.default_delete_branch_after_merge=デフォルトでプルリクエストのブランチをマージ後に削除する
 settings.pulls.default_allow_edits_from_maintainers=デフォルトでメンテナからの編集を許可する
 settings.releases_desc=リリースを有効にする
-settings.packages_desc=リポジトリパッケージレジストリを有効にする
-settings.projects_desc=リポジトリプロジェクトを有効にする
-settings.actions_desc=Actionsを有効にする
-settings.admin_settings=管理者用設定
+settings.packages_desc=パッケージレジストリを有効にする
+settings.projects_desc=プロジェクトを有効にする
+settings.actions_desc=Forgejo Actionsを使用して統合CI/CDパイプラインを有効化する
+settings.admin_settings=管理者設定
 settings.admin_enable_health_check=リポジトリのヘルスチェックを有効にする (git fsck)
 settings.admin_code_indexer=コードインデクサ
 settings.admin_stats_indexer=コード統計インデクサ
@@ -2697,7 +2732,7 @@ pulls.made_using_agit = Agit
 pulls.agit_explanation = Agitによるワークフローを作成します。Agitでは、貢献者は変更をforkしたりブランチを作るのではなく、"git push"して提案します。
 contributors.contribution_type.deletions = 削除
 settings.units.add_more = さらに...
-settings.wiki_globally_editable = 誰にでもWikiの編集を許す
+settings.wiki_globally_editable = 誰でもWikiを編集できる様にする
 settings.confirmation_string = 確認
 settings.wiki_rename_branch_main_notices_1 = この操作は 取り消しできません 。
 stars = スター
@@ -2754,6 +2789,33 @@ form.string_too_long = 指定された文字列は %d 文字より長いです
 project = プロジェクト
 subscribe.issue.guest.tooltip = このイシューを購読するにはサインインしてください。
 subscribe.pull.guest.tooltip = このプルリクエストを購読するにはサインインしてください。
+issues.author.tooltip.pr = このユーザーはこのプルリクエストの作成者です。
+issues.author.tooltip.issue = このユーザーはこの問題の作成者です。
+mirror_public_key = 公開SSHキー
+mirror_use_ssh.text = SSH認証を使用する
+mirror_use_ssh.helper = このオプションを選択すると、Forgejo は SSH 経由の Git でリポジトリをミラーリングし、キーペアを作成します。生成された公開キーが宛先リポジトリにプッシュできるように承認されていることを確認する必要があります。このオプションを選択した場合、パスワードベースの認証は使用できません。
+comments.edit.already_changed = コメントの変更を保存できません。コンテンツは既に別のユーザーによって変更されているようです。変更が上書きされないように、ページを更新して再度編集してください
+no_eol.tooltip = このファイルには末尾の行末文字が含まれていません。
+issues.edit.already_changed = イシューの変更を保存できません。コンテンツは既に別のユーザーによって変更されているようです。変更が上書きされないように、ページを更新して再度編集してください
+no_eol.text = EOLなし
+pulls.edit.already_changed = プルリクエストの変更を保存できません。コンテンツは既に別のユーザーによって変更されているようです。変更が上書きされないように、ページを更新して再度編集してください
+pulls.cmd_instruction_merge_warning = 警告: このリポジトリでは「手動マージの自動検出」設定が有効になっていません。後でこのプル リクエストを手動でマージ済みとしてマークする必要があります。
+n_release_one = %s リリース
+n_release_few = %s リリース
+milestones.filter_sort.name = 名前
+mirror_use_ssh.not_available = SSH認証は利用できません。
+mirror_denied_combination = 公開鍵とパスワードベースの認証を組み合わせて使用することはできません。
+activity.navbar.pulse = 活動状況
+activity.published_prerelease_label = プレリリース
+activity.published_tag_label = タグ
+settings.transfer_quota_exceeded = 新しい所有者 (%s) は割り当て量を超えています。リポジトリは転送されていません。
+settings.pull_mirror_sync_quota_exceeded = 割り当て量を超過したため、変更はプルされません。
+activity.commit = コミットアクティビティ
+settings.federation_settings = フェデレーション設定
+settings.federation_not_enabled = インスタンスでフェデレーションが有効になっていません。
+settings.federation_apapiurl = このリポジトリのフェデレーション URL。これをコピーして、フォロー リポジトリの URL として別のリポジトリのフェデレーション設定に貼り付けます。
+settings.federation_following_repos = フォローしているリポジトリの URL。空白なしで";"で区切られます。
+settings.mirror_settings.push_mirror.copy_public_key = 公開鍵をコピー
 
 [graphs]
 component_loading = %s の読み込み中...
@@ -2944,9 +3006,9 @@ dashboard.archive_cleanup=古いリポジトリアーカイブの削除
 dashboard.deleted_branches_cleanup=削除ブランチのクリーンアップ
 dashboard.update_migration_poster_id=移行する投稿者IDの更新
 dashboard.git_gc_repos=すべてのリポジトリでガベージコレクションを実行
-dashboard.resync_all_sshkeys='.ssh/authorized_keys' ファイルをForgejo上のSSHキーで更新
-dashboard.resync_all_sshprincipals='.ssh/authorized_principals' ファイルをForgejo上のSSHプリンシパルで更新
-dashboard.resync_all_hooks=すべてのリポジトリの pre-receive, update, post-receive フックを更新する。
+dashboard.resync_all_sshkeys=Forgejo SSH キーを使用して".ssh/authorized_keys"ファイルを更新します。
+dashboard.resync_all_sshprincipals=Forgejo SSH プリンシパルを使用して".ssh/authorized_principals"ファイルを更新します。
+dashboard.resync_all_hooks=すべてのリポジトリの pre-receive, update, post-receive フックを更新する
 dashboard.reinit_missing_repos=レコードが存在するが見当たらないすべてのGitリポジトリを再初期化する
 dashboard.sync_external_users=外部ユーザーデータの同期
 dashboard.cleanup_hook_task_table=hook_taskテーブルのクリーンアップ
@@ -3823,6 +3885,13 @@ no_results = 一致する結果が見つかりませんでした。
 fuzzy_tooltip = 入力された語句に近いものも結果に含める
 match = 一致
 match_tooltip = 検索語句に厳密に一致するもののみ結果に含める
+milestone_kind = マイルストーンを検索...
+union_tooltip = 空白で区切られたキーワードのいずれかに一致する結果を含める
+exact_tooltip = 検索語句と完全に一致する結果のみを含める
+issue_kind = イシューを検索...
+pull_kind = プルを検索...
+exact = 完全一致
+regexp_tooltip = 検索語句を正規表現として解釈する
 
 
 [munits.data]
diff --git a/options/locale/locale_lt.ini b/options/locale/locale_lt.ini
index b55a749cb2..32d66f8a73 100644
--- a/options/locale/locale_lt.ini
+++ b/options/locale/locale_lt.ini
@@ -221,14 +221,25 @@ buttons.link.tooltip = Pridėti nuorodą
 buttons.heading.tooltip = Pridėti antraštę
 buttons.bold.tooltip = Pridėti pusjuodį tekstą
 buttons.italic.tooltip = Pridėti kursyvinį tekstą
+buttons.list.unordered.tooltip = Pridėti punktų sąrašą
+buttons.list.ordered.tooltip = Pridėti numeruotą sąrašą
+buttons.list.task.tooltip = Pridėti užduočių sąrašą
+buttons.mention.tooltip = Minėti naudotoją arba komandą
+buttons.ref.tooltip = Nurodyti į problemą arba sujungimo prašymą
+buttons.switch_to_legacy.tooltip = Vietoj to naudoti senąjį rengyklę
+buttons.enable_monospace_font = Įjungti vienspalvį šriftą
+buttons.disable_monospace_font = Išjungti vienspalvį šriftą
+buttons.indent.tooltip = Įdėti elementus vienu lygiu
 
 [error]
 network_error = Tinklo klaida
 server_internal = Vidinio serverio klaida
+occurred = Įvyko klaida.
 
 [startpage]
 app_desc = Nesudėtinga, savarankiškai teikiama „Git“ paslauga
 install = Lengva įdiegti
+license = Atvirojo kodo
 
 [install]
 path = Kelias
@@ -257,4 +268,8 @@ code = Kodas
 [auth]
 remember_me = Prisiminti šį įrenginį
 forgot_password_title = Pamirštas slaptažodis
-forgot_password = Pamiršote slaptažodį?
\ No newline at end of file
+forgot_password = Pamiršote slaptažodį?
+
+[filter]
+string.asc = A – Ž
+string.desc = Ž – A
\ No newline at end of file
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
index d254036e36..354ad5074f 100644
--- a/options/locale/locale_nl-NL.ini
+++ b/options/locale/locale_nl-NL.ini
@@ -476,6 +476,7 @@ hint_register = Heb je een account nodig?  Registreer nu.
 sign_up_button = Registreer nu.
 back_to_sign_in = Terug naar aanmelden
 sign_in_openid = Ga verder met OpenID
+unauthorized_credentials = Je inloggegevens zijn foutief of vervallen. Probeer opnieuw of zie %s voor meer informatie
 
 [mail]
 view_it_on=Bekijk het op %s
@@ -3942,6 +3943,8 @@ pull_kind = Zoek pulls...
 union = Trefwoorden
 union_tooltip = Neem resultaten op die overeenkomen met een van de trefwoorden gescheiden door spaties
 milestone_kind = Zoek mijlpalen...
+regexp_tooltip = Interpreteer de zoekterm als een reguliere expressie
+regexp = RegExp
 
 [munits.data]
 b = B
diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini
index e9e3b62254..cecafc9870 100644
--- a/options/locale/locale_pl-PL.ini
+++ b/options/locale/locale_pl-PL.ini
@@ -552,6 +552,7 @@ removed_security_key.subject = Klucz bezpieczeństwa został usunięty
 removed_security_key.text_1 = Klucz bezpieczeństwa "%[1]s" został właśnie usunięty z twojego konta.
 totp_enrolled.text_1.has_webauthn = Właśnie włączyłeś TOTP dla swojego konta. Oznacza to, że dla wszystkich przyszłych logowań do konta możesz użyć TOTP jako metody 2FA lub użyć dowolnego klucza bezpieczeństwa.
 team_invite.text_2 = Kliknij poniższy link, aby dołączyć do zespołu:
+issue.action.merge = połączone
 
 
 [modal]
@@ -685,7 +686,7 @@ avatar=Awatar
 ssh_gpg_keys=Klucze SSH / GPG
 social=Konta społecznościowe
 applications=Aplikacje
-orgs=Zarządzaj organizacjami
+orgs=Organizacje
 repos=Repozytoria
 delete=Usuń konto
 twofa=Autoryzacja dwuetapowa
@@ -698,7 +699,7 @@ password_username_disabled=Użytkownicy nielokalni nie mogą zmieniać swoich na
 full_name=Imię i nazwisko
 website=Strona
 location=Lokalizacja
-update_theme=Zaktualizuj motyw
+update_theme=Zmień motyw
 update_profile=Zaktualizuj profil
 update_language_success=Język został zaktualizowany.
 update_profile_success=Twój profil został zaktualizowany.
@@ -729,15 +730,15 @@ password_change_disabled=Konta niebędące lokalnymi nie mogą zmienić swojego
 
 emails=Adresy e-mail
 manage_emails=Zarządzaj adresami e-mail
-manage_themes=Wybierz motyw domyślny
-manage_openid=Zarządzanie adresami OpenID
+manage_themes=Domyślny motyw
+manage_openid=Adresy OpenID
 theme_desc=Będzie to domyślny motyw na całej stronie.
 primary=Podstawowy
 activated=Aktywowany
 requires_activation=Wymaga aktywacji
 primary_email=Ustaw jako podstawowy
-activate_email=Wyślij aktywację
-activations_pending=Aktywacje oczekujące
+activate_email=Wyślij email aktywacyjny
+activations_pending=Oczekujące aktywacje
 delete_email=Usuń
 email_deletion=Usuń adres email
 email_deletion_desc=Adres e-mail i powiązane informacje zostaną usunięte z Twojego konta. Commity za pomocą tego adresu e-mail pozostaną niezmienione. Kontynuować?
@@ -747,7 +748,7 @@ theme_update_error=Wybrany motyw nie istnieje.
 openid_deletion=Usuń adres OpenID
 openid_deletion_desc=Usunięcie tego adresu OpenID z Twojego konta uniemożliwi Ci logowanie się za jego pomocą. Kontynuować?
 openid_deletion_success=Adres OpenID został usunięty.
-add_new_email=Dodaj nowy e-mail
+add_new_email=Dodaj e-mail
 add_new_openid=Dodaj nowy URI OpenID
 add_email=Dodaj adres e-mail
 add_openid=Dodaj OpenID URI
@@ -760,13 +761,13 @@ openid_desc=OpenID pozwala na delegowanie uwierzytelniania do zewnętrznego oper
 manage_ssh_keys=Zarządzaj kluczami SSH
 manage_gpg_keys=Zarządzaj kluczami GPG
 add_key=Dodaj klucz
-ssh_desc=Te publiczne klucze SSH są powiązane z Twoim kontem. Odpowiadające im klucze prywatne umożliwiają pełny dostęp do Twoich repozytoriów.
-gpg_desc=Te publiczne klucze GPG są powiązane z Twoim kontem. Dbaj o bezpieczeństwo kluczy prywatnych, gdyż pozwalają one na weryfikację commitów.
+ssh_desc=Te publiczne klucze SSH są powiązane z Twoim kontem. Odpowiadające im klucze prywatne umożliwiają pełny dostęp do Twoich repozytoriów. Klucze SSH, które zostały zweryfikowane mogą zostać użyte do weryfikacji commitów podpisanych kluczem SSH.
+gpg_desc=Te publiczne klucze GPG są powiązane z Twoim kontem i będą używane do weryfikacji twoich commitów. Dbaj o bezpieczeństwo kluczy prywatnych, gdyż pozwalają one na podpisywanie commitów.
 ssh_helper=Potrzebujesz pomocy? Sprawdź na GitHubie przewodnik generowania kluczy SSH lub rozwiązywanie typowych problemów z SSH.
 gpg_helper=Potrzebujesz pomocy? Przeczytaj na GitHubie poradnik na temat GPG.
 add_new_key=Dodaj klucz SSH
 add_new_gpg_key=Dodaj klucz GPG
-key_content_gpg_placeholder=Zaczyna się od '-----BEGIN PGP PUBLICZNEJ BLOKI KLUCZOWEJ PGP---'
+key_content_gpg_placeholder=Zaczyna się od "-----BEGIN PGP PUBLIC KEY BLOCK-----"
 ssh_key_been_used=Ten klucz SSH został już dodany do tego serwera.
 ssh_key_name_used=Klucz SSH z tą nazwą został już dodany do Twojego konta.
 ssh_principal_been_used=Ten klucz SSH został już dodany do tego serwera.
@@ -783,7 +784,7 @@ gpg_token=Token
 gpg_token_help=Możesz wygenerować podpis za pomocą:
 gpg_token_code=echo "%s" | gpg -a --default-key %s --detach-sig
 gpg_token_signature=Wzmocniony podpis GPG
-key_signature_gpg_placeholder=Zaczyna się od '-----BEGIN PGP SIGNATURE-----'
+key_signature_gpg_placeholder=Zaczyna się od "-----BEGIN PGP SIGNATURE-----"
 ssh_key_verified=Zweryfikowany klucz
 ssh_key_verified_long=Klucz został zweryfikowany tokenem i może być użyty do weryfikacji zmian pasujących do wszystkich aktywowanych adresów e-mail tego użytkownika.
 ssh_key_verify=Weryfikuj
@@ -791,7 +792,7 @@ ssh_token_required=Musisz podać podpis poniższego tokenu
 ssh_token=Token
 ssh_token_help=Możesz wygenerować podpis używając:
 ssh_token_signature=Wzmocniony podpis SSH
-key_signature_ssh_placeholder=Zaczyna się od '-----BEGIN SSH SIGNATURE-----'
+key_signature_ssh_placeholder=Zaczyna się od "-----BEGIN SSH SIGNATURE-----"
 subkeys=Podklucze
 key_id=ID klucza
 key_name=Nazwa klucza
@@ -821,10 +822,10 @@ ssh_externally_managed=Ten klucz SSH jest zarządzany zewnętrznie dla tego uży
 manage_social=Zarządzaj powiązanymi kontami społecznościowymi
 unbind=Rozłącz
 
-manage_access_token=Zarządzaj tokenami dostępu
+manage_access_token=Tokeny dostępu
 generate_new_token=Wygeneruj nowy token
 tokens_desc=Te tokeny dostępu udzielają dostępu do Twojego konta za pomocą API Forgejo.
-token_name=Nazwa tokena
+token_name=Nazwa tokenu
 generate_token=Wygeneruj token
 generate_token_success=Twój nowy token został wygenerowany. Skopiuj go teraz, gdyż nie zostanie ujawniony ponownie.
 generate_token_name_duplicate=%s istnieje już jako nazwa aplikacji. Użyj nowej.
@@ -854,15 +855,15 @@ oauth2_application_create_description=Aplikacje OAuth2 umożliwiają Twojej apli
 
 authorized_oauth2_applications=Autoryzowane aplikacje OAuth2
 revoke_key=Odwołaj
-revoke_oauth2_grant=Odwołaj dostęp
+revoke_oauth2_grant=Zabierz dostęp
 revoke_oauth2_grant_description=Odwołanie dostępu dla tej aplikacji uniemożliwi jej korzystanie z Twoich danych. Czy jesteś pewny(-a)?
 
 twofa_desc=Weryfikacja dwuskładnikowa zwiększa bezpieczeństwo Twojego konta.
 twofa_is_enrolled=Twoje konto ma obecnie włączoną autoryzację dwuetapową.
 twofa_not_enrolled=Twoje konto obecnie nie ma włączonej autoryzacji dwuetapowej.
 twofa_disable=Wyłącz weryfikację dwuetapową
-twofa_scratch_token_regenerate=Wygeneruj ponownie kod jednorazowy
-twofa_enroll=Włącz weryfikację dwuskładnikową
+twofa_scratch_token_regenerate=Ponownie wygeneruj jednorazowy kod odzyskiwania
+twofa_enroll=Włącz weryfikację dwuetapową
 twofa_disable_note=W każdej chwili możesz wyłączyć weryfikację dwuskładnikową.
 twofa_disable_desc=Wyłączenie weryfikacji dwuetapowej sprawi, że Twoje konto będzie mniej bezpieczne. Kontynuować?
 regenerate_scratch_token_desc=Jeśli zgubiłeś(-aś) lub zużyłeś(-aś) swój kod jednorazowy, możesz go wygenerować ponownie tutaj.
@@ -878,7 +879,7 @@ webauthn_register_key=Dodaj klucz bezpieczeństwa
 webauthn_delete_key=Usuń klucz bezpieczeństwa
 webauthn_delete_key_desc=Jeżeli usuniesz klucz bezpieczeństwa, utracisz możliwość zalogowania się z jego użyciem. Kontynuować?
 
-manage_account_links=Zarządzaj powiązanymi kontami
+manage_account_links=Powiązane konta
 manage_account_links_desc=Te konta zewnętrzne są powiązane z Twoim kontem Forgejo.
 account_links_not_available=Obecnie nie ma żadnych zewnętrznych kont powiązanych z tym kontem Forgejo.
 link_account=Powiąż konto
@@ -893,7 +894,7 @@ delete_account=Usuń swoje konto
 delete_prompt=Ta operacja permanentnie usunie Twoje konto użytkownika i jest NIEODWRACALNA.
 delete_with_all_comments=Twoje konto jest młodsze niż %s. Aby uniknąć fałszywych komentarzy, wszystkie komentarze zgłoszenia/PR zostaną z nim usunięte.
 confirm_delete_account=Potwierdź usunięcie
-delete_account_title=Usuń swoje konto
+delete_account_title=Usuń konto użytkownika
 delete_account_desc=Czy na pewno chcesz permanentnie usunąć to konto użytkownika?
 
 email_notifications.enable=Włącz powiadomienia e-mail
@@ -932,7 +933,7 @@ template_description=Szablony repozytoriów pozwalają użytkownikom generować
 visibility=Widoczność
 visibility_description=Tylko właściciel lub członkowie organizacji, jeśli mają odpowiednie uprawnienia, będą mogli to zobaczyć.
 visibility_helper_forced=Administrator strony wymaga, aby nowe repozytoria były prywatne.
-visibility_fork_helper=(Zmiana tej wartości wpłynie na wszystkie forki.)
+visibility_fork_helper=(Zmiana tej wartości wpłynie na widoczność wszystkich forków.)
 clone_helper=Potrzebujesz pomocy z klonowaniem? Odwiedź pomoc.
 fork_repo=Forkuj repozytorium
 fork_from=Forkuj z
@@ -942,13 +943,13 @@ clone_in_vsc=Klonuj w VS Code
 download_zip=Pobierz ZIP
 download_tar=Pobierz TAR.GZ
 download_bundle=Pobierz BUNDLE
-generate_repo=Generuj repozytorium
-generate_from=Generuj z
+generate_repo=Wygeneruj repozytorium
+generate_from=Wygeneruj z
 repo_desc=Opis
 repo_desc_helper=Wprowadź krótki opis (opcjonalnie)
 repo_lang=Język
 repo_gitignore_helper=Wybierz szablony pliku .gitignore.
-issue_labels=Etykiety zgłoszenia
+issue_labels=Etykiety
 issue_labels_helper=Wybierz zestaw etykiet zgłoszeń
 license=Licencja
 license_helper=Wybierz plik licencji
@@ -959,14 +960,14 @@ readme_helper_desc=To jest miejsce, w którym możesz napisać pełny opis swoje
 auto_init=Inicjalizuj repozytorium (dodaje .gitignore, licencję i README)
 trust_model_helper_default=Domyślnie: Użyj domyślnego modelu zaufania dla tej instalacji
 create_repo=Utwórz repozytorium
-default_branch=Domyślna gałąź
+default_branch=Domyślny branch
 default_branch_helper=Domyślny branch jest podstawowym branch'em dla pull requestów i commit'ów kodu.
 mirror_prune=Wyczyść
 mirror_prune_desc=Usuń przestarzałe odwołania do zdalnych śledzeń
 mirror_interval_invalid=Interwał lustrzanej kopii jest niepoprawny.
 mirror_address=Sklonuj z adresu URL
 mirror_lfs=Duże przechowywanie plików (LFS)
-mirror_lfs_endpoint=Punkt końcowy LFS
+mirror_lfs_endpoint=Endpoint LFS
 mirror_lfs_endpoint_desc=Synchronizacja spróbuje użyć adresu URL klonowania, aby określić serwer LFS. Możesz również określić niestandardowy punkt końcowy, jeśli dane repozytorium LFS są przechowywane gdzieś indziej.
 mirror_last_synced=Ostatnio zsynchronizowano
 mirror_password_placeholder=(Nie zmieniono)
@@ -1912,8 +1913,8 @@ settings.protect_whitelist_teams=Zespoły dopuszczone do pushowania
 settings.protect_whitelist_search_teams=Szukaj zespołów…
 settings.protect_merge_whitelist_committers=Włącz dopuszczenie scalania
 settings.protect_merge_whitelist_committers_desc=Zezwól jedynie dopuszczonym użytkownikom lub zespołom na scalanie Pull Requestów w tej gałęzi.
-settings.protect_merge_whitelist_users=Użytkownicy dopuszczeni do scalania:
-settings.protect_merge_whitelist_teams=Zespoły dopuszczone do scalania:
+settings.protect_merge_whitelist_users=Użytkownicy dopuszczeni do scalania
+settings.protect_merge_whitelist_teams=Zespoły dopuszczone do scalania
 settings.protect_check_status_contexts=Włącz kontrolę stanu
 settings.protect_check_status_contexts_desc=Wymagaj powodzenia kontroli stanów przed scalaniem. Wybierz które kontrole stanów muszą zostać ukończone pomyślnie, zanim gałęzie będą mogły zostać scalone z gałęzią, która pokrywa się z tą zasadą. Kiedy włączone, commity muszą być najpierw wypchnięte do innej gałęzi, a następnie scalone lub wypchnięte bezpośrednio do gałęzi, która pokrywa się z tą zasadą po pomyślnej kontroli stanów. Jeżeli nie zostaną wybrane konteksty, ostatni commit musi zakończyć się powodzeniem niezależnie od kontekstu.
 settings.protect_check_status_contexts_list=Kontrole stanów w poprzednim tygodniu dla tego repozytorium
@@ -2866,4 +2867,5 @@ exact = Dokładnie
 exact_tooltip = Uwzględniaj tylko wyniki pasujące do wyszukiwanego hasła
 issue_kind = Wyszukaj problemy...
 pull_kind = Wyszukaj pull requesty...
-union = Unia
\ No newline at end of file
+union = Unia
+regexp = RegExp
\ No newline at end of file
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
index 1b1ae6882f..1769447a3e 100644
--- a/options/locale/locale_pt-BR.ini
+++ b/options/locale/locale_pt-BR.ini
@@ -4,7 +4,7 @@ dashboard=Painel
 explore=Explorar
 help=Ajuda
 logo=Logotipo
-sign_in=Acessar
+sign_in=Entrar
 sign_in_with_provider=Entrar com %s
 sign_in_or=ou
 sign_out=Sair
@@ -164,6 +164,8 @@ new_org.title = Nova organização
 new_repo.link = Novo repositório
 new_migrate.link = Nova migração
 new_org.link = Nova organização
+test = Teste
+error413 = Você esgotou sua cota.
 
 [aria]
 navbar=Barra de navegação
@@ -195,6 +197,8 @@ buttons.ref.tooltip=Referenciar um issue ou um pull request
 buttons.switch_to_legacy.tooltip=Em vez disso, usar o editor legado
 buttons.enable_monospace_font=Habilitar fonte mono espaçada
 buttons.disable_monospace_font=Desabilitar fonte mono espaçada
+buttons.indent.tooltip = Aninhar items em um nível
+buttons.unindent.tooltip = Desaninhar items em um nível
 
 [filter]
 string.asc=A - Z
@@ -251,7 +255,7 @@ err_admin_name_is_invalid=Nome de usuário do administrador inválido
 
 general_title=Configurações gerais
 app_name=Título do servidor
-app_name_helper=Você pode inserir o nome da empresa aqui.
+app_name_helper=Insira o nome da sua instância aqui. Ele será mostrado em todas as páginas.
 repo_path=Caminho raiz do repositório
 repo_path_helper=Todos os repositórios remotos do Git serão salvos neste diretório.
 lfs_path=Caminho raiz do Git LFS
@@ -281,22 +285,22 @@ register_confirm=Exigir confirmação de e-mail para cadastros
 mail_notify=Habilitar notificações por e-mail
 server_service_title=Configurações do servidor e serviços de terceiros
 offline_mode=Habilitar modo local
-offline_mode.description=Desabilitar redes de entrega de conteúdo de terceiros e entregar todos os recursos localmente.
+offline_mode.description=Desabilitar redes de entrega de conteúdo (CDNs) de terceiros e fornecer todos os recursos localmente.
 disable_gravatar=Desabilitar o gravatar
-disable_gravatar.description=Desabilitar o gravatar e avatar de fontes de terceiros. Um avatar padrão será usado a menos que um usuário localmente carrega um avatar.
+disable_gravatar.description=Desabilitar o uso do Gravatar e avatar de fontes de terceiros. Um avatar padrão será usado a menos que um usuário localmente carrega um avatar.
 federated_avatar_lookup=Habilitar avatares federados
-federated_avatar_lookup.description=Habilitar a busca federativa de avatares a usar o serviço federativo de código aberto baseado no libravatar.
+federated_avatar_lookup.description=Buscar avatares usando Libravatar.
 disable_registration=Somente administradores podem criar novas contas
-disable_registration.description=Desabilitar auto-cadastro de usuário. Somente os administradores serão capazes de criar novas contas de usuário.
-allow_only_external_registration.description=Permitir cadastro somente por meio de serviços externos
+disable_registration.description=Apenas administradores do servidor poderão criar novas contas. É altamente recomendado manter o cadastro desativado a não ser que deseje hospedar uma instância pública para qualquer pessoa e puder lidar com uma grande quantidade de contas de spam.
+allow_only_external_registration.description=Usuários apenas poderão criar novas contas usando serviços externos que tenham sido configurados.
 openid_signin=Habilitar acesso via OpenID
 openid_signin.description=Habilitar o acesso de usuários via OpenID.
 openid_signup=Habilitar cadastros via OpenID
-openid_signup.description=Habilitar o auto-cadastro com base no OpenID.
+openid_signup.description=Permitir que os usuários criem contas com OpenID se o autorregistro estiver habilitado.
 enable_captcha=Habilitar CAPTCHA ao registrar
 enable_captcha.description=Impor validação por CAPTCHA para cadastro de usuários.
 require_sign_in_view=Apenas usuários logados podem visualizar páginas
-require_sign_in_view.description=Limitar o acesso de página aos usuários autenticados. Os visitantes só verão as páginas de autenticação e cadastro.
+require_sign_in_view.description=Limitar acesso ao conteúdo apenas aos usuários autenticados. Visitantes só poderão acessar as páginas de autenticação.
 admin_setting.description=Criar uma conta de administrador é opcional. O primeiro usuário cadastrado automaticamente se tornará um administrador.
 admin_title=Configurações da conta de administrador
 admin_name=Usuário
@@ -317,11 +321,11 @@ save_config_failed=Falha ao salvar a configuração: %v
 invalid_admin_setting=Configuração da conta de administrador está inválida: %v
 invalid_log_root_path=Pasta raíz do log está inválida: %v
 default_keep_email_private=Ocultar endereços de e-mail por padrão
-default_keep_email_private.description=Ocultar endereços de e-mail de novas contas de usuário por padrão.
+default_keep_email_private.description=Ocultar endereços de e-mail de novas contas de usuário por padrão para que esta informação não seja vazada imediatamente após o cadastro.
 default_allow_create_organization=Permitir a criação de organizações
-default_allow_create_organization.description=Permitir que novas contas de usuários criem organizações por padrão.
+default_allow_create_organization.description=Permitir que novas contas de usuário criem organizações por padrão. Quando esta opção está desabilitada, um administrador precisa dar permissão para a criação de organizações por novos usuários.
 default_enable_timetracking=Habilitar o cronômetro por padrão
-default_enable_timetracking.description=Habilitar o cronômetro para novos repositórios por padrão.
+default_enable_timetracking.description=Habilitar o uso da funcionalidade de contagem de tempo para novos repositórios por padrão.
 no_reply_address=Domínio de e-mail oculto
 no_reply_address_helper=Nome de domínio para usuários com endereço de e-mail oculto. Por exemplo, o nome de usuário "joe" será registrado no Git como "joe@noreply.example.org" se o domínio de e-mail oculto estiver definido como "noreply.example.org".
 password_algorithm=Algoritmo de hash de senhas
@@ -341,7 +345,7 @@ app_slogan_helper = Insira o slogan de seu servidor aqui. Deixe em branco para d
 [home]
 uname_holder=Usuário ou e-mail
 password_holder=Senha
-switch_dashboard_context=Trocar contexto do painel de controle
+switch_dashboard_context=Trocar contexto do painel
 my_repos=Repositórios
 show_more_repos=Mostrar mais repositórios…
 collaborative_repos=Repositórios colaborativos
@@ -403,14 +407,14 @@ forgot_password_title=Esqueci minha senha
 forgot_password=Esqueceu sua senha?
 sign_up_now=Precisa de uma conta? Cadastre-se agora.
 sign_up_successful=A conta foi criada com sucesso. Bem-vindo!
-confirmation_mail_sent_prompt=Um novo e-mail de confirmação foi enviado para %s. Por favor, verifique sua caixa de e-mail nas próximas %s horas para finalizar o processo de cadastro.
+confirmation_mail_sent_prompt=Um novo email de confirmação foi enviado para %s. Para completar o processo de cadastro, por favor verifique sua caixa de entrada e acesse o link fornecido dentro de %s. Se o e-mail estiver incorreto, você pode entrar na conta e solicitar outro e-mail de confirmação para um endereço diferente.
 must_change_password=Redefina sua senha
 allow_password_change=Exigir que o usuário redefina a senha (recomendado)
-reset_password_mail_sent_prompt=Um e-mail de confirmação foi enviado para %s. Por favor, verifique sua caixa de entrada dentro do(s) próximo(s) %s para concluir o processo de recuperação de conta.
-active_your_account=Ativar sua conta
+reset_password_mail_sent_prompt=Um e-mail de confirmação foi enviado para %s. Para concluir o processo de recuperação de conta, por favor verifique sua caixa de entrada e siga o link dentro do(s) próximo(s) %s.
+active_your_account=Ative sua conta
 account_activated=Conta foi ativada
-prohibit_login=É proibido fazer login
-prohibit_login_desc=Sua conta está proibida de fazer login, entre em contato com o administrador do site.
+prohibit_login=Conta está suspensa
+prohibit_login_desc=Sua conta foi suspensa de interagir com o servidor. Entre em contato com a administração do servidor para recuperar o acesso.
 resent_limit_prompt=Você já solicitou recentemente um e-mail de ativação. Por favor, aguarde 3 minutos e tente novamente.
 has_unconfirmed_mail=Oi %s, você possui um endereço de e-mail não confirmado (%s). Se você não recebeu um e-mail de confirmação ou precisa reenviar um novo, clique no botão abaixo.
 resend_mail=Clique aqui para reenviar seu e-mail de ativação
@@ -433,7 +437,7 @@ twofa_scratch_token_incorrect=Seu código de backup está incorreto.
 login_userpass=Acessar
 tab_openid=OpenID
 oauth_signup_tab=Cadastrar nova conta
-oauth_signup_title=Completar Nova Conta
+oauth_signup_title=Completar nova conta
 oauth_signup_submit=Completar conta
 oauth_signin_tab=Vincular a uma conta existente
 oauth_signin_title=Faça login para autorizar a conta vinculada
@@ -453,7 +457,7 @@ email_domain_blacklisted=Você não pode se cadastrar com seu endereço de e-mai
 authorize_application=Autorizar aplicativo
 authorize_redirect_notice=Você será redirecionado para %s se você autorizar este aplicativo.
 authorize_application_created_by=Este aplicativo foi criado por %s.
-authorize_application_description=Se você conceder o acesso, ele será capaz de acessar e escrever em todas as informações da sua conta, incluindo repositórios privados e organizações.
+authorize_application_description=Se você conceder o acesso, isso permitirá acessar e alterar todas as informações da sua conta, incluindo repositórios privados e organizações.
 authorize_title=Autorizar "%s" para acessar sua conta?
 authorization_failed=Autorização falhou
 authorization_failed_desc=A autorização falhou porque detectamos uma solicitação inválida. Entre em contato com o responsável do aplicativo que você tentou autorizar.
@@ -471,6 +475,8 @@ hint_register = Precisa de uma conta? Registre-se agora.
 sign_up_button = Registre-se agora.
 hint_login = Já possui uma conta? Faça login agora!
 sign_in_openid = Continuar com OpenID
+back_to_sign_in = Voltar a Iniciar Sessão
+unauthorized_credentials = As credenciais estão incorretas ou expiraram. Tente novamente o comando ou consulte %s para obter mais informações
 
 [mail]
 view_it_on=Veja em %s
@@ -487,7 +493,7 @@ activate_email=Verifique seu endereço de e-mail
 activate_email.title=%s, por favor verifique o seu endereço de e-mail
 activate_email.text=Por favor clique no link a seguir para verificar o seu endereço de e-mail em %s:
 
-register_notify=Bem-vindo ao %s
+register_notify=Boas vindas a %s
 register_notify.title=%[1]s, bem-vindo(a) a %[2]s
 register_notify.text_1=este é o seu e-mail de confirmação de registro para %s!
 register_notify.text_2=Você pode fazer login em sua conta utilizando o usuário: %s
@@ -549,6 +555,12 @@ totp_disabled.subject = A autenticação em dois fatores foi desabilitada
 removed_security_key.subject = Uma chave de segurança foi removida
 removed_security_key.text_1 = A chave de segurança "%[1]s" foi removida de sua conta.
 account_security_caution.text_1 = Caso tenha sido você, este e-mail pode ser ignorado.
+totp_enrolled.subject = Você ativou TOTP como método 2FA
+totp_disabled.text_1 = A senha de uso único baseada em tempo (TOTP) na sua conta foi desativada.
+totp_disabled.no_2fa = Já não existem mais outros métodos de autenticação em dois fatores (2FA) configurados, ou seja, não é mais necessário acessar sua conta com 2FA.
+removed_security_key.no_2fa = Já não existem mais outros métodos de autenticação em dois fatores (2FA) configurados, ou seja, não é mais necessário acessar sua conta com 2FA.
+totp_enrolled.text_1.no_webauthn = Você acabou de habilitar a TOTP para sua conta. Isso significa que para todos os acessos futuros à sua conta você deverá usar a TOTP como método de 2FA.
+totp_enrolled.text_1.has_webauthn = Você acabou de habilitar a TOTP para sua conta. Isso significa que para todos os futuros acessos à sua conta você pode usar a TOTP como método de 2FA ou usar qualquer uma de suas chaves de segurança.
 
 [modal]
 yes=Sim
@@ -689,17 +701,21 @@ form.name_chars_not_allowed=O usuário "%s" contém caracteres inválidos.
 block_user = Bloquear usuário
 unblock = Desbloquear
 block = Bloquear
-block_user.detail_2 = Este usuário não poderá interagir com seus repositórios, questões criadas e comentários.
+block_user.detail_2 = Este usuário não poderá interagir com repositórios, issues ou comentários criados por você.
 follow_blocked_user = Você não pode seguir este usuário porque você o bloqueou ou foi bloqueado por ele.
-block_user.detail_3 = Este(a) usuário(a) não poderá adicioná-lo(a) como colaborador(a), nem você poderá adicioná-lo(a) como colaborador(a).
-block_user.detail = Por favor, entenda que se você bloquear este usuário, outras ações serão tomadas. Tais como:
+block_user.detail_3 = Vocês não poderão adicionar um ao outro como colaboradores de um repositório.
+block_user.detail = Note que bloquear um usuário tem outros efeitos, tais como:
 followers_one = %d seguidor
 following_one = %d seguindo
-block_user.detail_1 = Você deixará de seguir este usuário.
+block_user.detail_1 = Vocês deixarão de seguir um ao outro e não poderão mais seguir um ao outro.
 following.title.few = seguindo
 following.title.one = seguindo
 followers.title.one = seguidor
 followers.title.few = seguidores
+public_activity.visibility_hint.self_private = Sua atividade está visível apenas para você e para os administradores da instância. Configurar.
+public_activity.visibility_hint.self_public = Sua atividade está visível para todos, exceto o engajamento em espaços privados. Configurar.
+public_activity.visibility_hint.admin_public = Sua atividade está visível para todos, mas como um administrador você também pode ver o engajamento em espaços privados.
+public_activity.visibility_hint.admin_private = Essa atividade está visível para você porque você é um administrador, mas o usuário dejesa que ela seja mantida em privado.
 
 [settings]
 profile=Perfil
@@ -809,12 +825,12 @@ add_new_email=Adicionar novo endereço de e-mail
 add_new_openid=Adicionar novo URI OpenID
 add_email=Adicionar novo endereço de e-mail
 add_openid=Adicionar URI OpenID
-add_email_confirmation_sent=Um e-mail de confirmação foi enviado para "%s". Verifique sua caixa de entrada nos próximos %s para confirmar seu endereço de e-mail.
+add_email_confirmation_sent=Um e-mail de confirmação foi enviado para "%s". Para confirmar seu endereço de e-mail, verifique sua caixa de entrada e acesse o link fornecido nela em até %s.
 add_email_success=O novo endereço de e-mail foi adicionado.
 email_preference_set_success=Preferência de e-mail definida com sucesso.
 add_openid_success=O novo endereço de OpenID foi adicionado.
 keep_email_private=Ocultar endereço de e-mail
-keep_email_private_popup=Isso ocultará seu endereço de e-mail do seu perfil, bem como quando você fizer um pull request ou editar um arquivo usando a interface Web. Os commits enviados não serão modificados.
+keep_email_private_popup=Isso ocultará seu endereço de e-mail do seu perfil. Ele não será mais o padrão para commits feitos pela interface web, como envios de arquivos e modificações, e não será usado para commits de merge. Em vez disso, um endereço especial %s pode ser usado para associar commits com a sua conta. Note que modificar esta opção não irá afetar commits já existentes.
 openid_desc=OpenID permite delegar autenticação para um provedor externo.
 
 manage_ssh_keys=Gerenciar chaves SSH
@@ -955,9 +971,9 @@ twofa_desc=Autenticação de dois fatores melhora a segurança de sua conta.
 twofa_is_enrolled=Sua conta está atualmente habilitada com autenticação de dois fatores.
 twofa_not_enrolled=Sua conta não está atualmente inscrita para a autenticação em duas etapas.
 twofa_disable=Desabilitar autenticação de dois fatores
-twofa_scratch_token_regenerate=Gerar novamente o token de backup
+twofa_scratch_token_regenerate=Gerar novamente o token de recuperação de uso único
 twofa_scratch_token_regenerated=Seu token agora é %s. Guarde-a em um local seguro, pois ela nunca mais será exibido.
-twofa_enroll=Inscrever para a autenticação de dois fatores
+twofa_enroll=Habilitar a autenticação de dois fatores
 twofa_disable_note=Você pode desabilitar a autenticação de dois fatores se necessário.
 twofa_disable_desc=Desabilitar a autenticação de dois fatores tornará sua conta menos segura. Tem certeza que deseja continuar?
 regenerate_scratch_token_desc=Se você perdeu o seu token de backup, ou teve que usá-lo para realizar um acesso, você pode redefini-lo.
@@ -998,7 +1014,7 @@ delete_account_desc=Tem certeza que deseja apagar sua conta de usuário permanen
 email_notifications.enable=Habilitar notificações por e-mail
 email_notifications.onmention=Somente quando for mencionado(a)
 email_notifications.disable=Desabilitar notificações por e-mail
-email_notifications.submit=Atualizar preferências de e-mail
+email_notifications.submit=Definir preferência de email
 email_notifications.andyourown=e suas próprias notificações
 
 visibility=Visibilidade do usuário
@@ -1029,6 +1045,7 @@ update_hints = Dicas de atualização
 update_hints_success = As dicas foram atualizadas.
 keep_activity_private.description = A sua atividade pública estará visível apenas para si e para os administradores do servidor.
 language.localization_project = Ajude-nos a traduzir Forgejo para o seu idioma! Mais informações.
+language.description = Essa língua será salva em sua conta e será usada como padrão após você iniciar a sessão.
 
 [repo]
 owner=Proprietário
@@ -1037,16 +1054,16 @@ repo_name=Nome do repositório
 repo_name_helper=Um bom nome de repositório é composto por palavras curtas, memorizáveis e únicas.
 repo_size=Tamanho do repositório
 template=Modelo
-template_select=Selecione um modelo.
+template_select=Selecione um modelo
 template_helper=Tornar repositório um modelo
 template_description=Os repositórios de modelo permitem que os usuários gerem novos repositórios com a mesma estrutura de diretório, arquivos e configurações opcionais.
 visibility=Visibilidade
 visibility_description=Somente o proprietário ou os membros da organização, se tiverem direitos, poderão vê-lo.
 visibility_helper=Tornar o repositório privado
 visibility_helper_forced=O administrador do site força novos repositórios a serem privados.
-visibility_fork_helper=(Esta alteração irá afetar todos os forks.)
+visibility_fork_helper=(Esta alteração irá afetar a visibilidade de todos os forks.)
 clone_helper=Precisa de ajuda com o clone? Visite a Ajuda.
-fork_repo=Fork do repositório
+fork_repo=Fazer fork do repositório
 fork_from=Fork de
 already_forked=Você já fez o fork de %s
 fork_to_different_account=Faça um fork para uma conta diferente
@@ -1062,17 +1079,17 @@ generate_from=Gerar a partir de
 repo_desc=Descrição
 repo_desc_helper=Digite uma breve descrição (opcional)
 repo_lang=Linguagem
-repo_gitignore_helper=Selecione modelos do .gitignore.
+repo_gitignore_helper=Selecionar modelos de .gitignore
 repo_gitignore_helper_desc=Escolha os arquivos que não serão rastreados da lista de modelos para linguagens comuns. Artefatos típicos gerados pelos compiladores de cada linguagem estão incluídos no .gitignore por padrão.
-issue_labels=Etiquetas de issue
-issue_labels_helper=Selecione um conjunto de etiquetas de issue.
+issue_labels=Etiquetas
+issue_labels_helper=Selecione um conjunto de etiquetas
 license=Licença
-license_helper=Selecione um arquivo de licença.
+license_helper=Selecione um arquivo de licença
 license_helper_desc=Uma licença define o que os outros podem e não podem fazer com o seu código. Não tem certeza qual é a mais adequada para o seu projeto? Veja Escolher uma licença.
 readme=LEIA-ME
-readme_helper=Selecione um modelo de arquivo LEIA-ME.
+readme_helper=Selecione um modelo de arquivo README
 readme_helper_desc=Aqui você pode escrever uma descrição completa para o seu projeto.
-auto_init=Inicializar o repositório (adicionando .gitignore, licença e LEIA-ME)
+auto_init=Inicializar o repositório (Adiciona arquivos .gitignore, licença e README)
 trust_model_helper=Selecione o modelo de confiança para verificação de assinatura. As opções possíveis são:
 trust_model_helper_collaborator=Colaborador: Confiar em assinaturas de colaboradores
 trust_model_helper_committer=Committer: Confiar em assinaturas que correspondem aos committers
@@ -1084,12 +1101,12 @@ default_branch_label=padrão
 default_branch_helper=O branch padrão é o branch base para pull requests e commits de código.
 mirror_prune=Varrer
 mirror_prune_desc=Remover referências obsoletas de controle remoto
-mirror_interval=Intervalo de espelhamento (unidades válidas são 'h', 'm', ou 's'). O desabilita a sincronização automática. (Intervalo mínimo: %s)
+mirror_interval=Intervalo de espelhamento (unidades válidas de tempo são "h", "m", "s"). O valor 0 desabilita a sincronização periódica. (Intervalo mínimo: %s)
 mirror_interval_invalid=O intervalo do espelhamento não é válido.
 mirror_sync_on_commit=Sincronizar quando commits forem enviados
 mirror_address=Clonar a partir de URL
 mirror_address_desc=Coloque todas as credenciais necessárias na seção de autorização.
-mirror_address_url_invalid=O URL fornecido é inválido. Você deve escapar todos os componentes do URL corretamente.
+mirror_address_url_invalid=A URL fornecida é inválida. Você deve escapar todos os componentes da URL corretamente.
 mirror_address_protocol_invalid=O URL fornecido é inválido. Somente locais http(s):// ou git:// podem ser usados para espelhamento.
 mirror_lfs=Armazenamento de Arquivo Grande (LFS)
 mirror_lfs_desc=Ativar espelhamento de dados LFS.
@@ -1168,7 +1185,7 @@ migrate_items_milestones=Marcos
 migrate_items_labels=Etiquetas
 migrate_items_issues=Issues
 migrate_items_pullrequests=Pull requests
-migrate_items_merge_requests=Requisições de merge
+migrate_items_merge_requests=Pedidos de merge
 migrate_items_releases=Versões
 migrate_repo=Migrar repositório
 migrate.clone_address=Migrar / Clonar de URL
@@ -1200,9 +1217,9 @@ migrate.migrating_git=Migrando dados Git
 migrate.migrating_topics=Migrando tópicos
 migrate.migrating_milestones=Migrando marcos
 migrate.migrating_labels=Migrando rótulos
-migrate.migrating_releases=Migrando Versões
-migrate.migrating_issues=Migrando Issues
-migrate.migrating_pulls=Migrando Pull Requests
+migrate.migrating_releases=Migrando releases
+migrate.migrating_issues=Migrando issues
+migrate.migrating_pulls=Migrando pull requests
 migrate.cancel_migrating_title=Cancelar migração
 migrate.cancel_migrating_confirm=Você quer cancelar essa migração?
 
@@ -1275,15 +1292,15 @@ ambiguous_character=`%[1]c [U+%04[1]X] é confundível com o %[2]c [U+%04[2]X]`
 escape_control_characters=Escapar
 unescape_control_characters=Desescapar
 file_copy_permalink=Copiar link permanente
-view_git_blame=Ver Git Blame
-video_not_supported_in_browser=Seu navegador não suporta a tag 'video' do HTML5.
-audio_not_supported_in_browser=Seu navegador não suporta a tag 'audio' do HTML5.
+view_git_blame=Ver git blame
+video_not_supported_in_browser=Seu navegador não tem suporte para a tag "video" do HTML5.
+audio_not_supported_in_browser=Seu navegador não tem suporte para a tag "audio" do HTML5.
 stored_lfs=Armazenado com Git LFS
 symbolic_link=Link simbólico
 executable_file=Arquivo executável
 commit_graph=Gráfico de commits
 commit_graph.select=Selecionar branches
-commit_graph.hide_pr_refs=Esconder Pull Requests
+commit_graph.hide_pr_refs=Esconder pull requests
 commit_graph.monochrome=Monocromático
 commit_graph.color=Colorido
 commit.contained_in=Esse commit está contido em:
@@ -1349,8 +1366,8 @@ editor.commit_empty_file_text=O arquivo que você está prestes fazer commit est
 editor.no_changes_to_show=Nenhuma alteração a mostrar.
 editor.fail_to_update_file=Falha ao atualizar/criar arquivo "%s".
 editor.fail_to_update_file_summary=Mensagem de erro:
-editor.push_rejected_no_message=A alteração foi rejeitada pelo servidor sem uma mensagem. Por favor, verifique os Hooks Git.
-editor.push_rejected=A alteração foi rejeitada pelo servidor. Por favor, verifique os Hooks Git.
+editor.push_rejected_no_message=A alteração foi rejeitada pelo servidor sem uma mensagem. Por favor, verifique os Git hooks .
+editor.push_rejected=A alteração foi rejeitada pelo servidor. Por favor, verifique os Git hooks .
 editor.push_rejected_summary=Mensagem completa de rejeição:
 editor.add_subdir=Adicionar um subdiretório...
 editor.unable_to_upload_files=Ocorreu um erro ao enviar arquivos para "%s": %v
@@ -1395,7 +1412,7 @@ commitstatus.failure=Falha
 commitstatus.pending=Pendente
 commitstatus.success=Sucesso
 
-ext_issues=Acesso a Issues Externos
+ext_issues=Issues externos
 ext_issues.desc=Link para o issue tracker externo.
 
 projects=Projetos
@@ -1416,7 +1433,7 @@ projects.modify=Editar projeto
 projects.edit_success=Projeto "%s" atualizado.
 projects.type.none=Nenhum
 projects.type.basic_kanban=Kanban básico
-projects.type.bug_triage=Triagem de Bugs
+projects.type.bug_triage=Triagem de bugs
 projects.template.desc=Modelo de projeto
 projects.template.desc_helper=Selecione um modelo de projeto para começar
 projects.type.uncategorized=Sem categoria
@@ -2639,7 +2656,7 @@ admin.update_flags = Atualizar sinalizadores
 admin.flags_replaced = Os sinalizadores do repositório foram substituídos
 all_branches = Todos os ramos
 fork_branch = Branch a ser clonada para o fork
-object_format_helper = O formato utilizado para armazenar os objetos do repositório, sendo SHA1 o mais compatível. Esta ação é IRREVERSÍVEL.
+object_format_helper = O formato utilizado para armazenar os objetos do repositório. Não pode ser alterado depois. SHA1 é o mais compatível.
 object_format = Formato dos objetos
 tree_path_not_found_branch = O caminho %[1]s não existe no ramo %[2]s
 tree_path_not_found_tag = O caminho %[1]s não existe na etiqueta %[2]s
@@ -2732,6 +2749,80 @@ activity.published_tag_label = Etiqueta
 issues.author.tooltip.issue = Este(a) usuário(a) é o(a) autor(a) desta questão.
 no_eol.text = Sem EOL
 no_eol.tooltip = Não há um caractere de fim de linha no final do arquivo.
+pulls.fast_forward_only_merge_pull_request = Apenas fast-forward
+pulls.has_merged = Falha: O pull request foi merged, você não pode merge novamente ou mudar o branch destino.
+issues.author.tooltip.pr = Esse usuário é o autor dessa solicitação de pull.
+editor.push_out_of_date = O push parece estar desatualizado.
+issues.comment.blocked_by_user = Você não pode criar um comentário nesse problema porque você está bloqueado pelo dono do repositório ou pelo autor do problema.
+pulls.blocked_by_user = Você não pode criar uma solicitação de pull nesse repositório porque você está bloqueado pelo dono do repositório.
+mirror_use_ssh.helper = Forgejo irá espelhar o repositório via Git através de SSH e criar um par de chaves para você ao escolher essa opção. Você deverá garantir que a chave pública gerada está autorizada a fazer push para o repositório de destino. Você não pode usar autorização baseada em senha ao escolher essa opção.
+mirror_denied_combination = Não é possível combinar o uso de chave pública e autenticação baseada em senha.
+mirror_public_key = Chave SSH pública
+mirror_use_ssh.text = Usar autenticação por SSH
+mirror_use_ssh.not_available = Autenticação por SSH não está disponível.
+settings.push_mirror_sync_in_progress = Fazendo push das mudanças para o remoto %s nesse momento.
+settings.federation_apapiurl = URL de federação deste repositório. Copie e cole isso nas Configurações de Federação de outro repositório como uma URL de um Repositório Seguidor.
+pulls.agit_explanation = Criado usando o fluxo de trabalho AGit. AGit permite que contribuidores proponham mudanças usando "git push" sem criar um fork ou novo branch.
+signing.wont_sign.headsigned = O merge não será assinado pois o commit head não está assinado.
+settings.mirror_settings.push_mirror.copy_public_key = Copiar chave pública
+settings.pull_mirror_sync_in_progress = Fazendo pull das mudanças do remoto %s nesse momento.
+pulls.reopen_failed.head_branch = O pull request não pode ser reaberto porque o branch head não existe mais.
+pulls.cmd_instruction_checkout_desc = Do repositório do seu projeto, faça checkout de um novo branch e teste as alterações.
+settings.mirror_settings.docs.pulling_remote_title = Fazendo pull de um repositório remoto
+settings.mirror_settings.pushed_repository = Repositório enviado
+settings.mirror_settings.docs.disabled_pull_mirror.instructions = Configure seu projeto para automaticamente fazer push de commits, tags e branches para outro repositório. Espelhos de pull foram desativados pelo administrador do seu site.
+settings.mirror_settings.docs.disabled_push_mirror.instructions = Configure seu projeto para automaticamente fazer pull de commits, tags e branches de outro repositório.
+settings.mirror_settings.docs.doc_link_pull_section = a seção "Fazendo pull de um repositório remoto" da documentação.
+subscribe.pull.guest.tooltip = Entre para receber notificações deste pull request.
+settings.pull_mirror_sync_quota_exceeded = Cota excedida, não será feito pull das mudanças.
+settings.mirror_settings.docs.more_information_if_disabled = Saiba mais sobre espelhos de push e pull aqui:
+settings.transfer_quota_exceeded = O novo dono (%s) excedeu a cota. O repositório não foi transferido.
+pulls.reopen_failed.base_branch = O pull request não pode ser reaberto porque o branch base não existe mais.
+activity.commit = Atividade de commits
+pulls.cmd_instruction_merge_warning = Atenção: A opção "Autodetectar merge manual" não está habilitada para este repositório, você terá que marcar este pull request como um merge manual depois.
+settings.federation_following_repos = URLs de Repositórios Seguidores. Separado por ";", sem espaços.
+settings.mirror_settings.docs.disabled_push_mirror.info = Espelhos de pull foram desativados pelo administrador do seu site.
+settings.mirror_settings.push_mirror.none_ssh = Nenhum
+settings.protect_status_check_patterns_desc = Insira padrões para especificar quais verificações de status devem passar com sucesso antes que merges possam ser feitos em branches aos quais esta regra se aplica. Cada linha especifica um padrão. Padrões não podem estar vazios.
+settings.archive.text = Arquivar o repositório irá torná-lo totalmente "somente leitura". Ele ficará oculto do painel. Ninguém (nem mesmo você!) poderá fazer novos commits, ou abrir quaisquer issues ou pull requests.
+settings.add_key_success = A chave de deploy "%s" foi adicionada.
+settings.protect_invalid_status_check_pattern = Padrão de verificação de status inválido: "%s".
+settings.web_hook_name_sourcehut_builds = Builds do SourceHut
+settings.protect_new_rule = Criar uma nova regra de proteção de branch
+settings.wiki_rename_branch_main_notices_2 = Isso irá renomear permanentemente o branch interno da wiki do repositório %s. Checkouts existentes precisarão ser atualizados.
+settings.protect_enable_merge_desc = Qualquer pessoa com permissão de escrita terá autorização para fazer merge dos pull requests neste ramo.
+settings.protect_no_valid_status_check_patterns = Não há padrões de verificação de status válidos.
+settings.event_pull_request_approvals = Aprovações de pull request
+settings.event_pull_request_enforcement = Aplicação
+settings.ignore_stale_approvals = Ignorar aprovações inativas
+settings.update_settings_no_unit = O repositório deve permitir pelo menos algum tipo de interação.
+settings.protect_branch_name_pattern_desc = Padrões de nome de branch protegidos. Ver sintaxe de padrões na documentação. Exemplos: main, release/**
+settings.webhook.replay.description_disabled = Para executar novamente este webhook, ative-o.
+settings.sourcehut_builds.manifest_path = Caminho do manifest de build
+settings.sourcehut_builds.secrets_helper = Dar a este job acesso aos segredos de build (requer a permissão SECRETS:RO)
+settings.sourcehut_builds.access_token_helper = Token de acesso tem a permissão JOBS:RW. Gere um token builds.sr.ht ou um token builds.sr.ht com acesso a segredos em meta.sr.ht.
+settings.matrix.room_id_helper = O ID da sala pode ser obtido do cliente web Element > Configurações da Sala > Avançado > ID interno da sala. Exemplo: %s.
+settings.unarchive.error = Ocorreu um erro ao tentar desarquivar o repositório. Veja o log para mais detalhes.
+settings.event_pull_request_review_request = Revisão de pull request solicitada
+settings.event_pull_request_review_request_desc = Revisão de pull request solicitada ou pedido de revisão removido.
+settings.event_pull_request_merge = Merge de pull request
+settings.matrix.access_token_helper = É recomendado configurar uma conta Matrix dedicada para isso. O token de acesso pode ser obtido do cliente web Element (em uma aba privada/anônima) > Menu do usuário (acima à esquerda) > Todas as configurações > Ajuda & Sobre > Avançado > Token de acesso (logo abaixo da URL do servidor). Feche a aba privada/anônima (sair da conta irá invalidar o token).
+settings.tags.protection.pattern.description = Você pode usar um único nome, um padrão glob ou uma expressão regular para corresponder a várias tags. Saiba mais no guia de tags protegidas.
+settings.add_webhook.invalid_path = O caminho não deve conter partes que sejam "." ou ".." ou uma string vazia. Ele não pode começar ou terminar com uma barra.
+settings.sourcehut_builds.visibility = Visibilidade do job
+settings.unarchive.text = Desarquivar o repositório irá restaurar a possibilidade de receber commits e push, bem como novos issues e pull requests.
+settings.ignore_stale_approvals_desc = Não contar aprovações feitas em commits mais antigos (revisões inativas) no número de aprovações de pedidos de merge. Não tem efeito se as revisões inativas já são desconsideradas.
+settings.protect_status_check_patterns = Padrões de verificação de status
+error.broken_git_hook = Os hooks Git desse repositório parecem estar quebrados. Por favor, siga a documentação para corrigi-los e então faça push de alguns commits para atualizar o status.
+release.type_attachment = Anexo
+release.type_external_asset = Recurso Externo
+release.asset_name = Nome do Recurso
+release.asset_external_url = URL Externa
+release.hide_archive_links_helper = Esconder automaticamente arquivos de código fonte gerados para esse release. Por exemplo, se você estiver enviando os seus manualmente.
+branch.delete_desc = Apagar um branch é permanente. Ainda que o branch apagado possa continuar a existir por um breve período antes de ser realmente apagado, isso NÃO PODE ser desfeito na maioria dos casos. Continuar?
+release.add_external_asset = Adicionar Recurso Externo
+release.invalid_external_url = URL Externa Inválida: "%s"
+release.deletion_desc = Eliminar um release apenas o remove do Forgejo. Isso não irá afetar a tag no Git, o conteúdo do seu repositório ou o histórico. Continuar?
 
 [graphs]
 
@@ -3390,6 +3481,33 @@ dashboard.sync_branch.started = Sincronização de ramos iniciada
 dashboard.sync_repo_branches = Sincronizar ramos perdidos do Git para o banco de dados
 packages.cleanup.success = Os dados expirados foram limpos com sucesso
 monitor.queue.activeworkers = Processos ativos
+systemhooks.desc = Os webhooks fazem automaticamente solicitações HTTP POST para um servidor quando certos eventos Forgejo são acionados. Os webhooks definidos aqui atuarão em todos os repositórios do sistema, então, considere quaisquer implicações de desempenho que isso possa ter. Leia mais no guia de webhooks.
+defaulthooks.desc = Os webhooks fazem automaticamente solicitações HTTP POST para um servidor quando certos eventos Forgejo são acionados. Os webhooks definidos aqui são padrões e serão copiados para todos os novos repositórios. Leia mais no guia de webhooks.
+self_check.database_fix_mysql = Para usuários do MySQL/MariaDB, você pode usar o comando "gitea doctor convert" para corrigir os problemas de ordenamento, ou também pode corrigir o problema usando "ALTER ... COLLATE ..." SQLs manualmente.
+monitor.queue.settings.desc = Os pools crescem dinamicamente em resposta ao bloqueio da fila de trabalhadores.
+config.cache_test_succeeded = Teste de cache bem-sucedido, obteve uma resposta em %s.
+self_check.database_inconsistent_collation_columns = O banco de dados está usando o ordenamento %s, mas essas colunas estão usando ordenamentos incompatíveis. Isso pode causar alguns problemas inesperados.
+dashboard.rebuild_issue_indexer = Reconstruir indexador de problemas
+monitor.queue.review_add = Revisar / adicionar trabalhadores
+assets = Ativos de código
+config.open_with_editor_app_help = Os editores "Abrir com" para o menu clone. Se deixado em branco, o padrão será usado. Expanda para ver o padrão.
+config.cache_test_slow = Teste de cache bem-sucedido, mas a resposta é lenta: %s.
+config.cache_test = Cache de Teste
+config.cache_test_failed = Falha ao sondar o cache: %v.
+self_check.database_collation_mismatch = Esperar que o banco de dados use o ordenamento: %s
+dashboard.cleanup_actions = Limpar logs expirados e artefatos de ações
+emails.delete = Deletar email
+emails.delete_primary_email_error = Você não pode excluir o email principal.
+emails.deletion_success = O endereço de email foi excluído.
+emails.delete_desc = Tem certeza de que deseja excluir este endereço de e-mail?
+dashboard.cron.cancelled = Cron: %[1]s cancelado: %[3]s
+users.activated.description = Conclusão da verificação de e-mail. O proprietário de uma conta não ativada não poderá efetuar login até que a verificação de e-mail seja concluída.
+users.block.description = Bloquear este usuário de interagir com este serviço através de sua conta e proibir o login.
+users.admin.description = Conceda a este usuário acesso total a todos os recursos administrativos disponíveis por meio da interface do usuário da Web e da API.
+users.restricted.description = Permitir interação somente com os repositórios e organizações onde este usuário é adicionado como colaborador. Isso impede o acesso a repositórios públicos nesta instância.
+users.organization_creation.description = Permitir a criação de novas organizações.
+users.local_import.description = Permitir importar repositórios do sistema de arquivos local do servidor. Isso pode ser um problema de segurança.
+self_check.database_collation_case_insensitive = O banco de dados está usando um ordenamento %s, que é um ordenamento insensível. Embora o Forgejo possa funcionar com ele, pode haver alguns casos raros que não funcionam como esperado.
 
 
 [action]
@@ -3631,6 +3749,27 @@ rpm.repository = Informações do repositório
 rpm.repository.multiple_groups = Este pacote está disponível em vários grupos.
 npm.dependencies.bundle = Dependências empacotadas
 registry.documentation = Para mais informações sobre o registro %s, veja a documentação.
+arch.version.replaces = Substitui
+arch.version.conflicts = Conflitos
+arch.version.properties = Propriedades de Versão
+arch.version.description = Descrição
+arch.version.groups = Grupo
+arch.version.provides = Fornece
+arch.version.depends = Depende
+arch.version.optdepends = Depende opcionalmente
+arch.pacman.repo.multi.item = Configuração para %s
+arch.pacman.sync = Sincronizar pacote com o pacman:
+arch.pacman.repo.multi = %s possui a mesma versão em distribuições diferentes.
+arch.pacman.helper.gpg = Adicionar certificado de confiança para o pacman:
+arch.version.backup = Cópia de Segurança
+owner.settings.cleanuprules.none = Não há regras de limpeza ainda.
+owner.settings.cargo.rebuild.description = Reconstruir pode ser útil se o índice não estiver sincronizado com os pacotes do Cargo armazenados.
+owner.settings.cargo.rebuild.no_index = Não foi possível reconstruir, não há um índice inicializado.
+arch.pacman.conf = Adicione o servidor com a distribuição e arquitetura no arquivo /etc/pacman.conf :
+arch.version.makedepends = Dependências do make
+arch.version.checkdepends = Verificar dependências
+owner.settings.cargo.initialize.description = É necessário um repositório Git especial de índice para usar o registro Cargo. Usar esta opção irá (re-)criar o repositório e configurá-lo automaticamente.
+owner.settings.chef.keypair.description = É necessário um par de chaves para autenticar no registro Chef. Se você já gerou um par de chaves, gere um novo par e descarte o antigo.
 
 [secrets]
 secrets=Segredos
@@ -3728,12 +3867,33 @@ runs.no_workflows.documentation = Para mais informações sobre Forgejo Actions,
 runs.no_workflows.quick_start = Forgejo Actions é uma novidade para você? Veja o guia rápido.
 runs.no_results = Nenhum resultado.
 variables.description = As variáveis serão passadas para certas ações e não poderão ser lidas de outra forma.
+workflow.dispatch.trigger_found = Este workflow tem um disparador de evento workflow_dispatch.
+workflow.dispatch.run = Executar workflow
+runs.no_runs = O workflow ainda não foi executado.
+workflow.dispatch.warn_input_limit = Exibindo apenas as %d primeiras entradas.
+runs.no_matching_online_runner_helper = Nenhum runner online encontrado com o rótulo: %s
+workflow.disabled = Workflow está desativado.
+workflow.dispatch.use_from = Usar workflow de
+runs.no_job = O workflow precisa conter pelo menos um trabalho
+workflow.disable_success = Workflow "%s" desativado com sucesso.
+workflow.enable = Ativar workflow
+workflow.disable = Desabilitar workflow
+runs.no_workflows = Não há workflows ainda.
+runs.no_job_without_needs = O workflow deve conter pelo menos um trabalho sem dependências.
+runs.workflow = Workflow
+workflow.enable_success = Workflow "%s" ativado com sucesso.
+workflow.dispatch.success = Execução do workflow solicitada com sucesso.
+workflow.dispatch.input_required = Exigir um valor para a entrada "%s".
+workflow.dispatch.invalid_input_type = Tipo de entrada "%s" inválido.
+variables.deletion.description = Apagar uma variável é permanente e não pode ser desfeito. Continuar?
+runs.expire_log_message = Os logs foram apagados pois eram antigos demais.
 
 
 [projects]
 type-1.display_name=Projeto individual
 type-2.display_name=Projeto do repositório
 type-3.display_name=Projeto da organização
+deleted.display_name = Projeto Apagado
 
 [git.filemode]
 ; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", …
@@ -3778,6 +3938,14 @@ commit_kind = Buscar commits…
 runner_kind = Pesquisar runners...
 code_search_unavailable = A pesquisa de código não está disponível no momento. Entre em contato com o administrador do site.
 milestone_kind = Pesquisar marcos...
+union_tooltip = Incluir resultados que coincidam com quaisquer palavras-chave separadas por espaços em branco
+union = União
+exact = Exato
+exact_tooltip = Incluir apenas resultados que correspondam exatamente ao termo de pesquisa
+issue_kind = Pesquisar problemas...
+pull_kind = Pesquisar pulls...
+regexp_tooltip = Interpretar o termo de busca como uma expressão regular
+regexp = RegExp
 
 [munits.data]
 b = B
@@ -3791,4 +3959,27 @@ eib = EiB
 [markup]
 filepreview.line = Linha %[1]d em %[2]s
 filepreview.lines = Linhas %[1]d a %[2]d em %[3]s
-filepreview.truncated = Pré-visualização truncada
\ No newline at end of file
+filepreview.truncated = Pré-visualização truncada
+
+[repo.permissions]
+pulls.write = Escrita: Encerrar pull requests e gerir metadados como rótulos, marcos, responsáveis, prazos e dependências.
+code.read = Leitura: Acessar e clonar o código do repositório.
+issues.read = Leitura: Visualizar e criar issues e comentários.
+code.write = Escrita: Fazer push para o repositório, criar branches e tags.
+issues.write = Escrita: Encerrar issues e gerir metadados como rótulos, marcos, responsáveis, prazos e dependências.
+pulls.read = Leitura: Visualizar e criar pull requests.
+releases.read = Leitura: Visualizar e baixar releases.
+releases.write = Escrita: Publicar editar e apagar releases e seus recursos.
+wiki.read = Leitura: Ler a wiki integrada e o histórico dela.
+wiki.write = Escrita: Criar, alterar e apagar páginas na wiki integrada.
+projects.read = Ler: Acesse os painéis de projetos do repositório.
+ext_wiki = Acesse o link para um wiki externo. As permissões são gerenciadas externamente.
+actions.write = Escrever: Acione, reinicie, cancele ou aprove manualmente pipelines de CI/CD pendentes.
+projects.write = Escrever: Crie projetos e colunas e edite-os.
+actions.read = Ler: Visualize pipelines de CI/CD integrados e seus logs.
+packages.read = Ler: Visualize e baixe pacotes atribuídos ao repositório.
+packages.write = Escrever: Publique e delete pacotes atribuídos ao repositório.
+ext_issues = Acesse o link para um issue tracker externo. As permissões são gerenciadas externamente.
+
+[translation_meta]
+test = To preserve its claws, the giant anteater walks on its front knuckles, like gorillas
\ No newline at end of file
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
index ae912f3ffb..59dcd6bffd 100644
--- a/options/locale/locale_pt-PT.ini
+++ b/options/locale/locale_pt-PT.ini
@@ -3938,6 +3938,8 @@ pull_kind = Procurar pedidos de integração...
 union = Palavras-chave
 union_tooltip = Incluir resultados correspondentes a qualquer das palavras-chave separadas por espaços em branco
 milestone_kind = Procurar etapas...
+regexp_tooltip = Interpreta o termo de pesquisa como um expressão regular
+regexp = ExpReg
 
 [munits.data]
 kib = KiB
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
index 450118fed4..c84ee554af 100644
--- a/options/locale/locale_ru-RU.ini
+++ b/options/locale/locale_ru-RU.ini
@@ -387,8 +387,8 @@ user_no_results=Подходящие пользователи не найден
 org_no_results=Подходящие организации не найдены.
 code_no_results=Соответствующий поисковому запросу исходный код не найден.
 code_search_results=Результаты поиска «%s»
-code_last_indexed_at=Последний проиндексированный %s
-relevant_repositories_tooltip=Репозитории, являющиеся ответвлениями или не имеющие ни темы, ни значка, ни описания, скрыты.
+code_last_indexed_at=Последняя индексация %s
+relevant_repositories_tooltip=Скрыты ответвления и репозитории, не имеющие ни темы, ни значка, ни описания.
 relevant_repositories=Показаны только релевантные репозитории, показать результаты без фильтрации.
 forks_one = %d ответвление
 forks_few = %d ответвлений
@@ -411,7 +411,7 @@ sign_up_successful=Учётная запись успешно создана. Д
 confirmation_mail_sent_prompt=Новое письмо для подтверждения было отправлено на %s. Для завершения регистрации, пожалуйста, перейдите по ссылке внутри в течение %s. Если был введён неправильный адрес, вы можете войти и изменить его.
 must_change_password=Обновите пароль
 allow_password_change=Требовать смену пароля пользователем (рекомендуется)
-reset_password_mail_sent_prompt=Письмо для подтверждения было отправлено на %s. Чтобы выполнить восстановление учётной записи, перейдите по ссылке внутри в течение %s.
+reset_password_mail_sent_prompt=Письмо для подтверждения было отправлено на %s. Чтобы завершить процесс восстановления учётной записи, перейдите по указанной в нём ссылке в течение %s.
 active_your_account=Активация учётной записи
 account_activated=Учётная запись активирована
 prohibit_login=Учётная запись приостановлена
@@ -476,6 +476,7 @@ sign_up_button = Зарегистрироваться.
 back_to_sign_in = Назад ко входу
 sign_in_openid = Продолжить с OpenID
 hint_login = Уже есть учётная запись? Войдите!
+unauthorized_credentials = Учётные данные неверны или истекли. Попробуйте повторить команду или ознакомьтесь с подробностями по ссылке: %s
 
 [mail]
 view_it_on=Посмотреть на %s
@@ -514,10 +515,10 @@ issue.action.push_n=@%[1]s отправил(а) %[3]d изменений
 issue.action.close=@%[1]s закрыл(а) #%[2]d.
 issue.action.reopen=@%[1]s переоткрыл(а) #%[2]d.
 issue.action.merge=@%[1]s слил(а) #%[2]d в %[3]s.
-issue.action.approve=@%[1]s одобрил(а) этот запрос на слияние.
+issue.action.approve=@%[1]s слияние одобрено.
 issue.action.reject=@%[1]s запросил(а) изменения в этом запросе на слияние.
 issue.action.review=@%[1]s прокомментировал(а) этот запрос на слияние.
-issue.action.review_dismissed=@%[1]s отклонил(а) последний отзыв с %[2]s для этого запроса на слияние.
+issue.action.review_dismissed=@%[1]s отклонена последняя рецензия с %[2]s для этого запроса на слияние.
 issue.action.ready_for_review=@%[1]s отметил(а) этот запрос на слияние как готовый к рассмотрению.
 issue.action.new=@%[1]s создал(а) #%[2]d.
 issue.in_tree_path=В %s:
@@ -1337,8 +1338,8 @@ editor.fail_to_apply_patch=Невозможно применить патч «%s
 editor.new_patch=Новая правка
 editor.commit_message_desc=Добавьте необязательное расширенное описание…
 editor.signoff_desc=Добавить трейлер Signed-off-by с автором коммита в конце сообщения коммита.
-editor.commit_directly_to_this_branch=Сделайте коммит напрямую в ветвь %s.
-editor.create_new_branch=Создайте новую ветвь для этого коммита, и сделайте запрос на слияние.
+editor.commit_directly_to_this_branch=Сохранить коммит напрямую в ветвь %s.
+editor.create_new_branch=Сохранить коммит в новую ветвь и начать запрос на слияние.
 editor.create_new_branch_np=Создать новую ветвь для этого коммита.
 editor.propose_file_change=Предложить изменение файла
 editor.new_branch_name=Укажите название новой ветви для этого коммита
@@ -1614,9 +1615,9 @@ issues.role.first_time_contributor_helper=Это первое участие п
 issues.role.contributor=Соавтор
 issues.re_request_review=Повторить запрос на отзыв
 issues.is_stale=Со времени этого обзора в этот PR были внесены некоторые изменения
-issues.remove_request_review=Удалить запрос на отзыв
-issues.remove_request_review_block=Невозможно удалить запрос на отзыв
-issues.dismiss_review=Отклонить отзыв
+issues.remove_request_review=Отменить запрос рецензии
+issues.remove_request_review_block=Не удалось отменить запрос рецензии
+issues.dismiss_review=Отклонить рецензию
 issues.dismiss_review_warning=Вы уверены, что хотите отклонить эту рецензию?
 issues.sign_in_require_desc=Войдите, чтобы присоединиться к обсуждению.
 issues.edit=Изменить
@@ -1747,17 +1748,17 @@ issues.dependency.add_error_cannot_create_circular=Вы не можете соз
 issues.dependency.add_error_dep_not_same_repo=Обе задачи должны находиться в одном репозитории.
 issues.review.self.approval=Вы не можете одобрить собственный запрос на слияние.
 issues.review.self.rejection=Невозможно запрашивать изменения своего запроса на слияние.
-issues.review.approve=одобрил(а) эти изменения %s
-issues.review.comment=рассмотрел(а) изменения %s
-issues.review.dismissed=отклонил(а) отзыв %s %s
+issues.review.approve=изменения одобрены %s
+issues.review.comment=оставлена рецензия %s
+issues.review.dismissed=отклонена рецензия %s %s
 issues.review.dismissed_label=Отклонено
 issues.review.left_comment=оставил комментарий
 issues.review.content.empty=Запрашивая изменения, вы обязаны оставить комментарий с пояснением своих пожеланий относительно запроса на слияние.
-issues.review.reject=запросил(а) изменения %s
+issues.review.reject=запрошены изменения %s
 issues.review.wait=был запрошен для отзыва %s
-issues.review.add_review_request=запросил(а) отзыв от %s %s
-issues.review.remove_review_request=удалил(а )заявку на отзыв для %s %s
-issues.review.remove_review_request_self=отказался добавлять отзыв %s
+issues.review.add_review_request=запрошена рецензия у %s %s
+issues.review.remove_review_request=отменён запрос рецензии для %s %s
+issues.review.remove_review_request_self=отказ от рецензирования %s
 issues.review.pending=Ожидание
 issues.review.pending.tooltip=Этот комментарий в настоящее время не виден другим пользователям. Чтобы отправить отложенные комментарии, выберите «%s» → «%s/%s/%s» в верхней части страницы.
 issues.review.review=Рецензия
@@ -1822,7 +1823,7 @@ pulls.tab_conversation=Обсуждение
 pulls.tab_commits=Коммиты
 pulls.tab_files=Изменённые файлы
 pulls.reopen_to_merge=Пожалуйста, переоткройте этот запрос на слияние для выполнения слияния.
-pulls.cant_reopen_deleted_branch=Этот запрос на слияние не может быть открыт заново, потому что ветвь была удалена.
+pulls.cant_reopen_deleted_branch=Этот запрос на слияние не может быть открыт повторно, потому что ветвь была удалена.
 pulls.merged=Слито
 pulls.merged_success=Запрос на слияние удовлетворён и закрыт
 pulls.closed=Запрос на слияние закрыт
@@ -1896,7 +1897,7 @@ pulls.update_branch_rebase=Обновить ветвь перебазирова
 pulls.update_branch_success=Ветвь успешно обновлена
 pulls.update_not_allowed=Недостаточно прав для обновления ветви
 pulls.outdated_with_base_branch=Эта ветвь отстает от базовой ветви
-pulls.close=Закрыть запрос на слияние
+pulls.close=Закрыть запрос слияния
 pulls.closed_at=`закрыл этот запрос на слияние %[2]s`
 pulls.reopened_at=`переоткрыл этот запрос на слияние %[2]s`
 pulls.cmd_instruction_hint=Показать инструкции для командной строки
@@ -1918,7 +1919,7 @@ pulls.auto_merge_newly_scheduled_comment=`запланировал этот за
 pulls.auto_merge_canceled_schedule_comment=`отменил автоматическое слияние этого запроса после прохождения всех проверок %[1]s`
 
 pulls.delete.title=Удалить этот запрос на слияние?
-pulls.delete.text=Вы точно хотите удалить этот запрос на слияние? (Это навсегда удалит всё его содержимое. Возможно, лучше закрыть его в архивных целях)
+pulls.delete.text=Вы точно хотите удалить этот запрос на слияние? (Это навсегда удалит всё его содержимое. Возможно, будет лучше закрыть его в архивных целях)
 
 
 pull.deleted_branch=(удалена):%s
@@ -2149,7 +2150,7 @@ settings.packages_desc=Включить реестр пакетов
 settings.projects_desc=Включить проекты
 settings.actions_desc=Включить интеграцию конвейеров CI/CD с Forgejo Actions
 settings.admin_settings=Настройки администратора
-settings.admin_enable_health_check=Проверять целостность данных в этом репозитории (git fsck)
+settings.admin_enable_health_check=Выполнять проверки целостности данных (git fsck)
 settings.admin_code_indexer=Индексатор кода
 settings.admin_stats_indexer=Индексатор статистики кода
 settings.admin_indexer_commit_sha=Последний индексированный коммит
@@ -2239,7 +2240,7 @@ settings.hooks_desc=Веб-хуки позволяют внешним служб
 settings.webhook_deletion=Удаление веб-хука
 settings.webhook_deletion_desc=Удаление этого веб-хука приведет к удалению всей связанной с ним информации, включая историю. Хотите продолжить?
 settings.webhook_deletion_success=Веб-хук был удалён.
-settings.webhook.test_delivery=Проверить доставку
+settings.webhook.test_delivery=Проверить отправку
 settings.webhook.test_delivery_desc=Отправить тестовое событие для тестирования настройки веб-хука.
 settings.webhook.request=Запрос
 settings.webhook.response=Ответ
@@ -2253,7 +2254,7 @@ settings.githook_edit_desc=Если хук не активен, будет по
 settings.githook_name=Название хукa
 settings.githook_content=Содержимое хука
 settings.update_githook=Обновить хук
-settings.add_webhook_desc=Forgejo будет оправлять POST-запросы на указанный URL адрес с указанным заголовком «Content-Type». Подробности в инструкции по использованию веб-хуков.
+settings.add_webhook_desc=Forgejo будет оправлять POST-запросы на указанный URL обработчика с указанным заголовком «Content-Type». Подробности доступны в инструкции по использованию веб-хуков.
 settings.payload_url=URL обработчика
 settings.http_method=HTTP-метод
 settings.content_type=Тип содержимого POST
@@ -2264,10 +2265,10 @@ settings.slack_color=Цвет
 settings.discord_username=Имя пользователя
 settings.discord_icon_url=URL иконки
 settings.event_desc=Срабатывать на:
-settings.event_push_only=События отправки
+settings.event_push_only=События отправки (push)
 settings.event_send_everything=Все события
-settings.event_choose=Другие события…
-settings.event_header_repository=События репозитория
+settings.event_choose=Выбранные события…
+settings.event_header_repository=События репозиториев
 settings.event_create=Создание
 settings.event_create_desc=Создание ветвей и тегов.
 settings.event_delete=Удаление
@@ -2308,8 +2309,8 @@ settings.event_pull_request_review=Запрос на слияние рассмо
 settings.event_pull_request_review_desc=Запрос на слияние утвержден, отклонён или оставлен комментарий.
 settings.event_pull_request_sync=Запрос на слияние синхронизирован
 settings.event_pull_request_sync_desc=Запрос на слияние синхронизирован.
-settings.event_pull_request_review_request=Запрошена рецензия для запроса на слияние
-settings.event_pull_request_review_request_desc=Создан или удалён запрос на рецензию для запроса на слияние.
+settings.event_pull_request_review_request=Запросы рецензий
+settings.event_pull_request_review_request_desc=Создание и отмена запросов рецензий в запросах слияний.
 settings.event_pull_request_approvals=Одобрения запросов слияний
 settings.event_pull_request_merge=Слияние запроса на слияние
 settings.event_package=Пакеты
@@ -2318,15 +2319,15 @@ settings.branch_filter=Фильтр ветвей
 settings.branch_filter_desc=Белый список ветвей для событий Push, создания ветвей и удаления ветвей, указанных в виде глоб-шаблона. Если пустой или *, то все событий для всех ветвей будут зарегистрированы. Перейдите по ссылке %[2]s на документацию по синтаксису. Примеры: master, {master,release*}.
 settings.authorization_header=Заголовок авторизации
 settings.authorization_header_desc=Будет включён в качестве заголовка авторизации для запросов. Примеры: %s.
-settings.active=Активный
+settings.active=Активен
 settings.active_helper=Информация о происходящих событиях будет отправляться на URL этого веб-хука.
 settings.add_hook_success=Веб-хук добавлен.
 settings.update_webhook=Обновить веб-хук
 settings.update_hook_success=Веб-хук обновлён.
 settings.delete_webhook=Удалить веб-хук
-settings.recent_deliveries=Недавние рассылки
-settings.hook_type=Тип хука
-settings.slack_token=Slack токен
+settings.recent_deliveries=Недавние отправки
+settings.hook_type=Тип веб-хука
+settings.slack_token=Токен
 settings.slack_domain=Домен
 settings.slack_channel=Канал
 settings.add_web_hook_desc=Интегрируйте %s с этим репозиторием .
@@ -2721,7 +2722,7 @@ settings.units.add_more = Доб. больше...
 pulls.fast_forward_only_merge_pull_request = Только fast-forward
 settings.units.overview = Обзор
 settings.units.units = Разделы репозитория
-pulls.reopen_failed.head_branch = Этот запрос на слияние не может быть открыт заново, потому что головная ветвь больше не существует.
+pulls.reopen_failed.head_branch = Этот запрос на слияние не может быть открыт повторно, так как исходная ветвь больше не существует.
 pulls.reopen_failed.base_branch = Этот запрос на слияние не может быть открыт заново, потому что базовая ветвь больше не существует.
 settings.ignore_stale_approvals = Игнорировать устаревшие одобрения
 contributors.contribution_type.commits = Коммиты
@@ -2825,6 +2826,9 @@ mirror_use_ssh.helper = Forgejo будет синхронизировать из
 mirror_denied_combination = Невозможно одновременно использовать аутентификацию по SSH и по паролю.
 settings.mirror_settings.push_mirror.none_ssh = Нет
 settings.mirror_settings.push_mirror.copy_public_key = Копировать публичный ключ
+issues.new.assign_to_me = Назначить себе
+issues.all_title = Все
+settings.discord_icon_url.exceeds_max_length = URL иконки не может быть длиннее 2048 символов
 
 [graphs]
 
@@ -2845,9 +2849,9 @@ org_desc=Описание
 team_name=Название команды
 team_desc=Описание
 team_name_helper=Названия команд должны быть короткими и запоминающимися.
-team_desc_helper=Опишите назначение или роль команды.
-team_access_desc=Доступ к репозиторию
-team_permission_desc=Разрешение
+team_desc_helper=Назначение или роль этой команды.
+team_access_desc=Доступ к репозиториям
+team_permission_desc=Разрешения
 team_unit_desc=Разрешить доступ к разделам репозитория
 team_unit_disabled=(Отключено)
 
@@ -3142,7 +3146,7 @@ repos.lfs_size=Размер LFS
 
 packages.package_manage_panel=Управление пакетами
 packages.total_size=Общий размер: %s
-packages.unreferenced_size=Размер по ссылке: %s
+packages.unreferenced_size=Неуказанный размер: %s
 packages.cleanup=Очистить устаревшие данные
 packages.cleanup.success=Очистка устаревших данных успешно завершена
 packages.owner=Владелец
@@ -3446,7 +3450,7 @@ monitor.queue.activeworkers=Активные обработчики
 monitor.queue.maxnumberworkers=Макс. количество обработчиков
 monitor.queue.numberinqueue=Позиция в очереди
 monitor.queue.settings.title=Настройки пула
-monitor.queue.settings.desc=Пулы увеличиваются динамически в ответ на блокировку очередей своих обработчиков.
+monitor.queue.settings.desc=Пулы динамически растут в зависимости от блокировки очередей их рабочих.
 monitor.queue.settings.maxnumberworkers=Макс. количество обработчиков
 monitor.queue.settings.maxnumberworkers.placeholder=В настоящий момент %[1]d
 monitor.queue.settings.maxnumberworkers.error=Максимальное количество обработчиков должно быть числом
@@ -3526,17 +3530,17 @@ comment_issue=`оставлен комментарий под задачей %[3]s#%[2]s`
 merge_pull_request=`принят запрос на слияние %[3]s#%[2]s`
 auto_merge_pull_request=`автоматически принят запрос на слияние %[3]s#%[2]s`
-transfer_repo=передан репозиторий %s %s
-push_tag=создан тег %[3]s в %[4]s
-delete_tag=удалён тэг %[2]s из %[3]s
-delete_branch=удалена ветвь %[2]s из %[3]s
+transfer_repo=репозиторий %s был передан: %s
+push_tag=отправлен тег %[3]s в %[4]s
+delete_tag=удалён тег %[2]s в %[3]s
+delete_branch=удалена ветвь %[2]s в %[3]s
 compare_branch=Сравнить
 compare_commits=Сравнить %d коммитов
 compare_commits_general=Сравнить коммиты
 mirror_sync_push=синхронизировал(а) коммиты %[3]s в %[4]s из зеркала
 mirror_sync_create=синхронизировал(а) новую ссылку %[3]s в %[4]s из зеркала
 mirror_sync_delete=синхронизированные и удалённые ссылки %[2]s на %[3]s из зеркала
-approve_pull_request=`одобрен %[3]s#%[2]s`
+approve_pull_request=`одобрен запрос слияния %[3]s#%[2]s`
 reject_pull_request=`предложил(а) изменения для %[3]s#%[2]s`
 publish_release=`выпуск %[4]s опубликован в %[3]s`
 review_dismissed=`отклонён отзыв от %[4]s для %[3]s#%[2]s`
@@ -3758,7 +3762,7 @@ owner.settings.cleanuprules.success.delete=Правило очистки уда
 owner.settings.chef.title=Реестр Chef
 owner.settings.chef.keypair=Создать пару ключей
 owner.settings.cleanuprules.none = Правил очистки пока нет.
-owner.settings.cargo.rebuild.description = Пересборка может быть полезной в случае, если индекс не синхронизирован с сохранёнными пакетами Cargo.
+owner.settings.cargo.rebuild.description = Пересборка может быть полезна в случае, если индекс не синхронизирован с хранящимися пакетами Cargo.
 rpm.repository = О репозитории
 rpm.repository.architectures = Архитектуры
 rpm.repository.multiple_groups = Этот пакет доступен в нескольких группах.
@@ -3800,7 +3804,7 @@ management=Управление секретами
 [actions]
 actions=Действия
 
-unit.desc=Управление встроенными конвейерами CI/CD с Действиями Forgejo
+unit.desc=Управление встроенными конвейерами CI/CD с Действиями Forgejo.
 
 status.unknown=Неизвестно
 status.waiting=Ожидает
@@ -3955,6 +3959,8 @@ pull_kind = Поиск слияний...
 union_tooltip = Включает результаты с совпавшими ключевыми словами, разделёнными пробелами
 union = Обычный
 milestone_kind = Поиск этапов...
+regexp = Регулярное выражение
+regexp_tooltip = Интерпретировать поисковый запрос как регулярное выражение
 
 
 [markup]
@@ -3963,7 +3969,7 @@ filepreview.lines = Строки с %[1]d по %[2]d в %[3]s
 filepreview.truncated = Предпросмотр был обрезан
 
 [translation_meta]
-test = хи-хи!
+test = смайлик :)
 
 [repo.permissions]
 code.write = Запись: отправка изменений в репозиторий, создание веток и тегов.
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
index 70ac146062..80cfaf1184 100644
--- a/options/locale/locale_uk-UA.ini
+++ b/options/locale/locale_uk-UA.ini
@@ -26,8 +26,8 @@ return_to_forgejo=Повернутися до Forgejo
 username=Ім'я кристувача
 email=Адреса електронної пошти
 password=Пароль
-access_token=Токен Доступу
-re_type=Підтвердження пароля
+access_token=Токен доступу
+re_type=Підтвердження паролю
 captcha=CAPTCHA
 twofa=Двофакторна авторизація
 twofa_scratch=Двофакторний одноразовий пароль
@@ -41,11 +41,11 @@ mirror=Дзеркало
 new_repo=Новий репозиторій
 new_migrate=Нова міграція
 new_mirror=Нове дзеркало
-new_fork=Новий репозиторій - копія
+new_fork=Нова розвилка репозиторію
 new_org=Нова організація
 new_project=Новий проєкт
 manage_org=Керування організаціями
-admin_panel=Панель Адміністратора
+admin_panel=Панель адміністрації
 account_settings=Налаштування облікового запису
 settings=Налаштування
 your_profile=Профіль
@@ -136,14 +136,51 @@ webauthn_unsupported_browser = Ваш оглядач наразі не підт
 webauthn_error_insecure = WebAuthn підтримує лише захищені з'єднання. Для тестування через HTTP можете використати origin-рядок «localhost» чи «127.0.0.1»
 webauthn_error_timeout = Ключ не встиг зчитатись протягом відведеного терміну. Будь ласка, перезавантажте сторінку й повторіть спробу.
 locked = Заблоковано
+filter.is_template = Шаблони
+test = Тест
+show_timestamps = Показувати відмітки часу
+filter.clear = Очистити фільтри
+filter.is_archived = Архівовано
+filter = Фільтри
+toggle_menu = Перемкнути видимість меню
+confirm_delete_artifact = Ви впевнені, що хочете видалити цей артефакт "%s"?
+artifacts = Артефакти
+filter.not_archived = Не архівовано
+filter.public = Загальнодоступні
+filter.private = Приватні
+more_items = Більше пунктів
+remove_label_str = Видалити предмет "%s"
+new_repo.title = Новий репозитор
+new_migrate.title = Нова міграція
+new_org.title = Нова організація
+new_repo.link = Новий репозитор
+new_migrate.link = Нова міграція
+new_org.link = Нова організація
+copy_generic = Скопіювати до буферу обміну
+show_log_seconds = Показувати секунди
+show_full_screen = Показувати у повно-екранному режимі
+filter.is_fork = Розвилки
+filter.not_fork = Не розвилки
+filter.is_mirror = Дзеркала
+filter.not_mirror = Не дзеркала
+filter.not_template = Не шаблони
+error413 = Ви вичерпали ваш quota.
+invalid_data = Недійсні дані: %v
 
 [aria]
-footer.software = Про програму
+footer.software = Про застосунок
 footer.links = Посилання
+footer = Нижній колонтитул
+navbar = Панель навігації
 
 [heatmap]
 less = Менше
 more = Більше
+contributions_one = внесок
+number_of_contributions_in_the_last_12_months = %s внесків за останні 12 місяців
+contributions_zero = Нема внесків
+contributions_format = {contributions} за {month} {day}, {year}
+contributions_few = внески
 
 [editor]
 buttons.bold.tooltip = Додати грубий шрифт
@@ -155,19 +192,31 @@ buttons.list.unordered.tooltip = Додати маркований список
 buttons.list.ordered.tooltip = Додати нумерований список
 buttons.list.task.tooltip = Додати список завдань
 buttons.heading.tooltip = Додати заголовок
+buttons.switch_to_legacy.tooltip = Використовувати застарілий редактор замість поточного
+buttons.disable_monospace_font = Вимкнути моноширний шрифт
+buttons.indent.tooltip = Вкласти предмет на один рівень
+buttons.unindent.tooltip = Викласти предмет на один рівень
+buttons.mention.tooltip = Згадати користувача чи команду
+buttons.ref.tooltip = Посилатись на недолік чи на запит на злиття
+buttons.enable_monospace_font = Увімкнути моноширний шрифт
 
 [filter]
+string.asc = А - Я
+string.desc = Я - А
 
 [error]
 occurred=Сталася помилка
 missing_csrf=Некоректний запит: токен CSRF не задано
 network_error=Помилка мережі
+server_internal = Помилка внутрішнього серверу
+report_message = Якщо ви думаєте, що це вада Forgejo, будь-ласка пошукайте її у списку недоліків на Codeberg чи повідомте про новий недолік, якщо необхідно.
+not_found = Ціль не була знайдена.
 
 [startpage]
 app_desc=Зручний власний сервіс хостингу репозиторіїв Git
 install=Легко встановити
 platform=Платформонезалежність
-platform_desc=Forgejo виконується на платформі, для якої можливо скомпілювати Go: Windows, macOS, Linux, ARM, та інших. Оберіть ту, яка вам до вподоби!
+platform_desc=Forgejo підтверджено працює на вільних операційних системах, як от Linux і FreeBSD, так само й на різних архітектурах ЦП. Оберіть, яка вам до вподоби!
 lightweight=Невибагливість
 lightweight_desc=Forgejo має низькі вимоги до ресурсів та може працювати на недорогому Raspberry Pi. Заощадьте енергію свого комп'ютера!
 license=Відкритий вихідний код
@@ -179,11 +228,11 @@ install=Встановлення
 title=Початкова конфігурація
 docker_helper=Якщо ви запускаєте Forgejo всередині Docker, будь ласка уважно прочитайте документацію перед тим, як щось змінити на цій сторінці.
 db_title=Налаштування бази даних
-db_type=Тип бази даних
+db_type=Вид бази даних
 host=Хост
 user=Ім'я кристувача
 password=Пароль
-db_name=Ім'я бази даних
+db_name=Назва бази даних
 db_schema=Схема
 db_schema_helper=Залиште пустим для бази даних за замовчуванням ("публічна").
 ssl_mode=SSL
@@ -205,42 +254,42 @@ err_admin_name_is_invalid=Неправильне ім'я користувача-
 general_title=Загальні налаштування
 app_name=Назва сайту
 app_name_helper=Тут ви можете ввести назву своєї компанії.
-repo_path=Кореневий шлях репозиторія
+repo_path=Коренева тека репозиторію
 repo_path_helper=Всі вилучені Git репозиторії будуть збережені в цей каталог.
-lfs_path=Кореневої шлях Git LFS
+lfs_path=Кореневий шлях Git LFS
 lfs_path_helper=У цій папці будуть зберігатися файли Git LFS. Залиште порожнім, щоб вимкнути LFS.
-run_user=Запуск від імені Користувача
+run_user=Користувач від якого запустити
 domain=Домен сервера
 domain_helper=Домен або адреса хоста сервера.
-ssh_port=Порт SSH сервера
-ssh_port_helper=Номер порту, який використовує SSH сервер. Залиште порожнім, щоб вимкнути SSH.
-http_port=Forgejo HTTP порт
-http_port_helper=Номер порту, який буде прослуховуватися Forgejos веб-сервером.
-app_url=Базова URL-адреса Forgejo
+ssh_port=Порт SSH серверу
+ssh_port_helper=Номер порту, що використовує SSH сервер. Залиште порожнім, аби вимкнути SSH.
+http_port=HTTP порт для прослуховування
+http_port_helper=Номер порту, що буде прослуховуватися Forgejo вебсервером.
+app_url=Базова URL-адреса
 app_url_helper=Базова адреса для HTTP(S) клонування через URL та повідомлень електронної пошти.
-log_root_path=Шлях до лог файлу
+log_root_path=Шлях до файлу журналу
 log_root_path_helper=Файли журналу будуть записані в цей каталог.
 
 optional_title=Додаткові налаштування
-email_title=Налаштування Email
+email_title=Налаштування email
 smtp_addr=SMTP хост
 smtp_port=SMTP порт
-smtp_from=Відправляти Email від імені
+smtp_from=Відправляти email від імені
 smtp_from_helper=Електронна пошта для використання в Gіtea. Введіть звичайну електронну адресу або використовуйте формат: "Ім'я" .
-mailer_user=SMTP Ім'я кристувача
-mailer_password=SMTP Пароль
+mailer_user=SMTP Ім'я користувача
+mailer_password=SMTP пароль
 register_confirm=Потрібно підтвердити електронну пошту для реєстрації
 mail_notify=Увімкнути сповіщення електронною поштою
 server_service_title=Сервер і налаштування зовнішніх служб
 offline_mode=Увімкнути локальний режим
-offline_mode.description=Відключити сторонні мережі доставки контенту і обслуговувати всі ресурси локально.
+offline_mode.description=Відключити постачання контенту зі сторонніх мереж й обслуговувати всі ресурси локально.
 disable_gravatar=Вимкнути Gravatar
 disable_gravatar.description=Відключити Gravatar і сторонні джерела аватарів. Якщо користувач не завантажить аватар локально то за замовчуванням буде використовуватися стандартний аватар.
 federated_avatar_lookup=Увімкнути федеративні аватари
-federated_avatar_lookup.description=Увімкнути зовнішний Аватар за допомогою Libravatar.
+federated_avatar_lookup.description=Увімкнути зовнішні аватари за допомогою Libravatar.
 disable_registration=Вимкнути самостійну реєстрацію
 disable_registration.description=Вимкнути самостійну реєстрацію користувачів, тільки адміністратор може створювати нові облікові записи.
-allow_only_external_registration.description=Дозволити реєстрацію тільки через сторонні сервіси
+allow_only_external_registration.description=Користувачам буде дозволено реєструватись лише через налаштовані сторонні сервіси.
 openid_signin=Увімкнути реєстрацію за допомогою OpenID
 openid_signin.description=Увімкнути вхід за допомогою OpenID.
 openid_signup=Увімкнути самостійну реєстрацію за допомогою OpenID
@@ -275,6 +324,22 @@ default_enable_timetracking.description=Включити відстеження
 no_reply_address=Прихований поштовий домен
 no_reply_address_helper=Доменне ім'я для користувачів із прихованою електронною адресою. Наприклад, ім'я користувача 'joe' буде входити в Git як 'joe@noreply.example.org', якщо для прихованого домену електронної пошти встановлено 'noreply.example.org'.
 password_algorithm=Алгоритм хешування пароля
+config_location_hint = Ці опції налаштувань будуть збережені в:
+env_config_keys = Конфігурація середовища
+env_config_keys_prompt = Наступні змінні середовища будуть також застосовані до вашого файлу конфігурації:
+invalid_db_table = База даних "%s" недійсна: %v
+enable_update_checker = Увімкнути перевірку оновлень
+require_db_desc = Forgejo вимагає MySQL, PostgreSQL, SQLite3 чи TiDB (протокол MySQL).
+allow_only_external_registration = Дозволити реєстрацію тільки через зовнішні сервіси
+require_sign_in_view.description = Обмежити доступ до контенту лише користувачам, що увійшли. Гості зможуть лише відвідувати сторінки автентифікації.
+password_algorithm_helper = Встановити алгоритм хешування паролів. Алгоритми мають різні вимоги та силу. Алгоритм argon2 є досить безпечним, проте споживає багато памʼяті та є недоречним для малих систем.
+app_slogan = Гасло екземпляру
+app_slogan_helper = Уведіть ваше гасло екземпляру тут. Залиште пустим, аби вимкнути.
+run_user_helper = Імʼя користувача операційної системи, від якого запущено Forgejo. Помітьте, що цей користувач повинен мати доступ до корінної теки репозиторія.
+smtp_from_invalid = Адреса з "Відіслати письмо від" не існує
+allow_dots_in_usernames = Дозволити користувачам використовувати крапки у своїх іменах. Не впливає на облікові записи, що вже існують.
+invalid_password_algorithm = Недійсний варіант алгоритму хешування паролів
+enable_update_checker_helper_forgejo = Воно буде періодично перевіряти нові версії Forgejo через перевірку TXT DNS запису на release.forgejo.org.
 
 [home]
 uname_holder=Ім'я користувача або Ел. пошта
@@ -317,7 +382,12 @@ org_no_results=Відповідних організацій не знайден
 code_no_results=Відповідний пошуковому запитанню код не знайдено.
 code_last_indexed_at=Останні індексовані %s
 relevant_repositories = Відображаються лише релевантні репозиторії, переглянути результати без фільтру.
-relevant_repositories_tooltip = Приховано форки, а також сховища без теми, значка й опису.
+relevant_repositories_tooltip = Приховано розвилки, а також сховища без теми, значка й опису.
+go_to = Перейти до
+stars_one = %d зірка
+stars_few = %d зірок
+forks_one = розвилка %d
+forks_few = %d розвилок
 
 [auth]
 create_new_account=Реєстрація облікового запису
@@ -376,6 +446,24 @@ authorize_title=Авторизуйвати "%s" для доступу до ва
 authorization_failed=Помилка авторизації
 sspi_auth_failed=Помилка SSPI-автентифікації
 password_pwned_err=Не вдалося виконати запит до HaveIBeenPwed
+change_unconfirmed_email_summary = Змінити адресу електронної пошти, на яку надходять активаційні листи.
+oauth.signin.error.temporarily_unavailable = Авторизація невдала, через тимчасову не наявність серверу авторизації. Будь-ласка, спробуйте пізніше.
+change_unconfirmed_email = Якщо ви ввели невірну електронну адресу впродовж реєстрації, ви можете змінити її нижче, та підтвердження буде надіслано на нову адресу.
+last_admin = Ви не можете видалити останнього адміністратора. Має бути хоча-б один адміністратор.
+oauth.signin.error.access_denied = Запит на авторизацію було відхилено.
+change_unconfirmed_email_error = Не вдалося змінити електронну адресу: %w
+manual_activation_only = Зв'яжіться з адміністратором сайту, аби завершити активацію.
+prohibit_login_desc = Ваш обліковий запис було відізвано від взаємодії з екземпляром. Звʼяжіться з адміністратором екземпляру, щоб отримати доступ знову.
+invalid_code_forgot_password = Ваш код підтвердження недійсний. Натисніть тут , аби почати нову сесію.
+reset_password_wrong_user = Ви ввійшли як %s, але посилання на відновлення було передбачене для %s
+back_to_sign_in = Назад до входу
+sign_in_openid = Продовжити з OpenID
+openid_signin_desc = Введіть ваше посилання OpenID. Наприклад: alice.openid.example.org, чи https://openid.example.org/alice.
+invalid_password = Ваш пароль не відповідає тому, що був заданий при створенні облікового запису.
+hint_login = Вже маєте обліковий запис? Увійдіть зараз!
+hint_register = Потрібен обліковий запис? Зереєструватись зараз.
+sign_up_button = Зареєструватись зараз.
+sign_up_successful = Обліковий запис успішно створений. Вітаємо!
 
 [mail]
 view_it_on=Переглянути на %s
@@ -435,6 +523,15 @@ repo.transfer.body=Щоб прийняти або відхилити перей
 
 repo.collaborator.added.subject=%s додав вас до %s
 repo.collaborator.added.text=Ви були додані в якості співавтора репозиторію:
+primary_mail_change.subject = Ваша основна пошта була змінена
+totp_disabled.subject = TOTP було відімкнено
+totp_disabled.text_1 = Тимчасовий одноразовий пароль (TOTP) на вашому обліковому записи було відімкнено.
+password_change.subject = Ваш пароль було успішно змінено
+password_change.text_1 = Пароль до вашого облікового запису щойно був змінений.
+reply = чи відповісти напряму з електронної адреси
+admin.new_user.user_info = Інформація користувача
+admin.new_user.text = Будь-ласка, натисніть тут, щоб керувати цим користувачем із панелі адміністрації.
+admin.new_user.subject = Новий користувач %s щойно ввійшов
 
 
 [modal]
@@ -517,6 +614,8 @@ auth_failed=Помилка автентифікації: %v
 
 
 target_branch_not_exist=Цільової гілки не існує.
+still_own_packages = Ваш обліковий запис володіє одним чи більше пакунками, спочатку видаліть їх.
+org_still_own_packages = Організація все ще володіє одним чи більше пакунками, спочатку видаліть їх.
 
 
 [user]
@@ -787,6 +886,16 @@ retype_new_password = Підтвердіть новий пароль
 email_desc = Ваша основна адреса електронної пошти буде використовуватися для сповіщень, відновлення пароля і, за умови, що вона не прихована, для операцій з Git через веб-інтерфейс.
 visibility.limited_tooltip = Видимий(а) тільки для авторизованих користувачів
 visibility.private_tooltip = Видимий(а) тільки для учасників організацій, до яких ви приєдналися
+twofa_scratch_token_regenerated = Ваш одноразовий код відновлення наразі %s. Збережіть його у безпечному місці, бо він не буде показаний знову.
+authorized_oauth2_applications_description = Ви надали доступ до вашого власного облікового запису Forgejo до цих застосунків від третіх лиць. Будь-ласка відкличте доступ із застосунків, що більше не використовуються.
+webauthn_delete_key = Видалити ключ безпеки
+webauthn_key_loss_warning = Якщо ви втратите ключ безпеки, то втратите доступ до вашого облікового запису.
+webauthn_register_key = Додати ключ безпеки
+webauthn_nickname = Псевдонім
+webauthn_desc = Ключі безпеки це апаратні пристрої, що містять криптографічні ключі. Вони можуть використовуватись для двократної автентифікації. Ключі безпеки мають підтримувати стандарт WebAuthn Authenticator.
+revoke_oauth2_grant_success = Доступ відкликано успішно.
+twofa_recovery_tip = Якщо ви втратите ваш пристрій, ви зможете використати одноразовий код відновлення щоб знову отримати доступ до вашого облікового запису.
+webauthn_delete_key_desc = Якщо ви видалите ключ безпеки ви більше не зможете з ним зайти. Продовжити?
 
 [repo]
 owner=Власник
@@ -801,7 +910,7 @@ template_description=Шаблонні репозиторії дозволяют
 visibility=Видимість
 visibility_description=Тільки власник або члени організації які мають віповідні права, зможуть побачити.
 visibility_helper_forced=Адміністратор вашого сайту налаштував параметри: всі нові репозиторії будуть приватними.
-visibility_fork_helper=(Ці зміни вплинуть на всі форки.)
+visibility_fork_helper=(Ці зміни вплинуть на всі розвилки.)
 clone_helper=Потрібна допомога у клонуванні? Відвідайте сторінку Допомога.
 fork_repo=Форкнути репозиторій
 fork_from=Форк з
@@ -1578,7 +1687,7 @@ activity.git_stats_and_deletions=та
 activity.git_stats_deletion_1=%d видалений
 activity.git_stats_deletion_n=%d видалені
 
-contributors.contribution_type.commits=Коміти
+contributors.contribution_type.commits=Коментарі
 
 search=Пошук
 search.search_repo=Пошук репозиторію
@@ -2046,7 +2155,7 @@ find_file.go_to_file = Перейти до файлу
 visibility_helper = Зробити репозиторій приватним
 projects.card_type.desc = Попередній вигляд карток
 projects.card_type.text_only = Лише текст
-projects.card_type.images_and_text = Зображення і текст
+projects.card_type.images_and_text = Світлини та текст
 issues.filter_poster = Автор
 issues.author = Автор
 issues.author_helper = Цей користувач - автор.
@@ -2070,8 +2179,15 @@ commit.cherry-pick-header = Висмикнути: %s
 commit.cherry-pick-content = Оберіть гілку, на яку висмикнути:
 pulls.expand_files = Розгорнути всі файли
 pulls.collapse_files = Згорнути всі файли
+settings.packages_desc = Увімкнути реєстр пакунків репозиторія
+issues.role.contributor_helper = Цей користувач коментував у цьому репозиторії.
+contributors.contribution_type.deletions = Видалення
+contributors.contribution_type.filter_label = Вид внеску:
+issues.role.contributor = Дописувач
+activity.navbar.contributors = Дописувачі
 
 [graphs]
+contributors.what = внески
 
 [org]
 org_name_holder=Назва організації
@@ -2627,9 +2743,14 @@ packages.total_size = Загальний розмір: %s
 packages.unreferenced_size = Розмір без посилань: %s
 packages.creator = Творець
 packages.version = Версія
-packages.package_manage_panel = Менеджмент Пакунків
+packages.package_manage_panel = Керувати пакунками
 packages.published = Опубліковано
 notices.operations = Дії
+packages.cleanup = Очистити недійсні дані
+packages.cleanup.success = Успішно очищено недійсні дані
+users.still_own_packages = Цей користувач досі володіє одним чи більше пакетами, спочатку видаліть ці пакети.
+users.purge_help = Примусово видалити користувача та будь-які репозиторії, організації та пакунки, якими він володіє. Усі коментарі та недоліки написані цим користувачем також будуть видалені.
+dashboard.cleanup_packages = Очистити непридатні пакунки
 
 
 [action]
@@ -2725,12 +2846,71 @@ alpine.repository.branches=Гілки
 alpine.repository.repositories=Репозиторії
 conan.details.repository=Репозиторій
 owner.settings.cleanuprules.enabled=Увімкнено
-about = Про цей пакет
+about = Про цей пакунок
 empty = Поки що тут немає пакунків.
 empty.documentation = Для отримання додаткової інформації щодо реєстру пакунків, перегляньте документацію.
 registry.documentation = Для отримання додаткової інформації щодо реєстру %s, перегляньте документацію.
 settings.delete.notice = Ви збираєтеся видалити %s (%s). Цю операцію не можна відмінити, ви впевнені?
 details.author = Автор
+title = Пакунки
+arch.version.backup = Резервне копіювання
+arch.version.conflicts = Суперечки
+arch.version.replaces = Заміни
+arch.version.provides = Надає
+arch.version.groups = Група
+conda.install = Даби встановити пакунок, використовуючи Conda, запустіть наступну команду:
+cargo.install = Даби встановити пакунок використовуючи cargo, запустіть наступну команду:
+versions.view_all = Переглянути всі
+generic.download = Завантажте пакунок з командного рядку:
+details = Подробиці
+arch.version.optdepends = Необовʼязково залежить
+installation = Установлення
+details.license = Ліцензія
+filter.type.all = Усі
+conan.install = Даби встановити пакунок, використовуючи Conan, запустіть наступну команду:
+container.layers = Шари Світлини
+details.project_site = Вебсторінка проєкту
+details.documentation_site = Вебсторінка документації
+desc = Керувати пакунками репозиторію.
+requirements = Вимоги
+dependencies = Залежності
+empty.repo = Ви опублікували пакунок, але він не показаний тут? Перейдіть до налаштувань пакунків та привʼяжіть їх до цього репозиторію.
+alpine.repository = Інформація репозиторію
+alpine.install = Аби встановити цей пакунок, запустіть наступну команду:
+cran.install = Даби встановити пакунок, запустіть наступну команду:
+composer.dependencies.development = Залежності Розробки
+container.labels.key = Ключі
+container.labels.value = Значення
+composer.install = Даби встановити пакунок, використовуючи Composer, запустіть наступну команду:
+debian.repository.components = Складові
+filter.container.tagged = Відмічений
+filter.container.untagged = Невідмічений
+container.multi_arch = ОС / Архітектура
+arch.pacman.helper.gpg = Додайте сертифікат довіреності до pacman:
+arch.pacman.sync = Синхронізуйте пакунок з pacman:
+arch.pacman.conf = Додайте сервер з повʼязаним дострибутивом та архітектурою до /etc/pacman.conf :
+arch.version.properties = Властивості Версії
+arch.version.description = Опис
+chef.install = Даби встановити пакунок, запустіть наступну команду:
+container.details.platform = Платформа
+container.details.type = Вид Світлини
+container.pull = Завантажити світлину з командного рядку:
+details.repository_site = Вебсторінка репозиторію
+composer.dependencies = Залежності
+debian.install = Даби встановити пакунок, запустіть наступну команду:
+debian.repository = Інформація репозиторію
+debian.repository.distributions = Дистрибутиви
+alpine.repository.architectures = Архітектури
+arch.version.depends = Залежить
+go.install = Встановити пакунок з командного рядку:
+debian.repository.architectures = Архітектури
+helm.install = Даби встановити пакунок, запустіть наступну команду:
+keywords = Ключові слова
+assets = Ресурси
+versions = Версії
+dependency.version = Версія
+container.labels = Мітки
+filter.no_result = Ваш фільтр не видав жодних результатів.
 
 [secrets]
 
@@ -2747,13 +2927,63 @@ runners.task_list.commit=Коміт
 runners.status.active=Активний
 
 runs.commit=Коміт
+variables.update.failed = Не вдалося змінити змінну.
+variables.update.success = Змінна була змінена.
 
 
 
 
 [projects]
+type-3.display_name = Проєкт організації
+type-2.display_name = Проєкт репозиторію
+type-1.display_name = Особистий проєкт
+deleted.display_name = Видалений Проєкт
 
 [git.filemode]
 ; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", …
 symbolic_link=Символічне посилання
+directory = Тека
+submodule = Підмодуль
+normal_file = Звичайний файл
+executable_file = Виконуваний файл
 
+
+
+[search]
+code_kind = Шукати код...
+code_search_unavailable = Пошук коду наразі недоступний. Будь-ласка звʼяжіться з адміністратором сайту.
+user_kind = Шукати користувачів...
+repo_kind = Шукати репозиторії...
+search = Пошук...
+type_tooltip = Вид пошуку
+fuzzy = Нечіткий
+fuzzy_tooltip = Включати результати, що подібні пошуковому запиту
+union_tooltip = Включати результати, що відповідають будь-якому з ключових слів розділеними пробілами
+union = Ключові слова
+exact = Точний
+exact_tooltip = Включати усі результати, що чітко відповідають запиту
+regexp = Регулярні вирази
+regexp_tooltip = Опрацьовувати пошуковий запит як регулярний вираз
+org_kind = Шукати організації...
+team_kind = Шукати команди...
+milestone_kind = Шукати віхи...
+commit_kind = Шукати коментарі...
+no_results = Не знайдено відповідних результатів.
+keyword_search_unavailable = Пошук по ключовим словам наразі недоступний. Будь-ласка звʼяжіться з адміністратором сайту.
+code_search_by_git_grep = Поточні результати пошуку коду надаються з "git grep". Тут можуть бути кращі результати, якщо адміністратор сайту ввімкнув індексацію коду.
+package_kind = Шукати пакунки...
+project_kind = Шукати проєкти...
+branch_kind = Шукати гілки...
+issue_kind = Шукати недоліки...
+pull_kind = Шукати запити на злиття...
+runner_kind = Пошук рушіїв...
+
+[markup]
+filepreview.truncated = Перегляд було урізано
+
+[translation_meta]
+test = Це текстовий текст. Він не відображається у інтерфейсі користувача Forgejo, але використовується за тестових причин. Вільно натисніть "ок" щоб зберегти час (або цікавий факт на ваш вибір), щоб досягти бажаної позначки 100% завершення :)
+
+[repo.permissions]
+packages.read = Читати: Дивитись та завантажити пакунки призначені до репозиторію.
+packages.write = Писати: Публікувати та видаляти пакунки призначені до репозиторію.
\ No newline at end of file
diff --git a/options/locale/locale_vi.ini b/options/locale/locale_vi.ini
index 98d5506d83..1295731977 100644
--- a/options/locale/locale_vi.ini
+++ b/options/locale/locale_vi.ini
@@ -60,7 +60,7 @@ forks = Các phân nhánh
 activities = Hoạt động
 pull_requests = Yêu cầu thêm mã
 save = Lưu
-issues = 
+issues =
 enabled = Bật
 disabled = Tắt
 copy = Chép
@@ -84,4 +84,6 @@ signed_in_as = Đăng nhập bằng
 re_type = Xác nhận mật khẩu
 webauthn_sign_in = Nhấn nút trên khóa bảo mật, nếu không có nút thì bạn hãy rút ra rồi cắm lại.
 new_org.link = Tạo tổ chức
-error404 = Trang bạn đang tìm không tồn tại hoặc bạn không có quyền xem.
\ No newline at end of file
+error404 = Trang bạn đang tìm không tồn tại hoặc bạn không có quyền xem.
+edit = Chỉnh sửa
+filter = Lọc
\ No newline at end of file
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 42d601b8db..60af4d92c3 100644
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -18,7 +18,7 @@ template=模板
 language=语言选项
 notifications=通知
 active_stopwatch=活动时间跟踪器
-tracked_time_summary=基于问题列表过滤器的跟踪时间概要
+tracked_time_summary=基于工单列表过滤器的跟踪时间概要
 create_new=创建…
 user_profile_and_more=个人信息和设置…
 signed_in_as=已登录用户
@@ -57,7 +57,7 @@ mirror=镜像
 new_repo=创建仓库
 new_migrate=迁移外部仓库
 new_mirror=创建新的镜像
-new_fork=新的派生仓库
+new_fork=创建新的派生仓库
 new_org=创建组织
 new_project=创建项目
 new_project_column=创建列
@@ -179,7 +179,7 @@ contributions_zero=目前还没有贡献
 less=更少的
 more=更多的
 contributions_format = {year}{month}{day} 当日有 {contributions}
-contributions_few = 项贡献
+contributions_few = 贡献
 contributions_one = 贡献
 
 [editor]
@@ -416,7 +416,7 @@ active_your_account=激活您的帐户
 account_activated=帐户已激活
 prohibit_login=账号已暂停
 prohibit_login_desc=您的账号已暂停与实例交互。请与实例管理员联系以重新获得访问权限。
-resent_limit_prompt=您请求发送激活邮件过于频繁，请等待 3 分钟后再试！
+resent_limit_prompt=您请求发送激活邮件过于频繁，请等待 3 分钟后再试。
 has_unconfirmed_mail=%s 您好，系统检测到您有一封发送至 %s 但未被确认的邮件。如果您未收到激活邮件，或需要重新发送，请单击下方的按钮。
 resend_mail=单击此处重新发送确认邮件
 email_not_associate=您输入的邮箱地址未被关联到任何帐号！
@@ -476,6 +476,7 @@ back_to_sign_in = 返回登录
 sign_in_openid = 继续使用 OpenID
 sign_up_button = 立即注册。
 hint_register = 需要账号？立即注册。
+unauthorized_credentials = 凭据不正确或已过期。请重试您的命令，或查看 %s 以获取更多信息
 
 [mail]
 view_it_on=在 %s 上查看
@@ -795,7 +796,7 @@ update_password=更新密码
 old_password=当前密码
 new_password=新的密码
 retype_new_password=确认新密码
-password_incorrect=当前密码不正确！
+password_incorrect=当前密码不正确。
 change_password_success=您的密码已更新。从现在开始使用您的新密码登录。
 password_change_disabled=非本地帐户不能通过 Forgejo 的 web 界面更改密码。
 
@@ -848,7 +849,7 @@ key_content_ssh_placeholder=以“ssh-ed25519”、“ssh-rsa”、“ecdsa-sha2
 key_content_gpg_placeholder=以 “-----BEGIN PGP PUBLIC KEY BLOCK-----” 开头
 add_new_principal=添加规则
 ssh_key_been_used=此 SSH 密钥已添加到服务器。
-ssh_key_name_used=使用相同名称的SSH公钥已经存在！
+ssh_key_name_used=使用相同名称的SSH公钥已存在。
 ssh_principal_been_used=此规则已经加入到了服务器。
 gpg_key_id_used=使用相同ID的GPG公钥已经存在！
 gpg_no_key_email_found=此 GPG 密钥与您帐户关联的任何已激活电子邮件地址均不匹配。如果您在提供的令牌上签名，它仍然可以被添加。
@@ -1418,7 +1419,7 @@ commit.operations=操作
 commit.revert=还原
 commit.revert-header=还原： %s
 commit.revert-content=选择要还原的分支：
-commit.cherry-pick=Cherry-pick
+commit.cherry-pick=拣选
 commit.cherry-pick-header=Cherry-pick：%s
 commit.cherry-pick-content=选择 cherry-pick 的目标分支：
 
@@ -2836,6 +2837,9 @@ mirror_use_ssh.helper = 选择此选项后，Forgejo 将通过 SSH 以 Git 方
 settings.mirror_settings.push_mirror.copy_public_key = 复制公钥
 settings.mirror_settings.push_mirror.none_ssh = 无
 mirror_use_ssh.not_available = SSH 验证不可用。
+issues.new.assign_to_me = 指派给我
+issues.all_title = 全部
+settings.discord_icon_url.exceeds_max_length = 图标 URL 必须小于或等于 2048 个字符
 
 [graphs]
 component_loading=正在加载 %s...
@@ -3958,11 +3962,13 @@ match_tooltip = 仅包含与搜索词完全匹配的结果
 fuzzy_tooltip = 在搜索结果中包含与搜索词相近的项目
 exact = 精确
 issue_kind = 搜索工单...
-pull_kind = 搜索拉取...
-exact_tooltip = 仅包含与精确搜索词匹配的结果
+pull_kind = 搜索合并请求...
+exact_tooltip = 仅包含与搜索词精确匹配的结果
 milestone_kind = 搜索里程碑…
 union_tooltip = 包括与任何空格分隔的关键字匹配的结果
 union = 关键字
+regexp = 正则表达式
+regexp_tooltip = 将搜索内容解释为正则表达式
 
 
 [munits.data]

From dc93b843cd286195f6f356d88a5b21bffa3717c9 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Thu, 10 Oct 2024 06:03:14 +0000
Subject: [PATCH 130/443] Update x/tools to v0.26.0

---
 Makefile |  2 +-
 go.mod   |  8 ++++----
 go.sum   | 20 ++++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 9426aed02b..5dcf6e1f45 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.31.0 # renova
 XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
 GO_LICENSES_PACKAGE ?= github.com/google/go-licenses@v1.6.0 # renovate: datasource=go
 GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1 # renovate: datasource=go
-DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.25.0 # renovate: datasource=go
+DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.26.0 # renovate: datasource=go
 GOMOCK_PACKAGE ?= go.uber.org/mock/mockgen@v0.4.0 # renovate: datasource=go
 GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.16.2 # renovate: datasource=go
 RENOVATE_NPM_PACKAGE ?= renovate@38.110.2 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate
diff --git a/go.mod b/go.mod
index 2ca84bdebc..c8b707640d 100644
--- a/go.mod
+++ b/go.mod
@@ -100,13 +100,13 @@ require (
 	github.com/yuin/goldmark v1.7.4
 	github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
 	go.uber.org/mock v0.4.0
-	golang.org/x/crypto v0.27.0
+	golang.org/x/crypto v0.28.0
 	golang.org/x/image v0.21.0
-	golang.org/x/net v0.29.0
+	golang.org/x/net v0.30.0
 	golang.org/x/oauth2 v0.23.0
-	golang.org/x/sys v0.25.0
+	golang.org/x/sys v0.26.0
 	golang.org/x/text v0.19.0
-	golang.org/x/tools v0.25.0
+	golang.org/x/tools v0.26.0
 	google.golang.org/grpc v1.66.2
 	google.golang.org/protobuf v1.34.2
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
diff --git a/go.sum b/go.sum
index c890adaf2a..0587598776 100644
--- a/go.sum
+++ b/go.sum
@@ -730,8 +730,8 @@ golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2Uz
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
-golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
-golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
 golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA=
 golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
 golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s=
@@ -757,8 +757,8 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
-golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
 golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -798,8 +798,8 @@ golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
@@ -809,8 +809,8 @@ golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
-golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
-golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
+golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
+golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -834,8 +834,8 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
-golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
+golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
+golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

From a052d2b602f3bb67167b906344805e353feea81e Mon Sep 17 00:00:00 2001
From: Lunny Xiao 
Date: Tue, 8 Oct 2024 17:51:09 +0800
Subject: [PATCH 131/443] Fix bug when a token is given public only

Port of https://github.com/go-gitea/gitea/pull/32204

(cherry picked from commit d6d3c96e6555fc91b3e2ef21f4d8d7475564bb3e)

Conflicts:
  routers/api/v1/api.go
	services/context/api.go
  trivial context conflicts
---
 models/user/user.go                       |   4 +
 routers/api/packages/api.go               |  14 +++
 routers/api/v1/api.go                     | 133 ++++++++++++++--------
 routers/api/v1/org/org.go                 |   2 +-
 routers/api/v1/repo/issue.go              |   2 +-
 routers/api/v1/repo/repo.go               |   7 +-
 routers/api/v1/user/user.go               |   6 +
 services/context/api.go                   |   1 +
 tests/integration/api_issue_test.go       |  34 ++++++
 tests/integration/api_repo_branch_test.go |  11 +-
 tests/integration/api_user_search_test.go |  13 +++
 11 files changed, 174 insertions(+), 53 deletions(-)

diff --git a/models/user/user.go b/models/user/user.go
index b1731021fd..382c6955f7 100644
--- a/models/user/user.go
+++ b/models/user/user.go
@@ -421,6 +421,10 @@ func (u *User) IsIndividual() bool {
 	return u.Type == UserTypeIndividual
 }
 
+func (u *User) IsUser() bool {
+	return u.Type == UserTypeIndividual || u.Type == UserTypeBot
+}
+
 // IsBot returns whether or not the user is of type bot
 func (u *User) IsBot() bool {
 	return u.Type == UserTypeBot
diff --git a/routers/api/packages/api.go b/routers/api/packages/api.go
index c72f812704..1337ce4569 100644
--- a/routers/api/packages/api.go
+++ b/routers/api/packages/api.go
@@ -65,6 +65,20 @@ func reqPackageAccess(accessMode perm.AccessMode) func(ctx *context.Context) {
 					ctx.Error(http.StatusUnauthorized, "reqPackageAccess", "user should have specific permission or be a site admin")
 					return
 				}
+
+				// check if scope only applies to public resources
+				publicOnly, err := scope.PublicOnly()
+				if err != nil {
+					ctx.Error(http.StatusForbidden, "tokenRequiresScope", "parsing public resource scope failed: "+err.Error())
+					return
+				}
+
+				if publicOnly {
+					if ctx.Package != nil && ctx.Package.Owner.Visibility.IsPrivate() {
+						ctx.Error(http.StatusForbidden, "reqToken", "token scope is limited to public packages")
+						return
+					}
+				}
 			}
 		}
 
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index c65e738715..6e4a97b885 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -274,6 +274,62 @@ func reqPackageAccess(accessMode perm.AccessMode) func(ctx *context.APIContext)
 	}
 }
 
+func checkTokenPublicOnly() func(ctx *context.APIContext) {
+	return func(ctx *context.APIContext) {
+		if !ctx.PublicOnly {
+			return
+		}
+
+		requiredScopeCategories, ok := ctx.Data["requiredScopeCategories"].([]auth_model.AccessTokenScopeCategory)
+		if !ok || len(requiredScopeCategories) == 0 {
+			return
+		}
+
+		// public Only permission check
+		switch {
+		case auth_model.ContainsCategory(requiredScopeCategories, auth_model.AccessTokenScopeCategoryRepository):
+			if ctx.Repo.Repository != nil && ctx.Repo.Repository.IsPrivate {
+				ctx.Error(http.StatusForbidden, "reqToken", "token scope is limited to public repos")
+				return
+			}
+		case auth_model.ContainsCategory(requiredScopeCategories, auth_model.AccessTokenScopeCategoryIssue):
+			if ctx.Repo.Repository != nil && ctx.Repo.Repository.IsPrivate {
+				ctx.Error(http.StatusForbidden, "reqToken", "token scope is limited to public issues")
+				return
+			}
+		case auth_model.ContainsCategory(requiredScopeCategories, auth_model.AccessTokenScopeCategoryOrganization):
+			if ctx.Org.Organization != nil && ctx.Org.Organization.Visibility != api.VisibleTypePublic {
+				ctx.Error(http.StatusForbidden, "reqToken", "token scope is limited to public orgs")
+				return
+			}
+			if ctx.ContextUser != nil && ctx.ContextUser.IsOrganization() && ctx.ContextUser.Visibility != api.VisibleTypePublic {
+				ctx.Error(http.StatusForbidden, "reqToken", "token scope is limited to public orgs")
+				return
+			}
+		case auth_model.ContainsCategory(requiredScopeCategories, auth_model.AccessTokenScopeCategoryUser):
+			if ctx.ContextUser != nil && ctx.ContextUser.IsUser() && ctx.ContextUser.Visibility != api.VisibleTypePublic {
+				ctx.Error(http.StatusForbidden, "reqToken", "token scope is limited to public users")
+				return
+			}
+		case auth_model.ContainsCategory(requiredScopeCategories, auth_model.AccessTokenScopeCategoryActivityPub):
+			if ctx.ContextUser != nil && ctx.ContextUser.IsUser() && ctx.ContextUser.Visibility != api.VisibleTypePublic {
+				ctx.Error(http.StatusForbidden, "reqToken", "token scope is limited to public activitypub")
+				return
+			}
+		case auth_model.ContainsCategory(requiredScopeCategories, auth_model.AccessTokenScopeCategoryNotification):
+			if ctx.Repo.Repository != nil && ctx.Repo.Repository.IsPrivate {
+				ctx.Error(http.StatusForbidden, "reqToken", "token scope is limited to public notifications")
+				return
+			}
+		case auth_model.ContainsCategory(requiredScopeCategories, auth_model.AccessTokenScopeCategoryPackage):
+			if ctx.Package != nil && ctx.Package.Owner.Visibility.IsPrivate() {
+				ctx.Error(http.StatusForbidden, "reqToken", "token scope is limited to public packages")
+				return
+			}
+		}
+	}
+}
+
 // if a token is being used for auth, we check that it contains the required scope
 // if a token is not being used, reqToken will enforce other sign in methods
 func tokenRequiresScopes(requiredScopeCategories ...auth_model.AccessTokenScopeCategory) func(ctx *context.APIContext) {
@@ -289,9 +345,6 @@ func tokenRequiresScopes(requiredScopeCategories ...auth_model.AccessTokenScopeC
 			return
 		}
 
-		ctx.Data["ApiTokenScopePublicRepoOnly"] = false
-		ctx.Data["ApiTokenScopePublicOrgOnly"] = false
-
 		// use the http method to determine the access level
 		requiredScopeLevel := auth_model.Read
 		if ctx.Req.Method == "POST" || ctx.Req.Method == "PUT" || ctx.Req.Method == "PATCH" || ctx.Req.Method == "DELETE" {
@@ -300,6 +353,18 @@ func tokenRequiresScopes(requiredScopeCategories ...auth_model.AccessTokenScopeC
 
 		// get the required scope for the given access level and category
 		requiredScopes := auth_model.GetRequiredScopes(requiredScopeLevel, requiredScopeCategories...)
+		allow, err := scope.HasScope(requiredScopes...)
+		if err != nil {
+			ctx.Error(http.StatusForbidden, "tokenRequiresScope", "checking scope failed: "+err.Error())
+			return
+		}
+
+		if !allow {
+			ctx.Error(http.StatusForbidden, "tokenRequiresScope", fmt.Sprintf("token does not have at least one of required scope(s): %v", requiredScopes))
+			return
+		}
+
+		ctx.Data["requiredScopeCategories"] = requiredScopeCategories
 
 		// check if scope only applies to public resources
 		publicOnly, err := scope.PublicOnly()
@@ -308,21 +373,8 @@ func tokenRequiresScopes(requiredScopeCategories ...auth_model.AccessTokenScopeC
 			return
 		}
 
-		// this context is used by the middleware in the specific route
-		ctx.Data["ApiTokenScopePublicRepoOnly"] = publicOnly && auth_model.ContainsCategory(requiredScopeCategories, auth_model.AccessTokenScopeCategoryRepository)
-		ctx.Data["ApiTokenScopePublicOrgOnly"] = publicOnly && auth_model.ContainsCategory(requiredScopeCategories, auth_model.AccessTokenScopeCategoryOrganization)
-
-		allow, err := scope.HasScope(requiredScopes...)
-		if err != nil {
-			ctx.Error(http.StatusForbidden, "tokenRequiresScope", "checking scope failed: "+err.Error())
-			return
-		}
-
-		if allow {
-			return
-		}
-
-		ctx.Error(http.StatusForbidden, "tokenRequiresScope", fmt.Sprintf("token does not have at least one of required scope(s): %v", requiredScopes))
+		// assign to true so that those searching should only filter public repositories/users/organizations
+		ctx.PublicOnly = publicOnly
 	}
 }
 
@@ -334,25 +386,6 @@ func reqToken() func(ctx *context.APIContext) {
 			return
 		}
 
-		if true == ctx.Data["IsApiToken"] {
-			publicRepo, pubRepoExists := ctx.Data["ApiTokenScopePublicRepoOnly"]
-			publicOrg, pubOrgExists := ctx.Data["ApiTokenScopePublicOrgOnly"]
-
-			if pubRepoExists && publicRepo.(bool) &&
-				ctx.Repo.Repository != nil && ctx.Repo.Repository.IsPrivate {
-				ctx.Error(http.StatusForbidden, "reqToken", "token scope is limited to public repos")
-				return
-			}
-
-			if pubOrgExists && publicOrg.(bool) &&
-				ctx.Org.Organization != nil && ctx.Org.Organization.Visibility != api.VisibleTypePublic {
-				ctx.Error(http.StatusForbidden, "reqToken", "token scope is limited to public orgs")
-				return
-			}
-
-			return
-		}
-
 		if ctx.IsSigned {
 			return
 		}
@@ -800,11 +833,11 @@ func Routes() *web.Route {
 				m.Group("/user/{username}", func() {
 					m.Get("", activitypub.Person)
 					m.Post("/inbox", activitypub.ReqHTTPSignature(), activitypub.PersonInbox)
-				}, context.UserAssignmentAPI())
+				}, context.UserAssignmentAPI(), checkTokenPublicOnly())
 				m.Group("/user-id/{user-id}", func() {
 					m.Get("", activitypub.Person)
 					m.Post("/inbox", activitypub.ReqHTTPSignature(), activitypub.PersonInbox)
-				}, context.UserIDAssignmentAPI())
+				}, context.UserIDAssignmentAPI(), checkTokenPublicOnly())
 				m.Group("/actor", func() {
 					m.Get("", activitypub.Actor)
 					m.Post("/inbox", activitypub.ActorInbox)
@@ -871,7 +904,7 @@ func Routes() *web.Route {
 				}, reqSelfOrAdmin(), reqBasicOrRevProxyAuth())
 
 				m.Get("/activities/feeds", user.ListUserActivityFeeds)
-			}, context.UserAssignmentAPI(), individualPermsChecker)
+			}, context.UserAssignmentAPI(), checkTokenPublicOnly(), individualPermsChecker)
 		}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryUser))
 
 		// Users (requires user scope)
@@ -891,7 +924,7 @@ func Routes() *web.Route {
 				}
 
 				m.Get("/subscriptions", user.GetWatchedRepos)
-			}, context.UserAssignmentAPI())
+			}, context.UserAssignmentAPI(), checkTokenPublicOnly())
 		}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryUser), reqToken())
 
 		// Users (requires user scope)
@@ -988,7 +1021,7 @@ func Routes() *web.Route {
 						m.Get("", user.IsStarring)
 						m.Put("", user.Star)
 						m.Delete("", user.Unstar)
-					}, repoAssignment())
+					}, repoAssignment(), checkTokenPublicOnly())
 				}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryRepository))
 			}
 			m.Get("/times", repo.ListMyTrackedTimes)
@@ -1019,12 +1052,14 @@ func Routes() *web.Route {
 
 		// Repositories (requires repo scope, org scope)
 		m.Post("/org/{org}/repos",
+			// FIXME: we need org in context
 			tokenRequiresScopes(auth_model.AccessTokenScopeCategoryOrganization, auth_model.AccessTokenScopeCategoryRepository),
 			reqToken(),
 			bind(api.CreateRepoOption{}),
 			repo.CreateOrgRepoDeprecated)
 
 		// requires repo scope
+		// FIXME: Don't expose repository id outside of the system
 		m.Combo("/repositories/{id}", reqToken(), tokenRequiresScopes(auth_model.AccessTokenScopeCategoryRepository)).Get(repo.GetByID)
 
 		// Repos (requires repo scope)
@@ -1305,7 +1340,7 @@ func Routes() *web.Route {
 					m.Post("", bind(api.UpdateRepoAvatarOption{}), repo.UpdateAvatar)
 					m.Delete("", repo.DeleteAvatar)
 				}, reqAdmin(), reqToken())
-			}, repoAssignment())
+			}, repoAssignment(), checkTokenPublicOnly())
 		}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryRepository))
 
 		// Notifications (requires notifications scope)
@@ -1314,7 +1349,7 @@ func Routes() *web.Route {
 				m.Combo("/notifications", reqToken()).
 					Get(notify.ListRepoNotifications).
 					Put(notify.ReadRepoNotifications)
-			}, repoAssignment())
+			}, repoAssignment(), checkTokenPublicOnly())
 		}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryNotification))
 
 		// Issue (requires issue scope)
@@ -1428,7 +1463,7 @@ func Routes() *web.Route {
 						Patch(reqToken(), reqRepoWriter(unit.TypeIssues, unit.TypePullRequests), bind(api.EditMilestoneOption{}), repo.EditMilestone).
 						Delete(reqToken(), reqRepoWriter(unit.TypeIssues, unit.TypePullRequests), repo.DeleteMilestone)
 				})
-			}, repoAssignment())
+			}, repoAssignment(), checkTokenPublicOnly())
 		}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryIssue))
 
 		// NOTE: these are Gitea package management API - see packages.CommonRoutes and packages.DockerContainerRoutes for endpoints that implement package manager APIs
@@ -1439,14 +1474,14 @@ func Routes() *web.Route {
 				m.Get("/files", reqToken(), packages.ListPackageFiles)
 			})
 			m.Get("/", reqToken(), packages.ListPackages)
-		}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryPackage), context.UserAssignmentAPI(), context.PackageAssignmentAPI(), reqPackageAccess(perm.AccessModeRead))
+		}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryPackage), context.UserAssignmentAPI(), context.PackageAssignmentAPI(), reqPackageAccess(perm.AccessModeRead), checkTokenPublicOnly())
 
 		// Organizations
 		m.Get("/user/orgs", reqToken(), tokenRequiresScopes(auth_model.AccessTokenScopeCategoryUser, auth_model.AccessTokenScopeCategoryOrganization), org.ListMyOrgs)
 		m.Group("/users/{username}/orgs", func() {
 			m.Get("", reqToken(), org.ListUserOrgs)
 			m.Get("/{org}/permissions", reqToken(), org.GetUserOrgsPermissions)
-		}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryUser, auth_model.AccessTokenScopeCategoryOrganization), context.UserAssignmentAPI())
+		}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryUser, auth_model.AccessTokenScopeCategoryOrganization), context.UserAssignmentAPI(), checkTokenPublicOnly())
 		m.Post("/orgs", tokenRequiresScopes(auth_model.AccessTokenScopeCategoryOrganization), reqToken(), bind(api.CreateOrgOption{}), org.Create)
 		m.Get("/orgs", org.GetAll, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryOrganization))
 		m.Group("/orgs/{org}", func() {
@@ -1513,7 +1548,7 @@ func Routes() *web.Route {
 					m.Put("/unblock/{username}", org.UnblockUser)
 				}, context.UserAssignmentAPI())
 			}, reqToken(), reqOrgOwnership())
-		}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryOrganization), orgAssignment(true))
+		}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryOrganization), orgAssignment(true), checkTokenPublicOnly())
 		m.Group("/teams/{teamid}", func() {
 			m.Combo("").Get(reqToken(), org.GetTeam).
 				Patch(reqToken(), reqOrgOwnership(), bind(api.EditTeamOption{}), org.EditTeam).
@@ -1533,7 +1568,7 @@ func Routes() *web.Route {
 					Get(reqToken(), org.GetTeamRepo)
 			})
 			m.Get("/activities/feeds", org.ListTeamActivityFeeds)
-		}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryOrganization), orgAssignment(false, true), reqToken(), reqTeamMembership())
+		}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryOrganization), orgAssignment(false, true), reqToken(), reqTeamMembership(), checkTokenPublicOnly())
 
 		m.Group("/admin", func() {
 			m.Group("/cron", func() {
diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go
index 9f9483d4ff..95c8c25d8e 100644
--- a/routers/api/v1/org/org.go
+++ b/routers/api/v1/org/org.go
@@ -192,7 +192,7 @@ func GetAll(ctx *context.APIContext) {
 	//     "$ref": "#/responses/OrganizationList"
 
 	vMode := []api.VisibleType{api.VisibleTypePublic}
-	if ctx.IsSigned {
+	if ctx.IsSigned && !ctx.PublicOnly {
 		vMode = append(vMode, api.VisibleTypeLimited)
 		if ctx.Doer.IsAdmin {
 			vMode = append(vMode, api.VisibleTypePrivate)
diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go
index 22779e38d2..99cd9803c5 100644
--- a/routers/api/v1/repo/issue.go
+++ b/routers/api/v1/repo/issue.go
@@ -149,7 +149,7 @@ func SearchIssues(ctx *context.APIContext) {
 			Actor:   ctx.Doer,
 		}
 		if ctx.IsSigned {
-			opts.Private = true
+			opts.Private = !ctx.PublicOnly
 			opts.AllLimited = true
 		}
 		if ctx.FormString("owner") != "" {
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
index 9f6536b2c5..25427125db 100644
--- a/routers/api/v1/repo/repo.go
+++ b/routers/api/v1/repo/repo.go
@@ -130,6 +130,11 @@ func Search(ctx *context.APIContext) {
 	//   "422":
 	//     "$ref": "#/responses/validationError"
 
+	private := ctx.IsSigned && (ctx.FormString("private") == "" || ctx.FormBool("private"))
+	if ctx.PublicOnly {
+		private = false
+	}
+
 	opts := &repo_model.SearchRepoOptions{
 		ListOptions:        utils.GetListOptions(ctx),
 		Actor:              ctx.Doer,
@@ -139,7 +144,7 @@ func Search(ctx *context.APIContext) {
 		TeamID:             ctx.FormInt64("team_id"),
 		TopicOnly:          ctx.FormBool("topic"),
 		Collaborate:        optional.None[bool](),
-		Private:            ctx.IsSigned && (ctx.FormString("private") == "" || ctx.FormBool("private")),
+		Private:            private,
 		Template:           optional.None[bool](),
 		StarredByID:        ctx.FormInt64("starredBy"),
 		IncludeDescription: ctx.FormBool("includeDesc"),
diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go
index 0847b4079b..4fa3f25ad7 100644
--- a/routers/api/v1/user/user.go
+++ b/routers/api/v1/user/user.go
@@ -10,6 +10,7 @@ import (
 
 	activities_model "code.gitea.io/gitea/models/activities"
 	user_model "code.gitea.io/gitea/models/user"
+	"code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/routers/api/v1/utils"
 	"code.gitea.io/gitea/services/context"
 	"code.gitea.io/gitea/services/convert"
@@ -68,12 +69,17 @@ func Search(ctx *context.APIContext) {
 		maxResults = 1
 		users = []*user_model.User{user_model.NewActionsUser()}
 	default:
+		var visible []structs.VisibleType
+		if ctx.PublicOnly {
+			visible = []structs.VisibleType{structs.VisibleTypePublic}
+		}
 		users, maxResults, err = user_model.SearchUsers(ctx, &user_model.SearchUserOptions{
 			Actor:         ctx.Doer,
 			Keyword:       ctx.FormTrim("q"),
 			UID:           uid,
 			Type:          user_model.UserTypeIndividual,
 			SearchByEmail: true,
+			Visible:       visible,
 			ListOptions:   listOptions,
 		})
 		if err != nil {
diff --git a/services/context/api.go b/services/context/api.go
index 8e255c8573..52d11f5f6a 100644
--- a/services/context/api.go
+++ b/services/context/api.go
@@ -45,6 +45,7 @@ type APIContext struct {
 	Package    *Package
 	QuotaGroup *quota_model.Group
 	QuotaRule  *quota_model.Rule
+	PublicOnly bool // Whether the request is for a public endpoint
 }
 
 func init() {
diff --git a/tests/integration/api_issue_test.go b/tests/integration/api_issue_test.go
index 6e60fe72bc..4051f95ed9 100644
--- a/tests/integration/api_issue_test.go
+++ b/tests/integration/api_issue_test.go
@@ -76,6 +76,34 @@ func TestAPIListIssues(t *testing.T) {
 	}
 }
 
+func TestAPIListIssuesPublicOnly(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+	owner1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo1.OwnerID})
+
+	session := loginUser(t, owner1.Name)
+	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadIssue)
+	link, _ := url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/issues", owner1.Name, repo1.Name))
+	link.RawQuery = url.Values{"state": {"all"}}.Encode()
+	req := NewRequest(t, "GET", link.String()).AddTokenAuth(token)
+	MakeRequest(t, req, http.StatusOK)
+
+	repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
+	owner2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo2.OwnerID})
+
+	session = loginUser(t, owner2.Name)
+	token = getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadIssue)
+	link, _ = url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/issues", owner2.Name, repo2.Name))
+	link.RawQuery = url.Values{"state": {"all"}}.Encode()
+	req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
+	MakeRequest(t, req, http.StatusOK)
+
+	publicOnlyToken := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadIssue, auth_model.AccessTokenScopePublicOnly)
+	req = NewRequest(t, "GET", link.String()).AddTokenAuth(publicOnlyToken)
+	MakeRequest(t, req, http.StatusForbidden)
+}
+
 func TestAPICreateIssue(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 	const body, title = "apiTestBody", "apiTestTitle"
@@ -404,6 +432,12 @@ func TestAPISearchIssues(t *testing.T) {
 	DecodeJSON(t, resp, &apiIssues)
 	assert.Len(t, apiIssues, expectedIssueCount)
 
+	publicOnlyToken := getUserToken(t, "user1", auth_model.AccessTokenScopeReadIssue, auth_model.AccessTokenScopePublicOnly)
+	req = NewRequest(t, "GET", link.String()).AddTokenAuth(publicOnlyToken)
+	resp = MakeRequest(t, req, http.StatusOK)
+	DecodeJSON(t, resp, &apiIssues)
+	assert.Len(t, apiIssues, 15) // 15 public issues
+
 	since := "2000-01-01T00:50:01+00:00" // 946687801
 	before := time.Unix(999307200, 0).Format(time.RFC3339)
 	query.Add("since", since)
diff --git a/tests/integration/api_repo_branch_test.go b/tests/integration/api_repo_branch_test.go
index 5488eca1dc..83159022ea 100644
--- a/tests/integration/api_repo_branch_test.go
+++ b/tests/integration/api_repo_branch_test.go
@@ -29,9 +29,13 @@ func TestAPIRepoBranchesPlain(t *testing.T) {
 		repo3 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 3})
 		user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
 		session := loginUser(t, user1.LowerName)
-		token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
 
+		// public only token should be forbidden
+		publicOnlyToken := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopePublicOnly, auth_model.AccessTokenScopeWriteRepository)
 		link, _ := url.Parse(fmt.Sprintf("/api/v1/repos/org3/%s/branches", repo3.Name)) // a plain repo
+		MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(publicOnlyToken), http.StatusForbidden)
+
+		token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
 		resp := MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusOK)
 		bs, err := io.ReadAll(resp.Body)
 		require.NoError(t, err)
@@ -43,6 +47,8 @@ func TestAPIRepoBranchesPlain(t *testing.T) {
 		assert.EqualValues(t, "master", branches[1].Name)
 
 		link2, _ := url.Parse(fmt.Sprintf("/api/v1/repos/org3/%s/branches/test_branch", repo3.Name))
+		MakeRequest(t, NewRequest(t, "GET", link2.String()).AddTokenAuth(publicOnlyToken), http.StatusForbidden)
+
 		resp = MakeRequest(t, NewRequest(t, "GET", link2.String()).AddTokenAuth(token), http.StatusOK)
 		bs, err = io.ReadAll(resp.Body)
 		require.NoError(t, err)
@@ -50,6 +56,8 @@ func TestAPIRepoBranchesPlain(t *testing.T) {
 		require.NoError(t, json.Unmarshal(bs, &branch))
 		assert.EqualValues(t, "test_branch", branch.Name)
 
+		MakeRequest(t, NewRequest(t, "POST", link.String()).AddTokenAuth(publicOnlyToken), http.StatusForbidden)
+
 		req := NewRequest(t, "POST", link.String()).AddTokenAuth(token)
 		req.Header.Add("Content-Type", "application/json")
 		req.Body = io.NopCloser(bytes.NewBufferString(`{"new_branch_name":"test_branch2", "old_branch_name": "test_branch", "old_ref_name":"refs/heads/test_branch"}`))
@@ -74,6 +82,7 @@ func TestAPIRepoBranchesPlain(t *testing.T) {
 
 		link3, _ := url.Parse(fmt.Sprintf("/api/v1/repos/org3/%s/branches/test_branch2", repo3.Name))
 		MakeRequest(t, NewRequest(t, "DELETE", link3.String()), http.StatusNotFound)
+		MakeRequest(t, NewRequest(t, "DELETE", link3.String()).AddTokenAuth(publicOnlyToken), http.StatusForbidden)
 
 		MakeRequest(t, NewRequest(t, "DELETE", link3.String()).AddTokenAuth(token), http.StatusNoContent)
 		require.NoError(t, err)
diff --git a/tests/integration/api_user_search_test.go b/tests/integration/api_user_search_test.go
index 63c1f86f27..ffc4a0481f 100644
--- a/tests/integration/api_user_search_test.go
+++ b/tests/integration/api_user_search_test.go
@@ -40,6 +40,19 @@ func TestAPIUserSearchLoggedIn(t *testing.T) {
 		assert.Contains(t, user.UserName, query)
 		assert.NotEmpty(t, user.Email)
 	}
+
+	publicToken := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadUser, auth_model.AccessTokenScopePublicOnly)
+	req = NewRequestf(t, "GET", "/api/v1/users/search?q=%s", query).
+		AddTokenAuth(publicToken)
+	resp = MakeRequest(t, req, http.StatusOK)
+	results = SearchResults{}
+	DecodeJSON(t, resp, &results)
+	assert.NotEmpty(t, results.Data)
+	for _, user := range results.Data {
+		assert.Contains(t, user.UserName, query)
+		assert.NotEmpty(t, user.Email)
+		assert.True(t, user.Visibility == "public")
+	}
 }
 
 func TestAPIUserSearchNotLoggedIn(t *testing.T) {

From 283f94c85f610fa6ff1256304ba389e00cf87462 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Thu, 10 Oct 2024 08:03:23 +0000
Subject: [PATCH 132/443] Update module google.golang.org/grpc to v1.67.1

---
 go.mod |  6 +++---
 go.sum | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/go.mod b/go.mod
index 39daee568c..bfa52736e4 100644
--- a/go.mod
+++ b/go.mod
@@ -107,7 +107,7 @@ require (
 	golang.org/x/sys v0.26.0
 	golang.org/x/text v0.19.0
 	golang.org/x/tools v0.26.0
-	google.golang.org/grpc v1.66.2
+	google.golang.org/grpc v1.67.1
 	google.golang.org/protobuf v1.35.1
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	gopkg.in/ini.v1 v1.67.0
@@ -118,7 +118,7 @@ require (
 )
 
 require (
-	cloud.google.com/go/compute/metadata v0.3.0 // indirect
+	cloud.google.com/go/compute/metadata v0.5.0 // indirect
 	dario.cat/mergo v1.0.0 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 // indirect
@@ -282,7 +282,7 @@ require (
 	golang.org/x/mod v0.21.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
diff --git a/go.sum b/go.sum
index 2994d0a013..a768979f17 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=
-cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
+cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY=
+cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY=
 code.forgejo.org/f3/gof3/v3 v3.7.0 h1:ZfuCP8CGm8ZJbWmL+V0pUu3E0X4FCAA7GfRDy/y5/K4=
 code.forgejo.org/f3/gof3/v3 v3.7.0/go.mod h1:oNhOeqD4DZYjVcNjQXIOdDX9b/1tqxi9ITLS8H9/Csw=
 code.forgejo.org/forgejo-contrib/go-libravatar v0.0.0-20191008002943-06d1c002b251 h1:HTZl3CBk3ABNYtFI6TPLvJgGKFIhKT5CBk0sbOtkDKU=
@@ -840,10 +840,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 h1:1GBuWVLM/KMVUv1t1En5Gs+gFZCNd360GGb4sSxtrhU=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0=
-google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo=
-google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
+google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
+google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

From 9b63e3e88db29b4b4306d0cc147c4de2553b0ea1 Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Thu, 10 Oct 2024 14:38:22 +0300
Subject: [PATCH 133/443] chore(release-note): Fix bug when a token is given
 public only

---
 release-notes/5515.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 release-notes/5515.md

diff --git a/release-notes/5515.md b/release-notes/5515.md
new file mode 100644
index 0000000000..46671195e1
--- /dev/null
+++ b/release-notes/5515.md
@@ -0,0 +1 @@
+**Fixing this bug is a breaking change because existing tokens with a public scope will no longer return private resources. They have to be deleted and re-created without the public scope to restore their original behavior**. The public scope of an application token does not filter out private repositories, organizations or packages in some cases. This scope is not the default, it has to be manually set via the web UI or the API. When the public scope is explicitly added to an application token that is allowed to list the repositories and packages of a user or an organization, it is meant as a restriction. For instance if a user has two repositories, one private and the other publicly visible, a token with the public scope used with the API endpoint listing the repositories that belong to this user must only return the publicly visible one and not reveal the existence of the private one.

From 14d85597f85b4bb8afabf40668ac882645fa1b68 Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Thu, 10 Oct 2024 14:41:02 +0300
Subject: [PATCH 134/443] chore(lint): Fix bug when a token is given public
 only

---
 tests/integration/api_user_search_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/api_user_search_test.go b/tests/integration/api_user_search_test.go
index ffc4a0481f..ab52b26531 100644
--- a/tests/integration/api_user_search_test.go
+++ b/tests/integration/api_user_search_test.go
@@ -51,7 +51,7 @@ func TestAPIUserSearchLoggedIn(t *testing.T) {
 	for _, user := range results.Data {
 		assert.Contains(t, user.UserName, query)
 		assert.NotEmpty(t, user.Email)
-		assert.True(t, user.Visibility == "public")
+		assert.Equal(t, "public", user.Visibility)
 	}
 }
 

From 7e196981384c49370eec2da85dd4f7db01882860 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Fri, 11 Oct 2024 00:03:35 +0000
Subject: [PATCH 135/443] Update dependency @github/text-expander-element to
 v2.8.0

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8ea76b3cf9..b32785e197 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
         "@citation-js/plugin-software-formats": "0.6.1",
         "@github/markdown-toolbar-element": "2.2.3",
         "@github/relative-time-element": "4.4.3",
-        "@github/text-expander-element": "2.7.2",
+        "@github/text-expander-element": "2.8.0",
         "@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
         "@primer/octicons": "19.9.0",
         "ansi_up": "6.0.2",
@@ -3177,9 +3177,9 @@
       "license": "MIT"
     },
     "node_modules/@github/text-expander-element": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/@github/text-expander-element/-/text-expander-element-2.7.2.tgz",
-      "integrity": "sha512-eTIOUQKoBxe+e0yHKHQHoo4x61Erb7m0lhi2vMRHZS7TwI6OCGSj/3YydAr3obbQbZjevF9wPihLf1wADu3A9g==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/@github/text-expander-element/-/text-expander-element-2.8.0.tgz",
+      "integrity": "sha512-kkS2rZ/CG8HGKblpLDQ8vcK/K7l/Jsvzi/N4ovwPAsFSOImcIbJh2MgCv9tzqE3wAm/qXlscvh3Ms4Hh1vtZvw==",
       "license": "MIT",
       "dependencies": {
         "@github/combobox-nav": "^2.0.2",
diff --git a/package.json b/package.json
index 4603ab67e8..f00f8b3589 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "@citation-js/plugin-software-formats": "0.6.1",
     "@github/markdown-toolbar-element": "2.2.3",
     "@github/relative-time-element": "4.4.3",
-    "@github/text-expander-element": "2.7.2",
+    "@github/text-expander-element": "2.8.0",
     "@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
     "@primer/octicons": "19.9.0",
     "ansi_up": "6.0.2",

From 9de9034400db7d361b106b3b4a18e5a2c42f61aa Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Fri, 11 Oct 2024 14:48:47 +0200
Subject: [PATCH 136/443] [BUG] Don't allow owner team with incorrect unit
 access

- On editting a team, only update the units if the team isn't the
'Owners' team. Otherwise the 'Owners' team end up having all of their
unit access modes set to 'None'; because the request form doesn't send
over any units, as it's simply not shown in the UI.
- Adds a database inconstency check and fix for the case where the
'Owners' team is affected by this bug.
- Adds unit test.
- Adds integration test.
- Resolves #5528
- Regression of https://github.com/go-gitea/gitea/pull/24012
---
 .../TestInconsistentOwnerTeam/team.yml        | 10 ++++
 .../TestInconsistentOwnerTeam/team_unit.yml   | 59 +++++++++++++++++++
 models/organization/team.go                   | 40 +++++++++++++
 models/organization/team_test.go              | 50 ++++++++++++++++
 routers/web/org/teams.go                      | 21 +++----
 services/doctor/dbconsistency.go              |  7 +++
 tests/integration/org_test.go                 | 22 +++++++
 7 files changed, 199 insertions(+), 10 deletions(-)
 create mode 100644 models/organization/TestInconsistentOwnerTeam/team.yml
 create mode 100644 models/organization/TestInconsistentOwnerTeam/team_unit.yml

diff --git a/models/organization/TestInconsistentOwnerTeam/team.yml b/models/organization/TestInconsistentOwnerTeam/team.yml
new file mode 100644
index 0000000000..90e3ad43b0
--- /dev/null
+++ b/models/organization/TestInconsistentOwnerTeam/team.yml
@@ -0,0 +1,10 @@
+-
+  id: 1000
+  org_id: 1000
+  lower_name: owners
+  name: Owners
+  authorize: 4 # owner
+  num_repos: 0
+  num_members: 0
+  includes_all_repositories: true
+  can_create_org_repo: true
diff --git a/models/organization/TestInconsistentOwnerTeam/team_unit.yml b/models/organization/TestInconsistentOwnerTeam/team_unit.yml
new file mode 100644
index 0000000000..91e03d6a9a
--- /dev/null
+++ b/models/organization/TestInconsistentOwnerTeam/team_unit.yml
@@ -0,0 +1,59 @@
+-
+  id: 1000
+  team_id: 1000
+  type: 1
+  access_mode: 0 # None
+
+-
+  id: 1001
+  team_id: 1000
+  type: 2
+  access_mode: 0
+
+-
+  id: 1002
+  team_id: 1000
+  type: 3
+  access_mode: 0
+
+-
+  id: 1003
+  team_id: 1000
+  type: 4
+  access_mode: 0
+
+-
+  id: 1004
+  team_id: 1000
+  type: 5
+  access_mode: 0
+
+-
+  id: 1005
+  team_id: 1000
+  type: 6
+  access_mode: 0
+
+-
+  id: 1006
+  team_id: 1000
+  type: 7
+  access_mode: 0
+
+-
+  id: 1007
+  team_id: 1000
+  type: 8
+  access_mode: 0
+
+-
+  id: 1008
+  team_id: 1000
+  type: 9
+  access_mode: 0
+
+-
+  id: 1009
+  team_id: 1000
+  type: 10
+  access_mode: 0
diff --git a/models/organization/team.go b/models/organization/team.go
index 1b737c2d3d..ddff32cb8c 100644
--- a/models/organization/team.go
+++ b/models/organization/team.go
@@ -268,3 +268,43 @@ func IncrTeamRepoNum(ctx context.Context, teamID int64) error {
 	_, err := db.GetEngine(ctx).Incr("num_repos").ID(teamID).Update(new(Team))
 	return err
 }
+
+// CountInconsistentOwnerTeams returns the amount of owner teams that have all of
+// their access modes set to "None".
+func CountInconsistentOwnerTeams(ctx context.Context) (int64, error) {
+	return db.GetEngine(ctx).Table("team").
+		Join("INNER", "team_unit", "`team`.id = `team_unit`.team_id").
+		Where("`team`.lower_name = ?", strings.ToLower(OwnerTeamName)).
+		GroupBy("`team_unit`.team_id").
+		Having("SUM(`team_unit`.access_mode) = 0").
+		Count()
+}
+
+// FixInconsistentOwnerTeams fixes inconsistent owner teams that have all of
+// their access modes set to "None", it sets it back to "Owner".
+func FixInconsistentOwnerTeams(ctx context.Context) (int64, error) {
+	teamIDs := []int64{}
+	if err := db.GetEngine(ctx).Table("team").
+		Select("`team`.id").
+		Join("INNER", "team_unit", "`team`.id = `team_unit`.team_id").
+		Where("`team`.lower_name = ?", strings.ToLower(OwnerTeamName)).
+		GroupBy("`team_unit`.team_id").
+		Having("SUM(`team_unit`.access_mode) = 0").
+		Find(&teamIDs); err != nil {
+		return 0, err
+	}
+
+	if err := db.Iterate(ctx, builder.In("team_id", teamIDs), func(ctx context.Context, bean *TeamUnit) error {
+		if bean.Type == unit.TypeExternalTracker || bean.Type == unit.TypeExternalWiki {
+			bean.AccessMode = perm.AccessModeRead
+		} else {
+			bean.AccessMode = perm.AccessModeOwner
+		}
+		_, err := db.GetEngine(ctx).ID(bean.ID).Table("team_unit").Cols("access_mode").Update(bean)
+		return err
+	}); err != nil {
+		return 0, err
+	}
+
+	return int64(len(teamIDs)), nil
+}
diff --git a/models/organization/team_test.go b/models/organization/team_test.go
index c14c1f181d..601d136d87 100644
--- a/models/organization/team_test.go
+++ b/models/organization/team_test.go
@@ -4,11 +4,14 @@
 package organization_test
 
 import (
+	"path/filepath"
 	"testing"
 
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/organization"
+	"code.gitea.io/gitea/models/perm"
 	"code.gitea.io/gitea/models/unittest"
+	"code.gitea.io/gitea/modules/setting"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -198,3 +201,50 @@ func TestUsersInTeamsCount(t *testing.T) {
 	test([]int64{1, 2, 3, 4, 5}, []int64{2, 5}, 2)    // userid 2,4
 	test([]int64{1, 2, 3, 4, 5}, []int64{2, 3, 5}, 3) // userid 2,4,5
 }
+
+func TestInconsistentOwnerTeam(t *testing.T) {
+	defer unittest.OverrideFixtures(
+		unittest.FixturesOptions{
+			Dir:  filepath.Join(setting.AppWorkPath, "models/fixtures/"),
+			Base: setting.AppWorkPath,
+			Dirs: []string{"models/organization/TestInconsistentOwnerTeam/"},
+		},
+	)()
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1000, TeamID: 1000, AccessMode: perm.AccessModeNone})
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1001, TeamID: 1000, AccessMode: perm.AccessModeNone})
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1002, TeamID: 1000, AccessMode: perm.AccessModeNone})
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1003, TeamID: 1000, AccessMode: perm.AccessModeNone})
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1004, TeamID: 1000, AccessMode: perm.AccessModeNone})
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1005, TeamID: 1000, AccessMode: perm.AccessModeNone})
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1006, TeamID: 1000, AccessMode: perm.AccessModeNone})
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1007, TeamID: 1000, AccessMode: perm.AccessModeNone})
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1008, TeamID: 1000, AccessMode: perm.AccessModeNone})
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1009, TeamID: 1000, AccessMode: perm.AccessModeNone})
+
+	count, err := organization.CountInconsistentOwnerTeams(db.DefaultContext)
+	require.NoError(t, err)
+	require.EqualValues(t, 1, count)
+
+	count, err = organization.FixInconsistentOwnerTeams(db.DefaultContext)
+	require.NoError(t, err)
+	require.EqualValues(t, 1, count)
+
+	count, err = organization.CountInconsistentOwnerTeams(db.DefaultContext)
+	require.NoError(t, err)
+	require.EqualValues(t, 0, count)
+
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1000, AccessMode: perm.AccessModeOwner})
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1001, AccessMode: perm.AccessModeOwner})
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1002, AccessMode: perm.AccessModeOwner})
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1003, AccessMode: perm.AccessModeOwner})
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1004, AccessMode: perm.AccessModeOwner})
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1007, AccessMode: perm.AccessModeOwner})
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1008, AccessMode: perm.AccessModeOwner})
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1009, AccessMode: perm.AccessModeOwner})
+
+	// External wiki and issue
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1005, AccessMode: perm.AccessModeRead})
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{ID: 1006, AccessMode: perm.AccessModeRead})
+}
diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go
index fd7486cacd..45c36743e8 100644
--- a/routers/web/org/teams.go
+++ b/routers/web/org/teams.go
@@ -507,21 +507,22 @@ func EditTeamPost(ctx *context.Context) {
 			t.IncludesAllRepositories = includesAllRepositories
 		}
 		t.CanCreateOrgRepo = form.CanCreateOrgRepo
+
+		units := make([]*org_model.TeamUnit, 0, len(unitPerms))
+		for tp, perm := range unitPerms {
+			units = append(units, &org_model.TeamUnit{
+				OrgID:      t.OrgID,
+				TeamID:     t.ID,
+				Type:       tp,
+				AccessMode: perm,
+			})
+		}
+		t.Units = units
 	} else {
 		t.CanCreateOrgRepo = true
 	}
 
 	t.Description = form.Description
-	units := make([]*org_model.TeamUnit, 0, len(unitPerms))
-	for tp, perm := range unitPerms {
-		units = append(units, &org_model.TeamUnit{
-			OrgID:      t.OrgID,
-			TeamID:     t.ID,
-			Type:       tp,
-			AccessMode: perm,
-		})
-	}
-	t.Units = units
 
 	if ctx.HasError() {
 		ctx.HTML(http.StatusOK, tplTeamNew)
diff --git a/services/doctor/dbconsistency.go b/services/doctor/dbconsistency.go
index e3992a5ba5..7fce505d52 100644
--- a/services/doctor/dbconsistency.go
+++ b/services/doctor/dbconsistency.go
@@ -12,6 +12,7 @@ import (
 	"code.gitea.io/gitea/models/db"
 	issues_model "code.gitea.io/gitea/models/issues"
 	"code.gitea.io/gitea/models/migrations"
+	org_model "code.gitea.io/gitea/models/organization"
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
@@ -177,6 +178,12 @@ func checkDBConsistency(ctx context.Context, logger log.Logger, autofix bool) er
 			Fixer:        auth_model.DeleteOrphanedOAuth2Applications,
 			FixedMessage: "Removed",
 		},
+		{
+			Name:         "Owner teams with no admin access",
+			Counter:      org_model.CountInconsistentOwnerTeams,
+			Fixer:        org_model.FixInconsistentOwnerTeams,
+			FixedMessage: "Fixed",
+		},
 	}
 
 	// TODO: function to recalc all counters
diff --git a/tests/integration/org_test.go b/tests/integration/org_test.go
index f907b75c72..912ad0ca0b 100644
--- a/tests/integration/org_test.go
+++ b/tests/integration/org_test.go
@@ -10,6 +10,9 @@ import (
 	"testing"
 
 	auth_model "code.gitea.io/gitea/models/auth"
+	"code.gitea.io/gitea/models/organization"
+	"code.gitea.io/gitea/models/perm"
+	"code.gitea.io/gitea/models/unit"
 	"code.gitea.io/gitea/models/unittest"
 	user_model "code.gitea.io/gitea/models/user"
 	api "code.gitea.io/gitea/modules/structs"
@@ -243,3 +246,22 @@ func TestOrgDashboardLabels(t *testing.T) {
 	assert.True(t, ok)
 	assert.Contains(t, labelFilterHref, "labels=3%2c-4")
 }
+
+func TestOwnerTeamUnit(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+	org := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3, Type: user_model.UserTypeOrganization})
+	session := loginUser(t, user.Name)
+
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{TeamID: 1, Type: unit.TypeIssues, AccessMode: perm.AccessModeOwner})
+
+	req := NewRequestWithValues(t, "GET", fmt.Sprintf("/org/%s/teams/owners/edit", org.Name), map[string]string{
+		"_csrf":       GetCSRF(t, session, fmt.Sprintf("/org/%s/teams/owners/edit", org.Name)),
+		"team_name":   "Owners",
+		"Description": "Just a description",
+	})
+	session.MakeRequest(t, req, http.StatusOK)
+
+	unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{TeamID: 1, Type: unit.TypeIssues, AccessMode: perm.AccessModeOwner})
+}

From dcc442351d2a70344dba582ec76c14a39e5aa2c0 Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Fri, 11 Oct 2024 15:26:02 +0200
Subject: [PATCH 137/443] [BUG] Make chroma match case-insenstive

- In the case that [go-enry](https://github.com/go-enry/go-enry/)
returned langauge doesn't match a lexer name (Either because its not
available or because it doesn't match Chroma's name), a last effort
attempt is made to use Chroma's matching.
- go-enry already applies `strings.ToLower` onto the filename to avoid
being case-sensitive, add the same code for Chroma's matching. The code
being used doesn't rely on the filename being case senstive for correct
matching.
- Adds unit test.
- Resolves #752
---
 modules/highlight/highlight.go      | 4 ++--
 modules/highlight/highlight_test.go | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/highlight/highlight.go b/modules/highlight/highlight.go
index 4ee47b7a13..bd6137dc85 100644
--- a/modules/highlight/highlight.go
+++ b/modules/highlight/highlight.go
@@ -96,7 +96,7 @@ func Code(fileName, language, code string) (output template.HTML, lexerName stri
 	}
 
 	if lexer == nil {
-		lexer = lexers.Match(fileName)
+		lexer = lexers.Match(strings.ToLower(fileName))
 		if lexer == nil {
 			lexer = lexers.Fallback
 		}
@@ -165,7 +165,7 @@ func File(fileName, language string, code []byte) ([]template.HTML, string, erro
 
 		lexer = lexers.Get(guessLanguage)
 		if lexer == nil {
-			lexer = lexers.Match(fileName)
+			lexer = lexers.Match(strings.ToLower(fileName))
 			if lexer == nil {
 				lexer = lexers.Fallback
 			}
diff --git a/modules/highlight/highlight_test.go b/modules/highlight/highlight_test.go
index 83d35d93ef..03db4d5090 100644
--- a/modules/highlight/highlight_test.go
+++ b/modules/highlight/highlight_test.go
@@ -109,6 +109,12 @@ c=2
 			),
 			lexerName: "Python",
 		},
+		{
+			name:      "DOS.PAS",
+			code:      "",
+			want:      lines(""),
+			lexerName: "ObjectPascal",
+		},
 	}
 
 	for _, tt := range tests {

From 79a3fe6cc6b41d74683deb46b05e579ff5268ea1 Mon Sep 17 00:00:00 2001
From: Otto Richter 
Date: Fri, 11 Oct 2024 18:27:47 +0000
Subject: [PATCH 138/443] i18n: Fine tune language for units (#5523)

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5523
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Otto Richter 
Co-committed-by: Otto Richter 
---
 options/locale/locale_en-US.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 99d276bd1d..c456da76bb 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -764,7 +764,7 @@ language.localization_project = Help us translate Forgejo into your language! 
Date: Fri, 11 Oct 2024 18:51:29 +0000
Subject: [PATCH 139/443] fix(i18n): remove unnecessary variable (#5533)

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5533
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Otto Richter 
Co-committed-by: Otto Richter 
---
 templates/home.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/home.tmpl b/templates/home.tmpl
index 11e2ea06c3..a97434457d 100644
--- a/templates/home.tmpl
+++ b/templates/home.tmpl
@@ -25,7 +25,7 @@
 				{{svg "octicon-device-desktop"}} {{ctx.Locale.Tr "startpage.platform"}}
 			
 			

-				{{ctx.Locale.Tr "startpage.platform_desc" "https://go.dev/"}}
+				{{ctx.Locale.Tr "startpage.platform_desc"}}
 			

 		

 	


From 145f7624cab8300d6bd74e38ecaf5aac3cf0880a Mon Sep 17 00:00:00 2001
From: 0ko <0ko@noreply.codeberg.org>
Date: Fri, 11 Oct 2024 18:52:25 +0000
Subject: [PATCH 140/443] feat(ui): add a bullet symbol between author and
 committer (#5518)

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5518
Reviewed-by: Otto 
---
 templates/repo/commit_page.tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
index e37686025b..96ce8cf747 100644
--- a/templates/repo/commit_page.tmpl
+++ b/templates/repo/commit_page.tmpl
@@ -154,9 +154,10 @@
 					{{end}}
 					{{TimeSince .Commit.Author.When ctx.Locale}}
 					{{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}}
+						•
 						{{ctx.Locale.Tr "repo.diff.committed_by"}}
 						{{if ne .Verification.CommittingUser.ID 0}}
-							{{ctx.AvatarUtils.Avatar .Verification.CommittingUser 28 "tw-mx-2"}}
+							{{ctx.AvatarUtils.Avatar .Verification.CommittingUser 28 "tw-mr-2"}}
 							{{.Commit.Committer.Name}}
 						{{else}}
 							{{ctx.AvatarUtils.AvatarByEmail .Commit.Committer.Email .Commit.Committer.Name 28 "tw-mr-2"}}

From 732878baf59a6614ca5d71fafebc71682e283c84 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Sat, 12 Oct 2024 00:04:06 +0000
Subject: [PATCH 141/443] Update module github.com/klauspost/compress to
 v1.17.11

---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index bfa52736e4..3d864f315e 100644
--- a/go.mod
+++ b/go.mod
@@ -66,7 +66,7 @@ require (
 	github.com/jhillyerd/enmime v1.3.0
 	github.com/json-iterator/go v1.1.12
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
-	github.com/klauspost/compress v1.17.10
+	github.com/klauspost/compress v1.17.11
 	github.com/klauspost/cpuid/v2 v2.2.8
 	github.com/lib/pq v1.10.9
 	github.com/markbates/goth v1.80.0
diff --git a/go.sum b/go.sum
index a768979f17..a13e7ffb9b 100644
--- a/go.sum
+++ b/go.sum
@@ -446,8 +446,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0=
-github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c=

From 86bac2c54eae5527fe4e20cb10717ff7a4c593c4 Mon Sep 17 00:00:00 2001
From: Otto Richter 
Date: Sat, 12 Oct 2024 15:18:51 +0000
Subject: [PATCH 142/443] i18n: Improve translation strings for webhook events
 (#5537)

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5537
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Otto Richter 
Co-committed-by: Otto Richter 
---
 options/locale/locale_en-US.ini | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index c456da76bb..15267e4284 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2381,32 +2381,32 @@ settings.event_push_desc = Git push to a repository.
 settings.event_repository = Repository
 settings.event_repository_desc = Repository created or deleted.
 settings.event_header_issue = Issue events
-settings.event_issues = Issues
+settings.event_issues = Modifcation
 settings.event_issues_desc = Issue opened, closed, reopened, or edited.
-settings.event_issue_assign = Issue assigned
+settings.event_issue_assign = Assignment
 settings.event_issue_assign_desc = Issue assigned or unassigned.
-settings.event_issue_label = Issue labeled
-settings.event_issue_label_desc = Issue labels updated or cleared.
-settings.event_issue_milestone = Issue milestoned
-settings.event_issue_milestone_desc = Issue milestoned or demilestoned.
-settings.event_issue_comment = Issue comment
+settings.event_issue_label = Labels
+settings.event_issue_label_desc = Issue labels added or removed.
+settings.event_issue_milestone = Milestones
+settings.event_issue_milestone_desc = Milestone added, removed or modified.
+settings.event_issue_comment = Comments
 settings.event_issue_comment_desc = Issue comment created, edited, or deleted.
 settings.event_header_pull_request = Pull request events
-settings.event_pull_request = Pull request
+settings.event_pull_request = Modification
 settings.event_pull_request_desc = Pull request opened, closed, reopened, or edited.
-settings.event_pull_request_assign = Pull request assigned
+settings.event_pull_request_assign = Assignment
 settings.event_pull_request_assign_desc = Pull request assigned or unassigned.
-settings.event_pull_request_label = Pull request labeled
-settings.event_pull_request_label_desc = Pull request labels updated or cleared.
-settings.event_pull_request_milestone = Pull request milestoned
-settings.event_pull_request_milestone_desc = Pull request milestoned or demilestoned.
-settings.event_pull_request_comment = Pull request comment
+settings.event_pull_request_label = Labels
+settings.event_pull_request_label_desc = Pull request labels added or removed.
+settings.event_pull_request_milestone = Milestones
+settings.event_pull_request_milestone_desc = Milestone added, removed or modified.
+settings.event_pull_request_comment = Comments
 settings.event_pull_request_comment_desc = Pull request comment created, edited, or deleted.
-settings.event_pull_request_review = Pull request reviewed
-settings.event_pull_request_review_desc = Pull request approved, rejected, or review comment.
-settings.event_pull_request_sync = Pull request synchronized
-settings.event_pull_request_sync_desc = Pull request synchronized.
-settings.event_pull_request_review_request = Pull request review requested
+settings.event_pull_request_review = Reviews
+settings.event_pull_request_review_desc = Pull request approved, rejected, or review comments added.
+settings.event_pull_request_sync = Synchronized
+settings.event_pull_request_sync_desc = Branch updated automatically with target branch.
+settings.event_pull_request_review_request = Review requests
 settings.event_pull_request_review_request_desc = Pull request review requested or review request removed.
 settings.event_pull_request_approvals = Pull request approvals
 settings.event_pull_request_merge = Pull request merge

From dcae7d368c1ec3f5da8454672cfe5a3fd5c641d3 Mon Sep 17 00:00:00 2001
From: Michael Zhang 
Date: Fri, 11 Oct 2024 16:58:15 -0500
Subject: [PATCH 143/443] fix: use column flex on mobile to prevent project
 title from wrapping

---
 templates/projects/view.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index 564ec1b13d..08b08b95e5 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -1,7 +1,7 @@
 {{$canWriteProject := and .CanWriteProjects (or (not .Repository) (not .Repository.IsArchived))}}
 
 

-	

+	

 		
{{.Project.Title}}

 		{{if $canWriteProject}}
 			


From d6d55df24d026fe5cb423c5258187435b80f1728 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Sun, 13 Oct 2024 00:03:21 +0000
Subject: [PATCH 144/443] Update dependency vue to v3.5.12

---
 package-lock.json | 108 +++++++++++++++++++++++-----------------------
 package.json      |   2 +-
 2 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8ea76b3cf9..7e16a7ce05 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -51,7 +51,7 @@
         "tributejs": "5.1.3",
         "uint8-to-base64": "0.2.0",
         "vanilla-colorful": "0.7.2",
-        "vue": "3.5.11",
+        "vue": "3.5.12",
         "vue-chartjs": "5.3.1",
         "vue-loader": "17.4.2",
         "vue3-calendar-heatmap": "2.0.5",
@@ -5078,39 +5078,39 @@
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.5.11",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.11.tgz",
-      "integrity": "sha512-PwAdxs7/9Hc3ieBO12tXzmTD+Ln4qhT/56S+8DvrrZ4kLDn4Z/AMUr8tXJD0axiJBS0RKIoNaR0yMuQB9v9Udg==",
+      "version": "3.5.12",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.12.tgz",
+      "integrity": "sha512-ISyBTRMmMYagUxhcpyEH0hpXRd/KqDU4ymofPgl2XAkY9ZhQ+h0ovEZJIiPop13UmR/54oA2cgMDjgroRelaEw==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.25.3",
-        "@vue/shared": "3.5.11",
+        "@vue/shared": "3.5.12",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.2.0"
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.5.11",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.11.tgz",
-      "integrity": "sha512-pyGf8zdbDDRkBrEzf8p7BQlMKNNF5Fk/Cf/fQ6PiUz9at4OaUfyXW0dGJTo2Vl1f5U9jSLCNf0EZJEogLXoeew==",
+      "version": "3.5.12",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.12.tgz",
+      "integrity": "sha512-9G6PbJ03uwxLHKQ3P42cMTi85lDRvGLB2rSGOiQqtXELat6uI4n8cNz9yjfVHRPIu+MsK6TE418Giruvgptckg==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-core": "3.5.11",
-        "@vue/shared": "3.5.11"
+        "@vue/compiler-core": "3.5.12",
+        "@vue/shared": "3.5.12"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.11",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.11.tgz",
-      "integrity": "sha512-gsbBtT4N9ANXXepprle+X9YLg2htQk1sqH/qGJ/EApl+dgpUBdTv3yP7YlR535uHZY3n6XaR0/bKo0BgwwDniw==",
+      "version": "3.5.12",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.12.tgz",
+      "integrity": "sha512-2k973OGo2JuAa5+ZlekuQJtitI5CgLMOwgl94BzMCsKZCX/xiqzJYzapl4opFogKHqwJk34vfsaKpfEhd1k5nw==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.25.3",
-        "@vue/compiler-core": "3.5.11",
-        "@vue/compiler-dom": "3.5.11",
-        "@vue/compiler-ssr": "3.5.11",
-        "@vue/shared": "3.5.11",
+        "@vue/compiler-core": "3.5.12",
+        "@vue/compiler-dom": "3.5.12",
+        "@vue/compiler-ssr": "3.5.12",
+        "@vue/shared": "3.5.12",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.30.11",
         "postcss": "^8.4.47",
@@ -5127,63 +5127,63 @@
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.11",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.11.tgz",
-      "integrity": "sha512-P4+GPjOuC2aFTk1Z4WANvEhyOykcvEd5bIj2KVNGKGfM745LaXGr++5njpdBTzVz5pZifdlR1kpYSJJpIlSePA==",
+      "version": "3.5.12",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.12.tgz",
+      "integrity": "sha512-eLwc7v6bfGBSM7wZOGPmRavSWzNFF6+PdRhE+VFJhNCgHiF8AM7ccoqcv5kBXA2eWUfigD7byekvf/JsOfKvPA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.11",
-        "@vue/shared": "3.5.11"
+        "@vue/compiler-dom": "3.5.12",
+        "@vue/shared": "3.5.12"
       }
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.5.11",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.11.tgz",
-      "integrity": "sha512-Nqo5VZEn8MJWlCce8XoyVqHZbd5P2NH+yuAaFzuNSR96I+y1cnuUiq7xfSG+kyvLSiWmaHTKP1r3OZY4mMD50w==",
+      "version": "3.5.12",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.12.tgz",
+      "integrity": "sha512-UzaN3Da7xnJXdz4Okb/BGbAaomRHc3RdoWqTzlvd9+WBR5m3J39J1fGcHes7U3za0ruYn/iYy/a1euhMEHvTAg==",
       "license": "MIT",
       "dependencies": {
-        "@vue/shared": "3.5.11"
+        "@vue/shared": "3.5.12"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.5.11",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.11.tgz",
-      "integrity": "sha512-7PsxFGqwfDhfhh0OcDWBG1DaIQIVOLgkwA5q6MtkPiDFjp5gohVnJEahSktwSFLq7R5PtxDKy6WKURVN1UDbzA==",
+      "version": "3.5.12",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.12.tgz",
+      "integrity": "sha512-hrMUYV6tpocr3TL3Ad8DqxOdpDe4zuQY4HPY3X/VRh+L2myQO8MFXPAMarIOSGNu0bFAjh1yBkMPXZBqCk62Uw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.11",
-        "@vue/shared": "3.5.11"
+        "@vue/reactivity": "3.5.12",
+        "@vue/shared": "3.5.12"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.5.11",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.11.tgz",
-      "integrity": "sha512-GNghjecT6IrGf0UhuYmpgaOlN7kxzQBhxWEn08c/SQDxv1yy4IXI1bn81JgEpQ4IXjRxWtPyI8x0/7TF5rPfYQ==",
+      "version": "3.5.12",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.12.tgz",
+      "integrity": "sha512-q8VFxR9A2MRfBr6/55Q3umyoN7ya836FzRXajPB6/Vvuv0zOPL+qltd9rIMzG/DbRLAIlREmnLsplEF/kotXKA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.11",
-        "@vue/runtime-core": "3.5.11",
-        "@vue/shared": "3.5.11",
+        "@vue/reactivity": "3.5.12",
+        "@vue/runtime-core": "3.5.12",
+        "@vue/shared": "3.5.12",
         "csstype": "^3.1.3"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.5.11",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.11.tgz",
-      "integrity": "sha512-cVOwYBxR7Wb1B1FoxYvtjJD8X/9E5nlH4VSkJy2uMA1MzYNdzAAB//l8nrmN9py/4aP+3NjWukf9PZ3TeWULaA==",
+      "version": "3.5.12",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.12.tgz",
+      "integrity": "sha512-I3QoeDDeEPZm8yR28JtY+rk880Oqmj43hreIBVTicisFTx/Dl7JpG72g/X7YF8hnQD3IFhkky5i2bPonwrTVPg==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-ssr": "3.5.11",
-        "@vue/shared": "3.5.11"
+        "@vue/compiler-ssr": "3.5.12",
+        "@vue/shared": "3.5.12"
       },
       "peerDependencies": {
-        "vue": "3.5.11"
+        "vue": "3.5.12"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.5.11",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.11.tgz",
-      "integrity": "sha512-W8GgysJVnFo81FthhzurdRAWP/byq3q2qIw70e0JWblzVhjgOMiC2GyovXrZTFQJnFVryYaKGP3Tc9vYzYm6PQ==",
+      "version": "3.5.12",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.12.tgz",
+      "integrity": "sha512-L2RPSAwUFbgZH20etwrXyVyCBu9OxRSi8T/38QsvnkJyvq2LufW2lDCOzm7t/U9C1mkhJGWYfCuFBCmIuNivrg==",
       "license": "MIT"
     },
     "node_modules/@vue/test-utils": {
@@ -16317,16 +16317,16 @@
       "license": "MIT"
     },
     "node_modules/vue": {
-      "version": "3.5.11",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.11.tgz",
-      "integrity": "sha512-/8Wurrd9J3lb72FTQS7gRMNQD4nztTtKPmuDuPuhqXmmpD6+skVjAeahNpVzsuky6Sy9gy7wn8UadqPtt9SQIg==",
+      "version": "3.5.12",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.12.tgz",
+      "integrity": "sha512-CLVZtXtn2ItBIi/zHZ0Sg1Xkb7+PU32bJJ8Bmy7ts3jxXTcbfsEfBivFYYWz1Hur+lalqGAh65Coin0r+HRUfg==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.11",
-        "@vue/compiler-sfc": "3.5.11",
-        "@vue/runtime-dom": "3.5.11",
-        "@vue/server-renderer": "3.5.11",
-        "@vue/shared": "3.5.11"
+        "@vue/compiler-dom": "3.5.12",
+        "@vue/compiler-sfc": "3.5.12",
+        "@vue/runtime-dom": "3.5.12",
+        "@vue/server-renderer": "3.5.12",
+        "@vue/shared": "3.5.12"
       },
       "peerDependencies": {
         "typescript": "*"
diff --git a/package.json b/package.json
index 4603ab67e8..4d8c6261d9 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "tributejs": "5.1.3",
     "uint8-to-base64": "0.2.0",
     "vanilla-colorful": "0.7.2",
-    "vue": "3.5.11",
+    "vue": "3.5.12",
     "vue-chartjs": "5.3.1",
     "vue-loader": "17.4.2",
     "vue3-calendar-heatmap": "2.0.5",

From a7a577281a93b381b99be68d28914800d52ba355 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Sun, 13 Oct 2024 00:05:06 +0000
Subject: [PATCH 145/443] Update module github.com/minio/minio-go/v7 to v7.0.78

---
 go.mod | 4 ++--
 go.sum | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index bfa52736e4..90bf00a530 100644
--- a/go.mod
+++ b/go.mod
@@ -66,7 +66,7 @@ require (
 	github.com/jhillyerd/enmime v1.3.0
 	github.com/json-iterator/go v1.1.12
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
-	github.com/klauspost/compress v1.17.10
+	github.com/klauspost/compress v1.17.11
 	github.com/klauspost/cpuid/v2 v2.2.8
 	github.com/lib/pq v1.10.9
 	github.com/markbates/goth v1.80.0
@@ -75,7 +75,7 @@ require (
 	github.com/meilisearch/meilisearch-go v0.28.0
 	github.com/mholt/archiver/v3 v3.5.1
 	github.com/microcosm-cc/bluemonday v1.0.27
-	github.com/minio/minio-go/v7 v7.0.77
+	github.com/minio/minio-go/v7 v7.0.78
 	github.com/msteinert/pam v1.2.0
 	github.com/nektos/act v0.2.52
 	github.com/niklasfasching/go-org v1.7.0
diff --git a/go.sum b/go.sum
index a768979f17..fd879871ef 100644
--- a/go.sum
+++ b/go.sum
@@ -446,8 +446,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0=
-github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c=
@@ -500,8 +500,8 @@ github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
 github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
-github.com/minio/minio-go/v7 v7.0.77 h1:GaGghJRg9nwDVlNbwYjSDJT1rqltQkBFDsypWX1v3Bw=
-github.com/minio/minio-go/v7 v7.0.77/go.mod h1:AVM3IUN6WwKzmwBxVdjzhH8xq+f57JSbbvzqvUzR6eg=
+github.com/minio/minio-go/v7 v7.0.78 h1:LqW2zy52fxnI4gg8C2oZviTaKHcBV36scS+RzJnxUFs=
+github.com/minio/minio-go/v7 v7.0.78/go.mod h1:84gmIilaX4zcvAWWzJ5Z1WI5axN+hAbM5w25xf8xvC0=
 github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=

From d0af8fe4dc7b294fe5409b2271468494267d5a7d Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 7 Oct 2024 23:21:07 +0200
Subject: [PATCH 146/443] Allow filtering PRs by poster in the ListPullRequests
 API (#32209)

as title

---
*Sponsored by Kithara Software GmbH*

(cherry picked from commit bdd655f2bde5facada4394f36fe54e364787de7a)
---
 models/issues/pull_list.go     |  5 ++++
 routers/api/v1/repo/pull.go    | 42 ++++++++++++++++++++++++++--------
 templates/swagger/v1_json.tmpl | 25 +++++++++++++++-----
 3 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/models/issues/pull_list.go b/models/issues/pull_list.go
index f3970fa93b..123ff18d81 100644
--- a/models/issues/pull_list.go
+++ b/models/issues/pull_list.go
@@ -26,6 +26,7 @@ type PullRequestsOptions struct {
 	SortType    string
 	Labels      []int64
 	MilestoneID int64
+	PosterID    int64
 }
 
 func listPullRequestStatement(ctx context.Context, baseRepoID int64, opts *PullRequestsOptions) *xorm.Session {
@@ -46,6 +47,10 @@ func listPullRequestStatement(ctx context.Context, baseRepoID int64, opts *PullR
 		sess.And("issue.milestone_id=?", opts.MilestoneID)
 	}
 
+	if opts.PosterID > 0 {
+		sess.And("issue.poster_id=?", opts.PosterID)
+	}
+
 	return sess
 }
 
diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go
index bcb6ef2581..748ef18802 100644
--- a/routers/api/v1/repo/pull.go
+++ b/routers/api/v1/repo/pull.go
@@ -52,56 +52,79 @@ func ListPullRequests(ctx *context.APIContext) {
 	// parameters:
 	// - name: owner
 	//   in: path
-	//   description: owner of the repo
+	//   description: Owner of the repo
 	//   type: string
 	//   required: true
 	// - name: repo
 	//   in: path
-	//   description: name of the repo
+	//   description: Name of the repo
 	//   type: string
 	//   required: true
 	// - name: state
 	//   in: query
-	//   description: "State of pull request: open or closed (optional)"
+	//   description: State of pull request
 	//   type: string
-	//   enum: [closed, open, all]
+	//   enum: [open, closed, all]
+	//   default: open
 	// - name: sort
 	//   in: query
-	//   description: "Type of sort"
+	//   description: Type of sort
 	//   type: string
 	//   enum: [oldest, recentupdate, leastupdate, mostcomment, leastcomment, priority]
 	// - name: milestone
 	//   in: query
-	//   description: "ID of the milestone"
+	//   description: ID of the milestone
 	//   type: integer
 	//   format: int64
 	// - name: labels
 	//   in: query
-	//   description: "Label IDs"
+	//   description: Label IDs
 	//   type: array
 	//   collectionFormat: multi
 	//   items:
 	//     type: integer
 	//     format: int64
+	// - name: poster
+	//   in: query
+	//   description: Filter by pull request author
+	//   type: string
 	// - name: page
 	//   in: query
-	//   description: page number of results to return (1-based)
+	//   description: Page number of results to return (1-based)
 	//   type: integer
+	//   minimum: 1
+	//   default: 1
 	// - name: limit
 	//   in: query
-	//   description: page size of results
+	//   description: Page size of results
 	//   type: integer
+	//   minimum: 0
 	// responses:
 	//   "200":
 	//     "$ref": "#/responses/PullRequestList"
 	//   "404":
 	//     "$ref": "#/responses/notFound"
+	//   "500":
+	//     "$ref": "#/responses/error"
 
 	labelIDs, err := base.StringsToInt64s(ctx.FormStrings("labels"))
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "PullRequests", err)
 		return
 	}
+	var posterID int64
+	if posterStr := ctx.FormString("poster"); posterStr != "" {
+		poster, err := user_model.GetUserByName(ctx, posterStr)
+		if err != nil {
+			if user_model.IsErrUserNotExist(err) {
+				ctx.Error(http.StatusBadRequest, "Poster not found", err)
+			} else {
+				ctx.Error(http.StatusInternalServerError, "GetUserByName", err)
+			}
+			return
+		}
+		posterID = poster.ID
+	}
 	listOptions := utils.GetListOptions(ctx)
 	prs, maxResults, err := issues_model.PullRequests(ctx, ctx.Repo.Repository.ID, &issues_model.PullRequestsOptions{
 		ListOptions: listOptions,
@@ -109,6 +132,7 @@ func ListPullRequests(ctx *context.APIContext) {
 		SortType:    ctx.FormTrim("sort"),
 		Labels:      labelIDs,
 		MilestoneID: ctx.FormInt64("milestone"),
+		PosterID:    posterID,
 	})
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "PullRequests", err)
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 8c4e7eaf8b..3163481647 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -12295,26 +12295,27 @@
         "parameters": [
           {
             "type": "string",
-            "description": "owner of the repo",
+            "description": "Owner of the repo",
             "name": "owner",
             "in": "path",
             "required": true
           },
           {
             "type": "string",
-            "description": "name of the repo",
+            "description": "Name of the repo",
             "name": "repo",
             "in": "path",
             "required": true
           },
           {
             "enum": [
-              "closed",
               "open",
+              "closed",
               "all"
             ],
             "type": "string",
-            "description": "State of pull request: open or closed (optional)",
+            "default": "open",
+            "description": "State of pull request",
             "name": "state",
             "in": "query"
           },
@@ -12351,14 +12352,23 @@
             "in": "query"
           },
           {
+            "type": "string",
+            "description": "Filter by pull request author",
+            "name": "poster",
+            "in": "query"
+          },
+          {
+            "minimum": 1,
             "type": "integer",
-            "description": "page number of results to return (1-based)",
+            "default": 1,
+            "description": "Page number of results to return (1-based)",
             "name": "page",
             "in": "query"
           },
           {
+            "minimum": 0,
             "type": "integer",
-            "description": "page size of results",
+            "description": "Page size of results",
             "name": "limit",
             "in": "query"
           }
@@ -12369,6 +12379,9 @@
           },
           "404": {
             "$ref": "#/responses/notFound"
+          },
+          "500": {
+            "$ref": "#/responses/error"
           }
         }
       },

From eff28911d32d844230bb016834fbfac055efc7a1 Mon Sep 17 00:00:00 2001
From: cloudchamb3r 
Date: Wed, 9 Oct 2024 02:27:05 +0900
Subject: [PATCH 147/443] Add null check for responseData.invalidTopics
 (#32212)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Screenshot 2024-10-08 at 10 49 10 AM

`responseData.invalidTopics` can be null but it wasn't handled.

(cherry picked from commit 2e12343fc4ca96a215d6820c4467b619eaa5cbe9)
---
 web_src/js/features/repo-home.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/features/repo-home.js b/web_src/js/features/repo-home.js
index 6a5bce8268..3031432c93 100644
--- a/web_src/js/features/repo-home.js
+++ b/web_src/js/features/repo-home.js
@@ -60,7 +60,7 @@ export function initRepoTopicBar() {
       // how to test: input topic like " invalid topic " (with spaces), and select it from the list, then "Save"
       const responseData = await response.json();
       lastErrorToast = showErrorToast(responseData.message, {duration: 5000});
-      if (responseData.invalidTopics.length > 0) {
+      if (responseData.invalidTopics && responseData.invalidTopics.length > 0) {
         const {invalidTopics} = responseData;
         const topicLabels = queryElemChildren(topicDropdown, 'a.ui.label');
         for (const [index, value] of topics.split(',').entries()) {

From 7855e4bb56e2379c96e981ab179aec1b9a9ac9fc Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Sun, 13 Oct 2024 10:13:04 +0300
Subject: [PATCH 148/443] Improve the maintainblity of the reserved username
 list (#32229)

(cherry picked from commit 6029d78ab5006e8fb4f42adb5a8c491f19fa7b0a)

Conflicts:
  models/user/user.go
	services/user/user_test.go
    trivial context conflict
	tests/integration/user_test.go
    discarded entirely because dot may be allowed in Forgejo under
    some conditions
---
 models/user/user.go            | 70 +++++++++++++++++-----------------
 services/user/user_test.go     |  8 ++--
 tests/integration/user_test.go |  7 ----
 3 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/models/user/user.go b/models/user/user.go
index 382c6955f7..c538d56ed1 100644
--- a/models/user/user.go
+++ b/models/user/user.go
@@ -586,44 +586,46 @@ var (
 		".",
 		"..",
 		".well-known",
-		"admin",
-		"api",
-		"assets",
-		"attachments",
-		"avatar",
-		"avatars",
-		"captcha",
-		"commits",
-		"debug",
-		"devtest",
-		"error",
-		"explore",
-		"favicon.ico",
-		"ghost",
-		"issues",
-		"login",
-		"manifest.json",
-		"metrics",
-		"milestones",
-		"new",
-		"notifications",
-		"org",
-		"pulls",
-		"raw",
-		"repo",
+
+		"api",     // gitea api
+		"metrics", // prometheus metrics api
+		"v2",      // container registry api
+
+		"assets",      // static asset files
+		"attachments", // issue attachments
+
+		"avatar",  // avatar by email hash
+		"avatars", // user avatars by file name
 		"repo-avatars",
-		"robots.txt",
-		"search",
-		"serviceworker.js",
-		"ssh_info",
+
+		"captcha",
+		"login", // oauth2 login
+		"org",   // org create/manage, or "/org/{org}", BUT if an org is named as "invite" then it goes wrong
+		"repo",  // repo create/migrate, etc
+		"user",  // user login/activate/settings, etc
+
+		"admin",
+		"devtest",
+		"explore",
+		"issues",
+		"pulls",
+		"milestones",
+		"notifications",
+
+		"favicon.ico",
+		"manifest.json", // web app manifests
+		"robots.txt",    // search engine robots
+		"sitemap.xml",   // search engine sitemap
+		"ssh_info",      // agit info
 		"swagger.v1.json",
-		"user",
-		"v2",
-		"gitea-actions",
-		"forgejo-actions",
+
+		"ghost",           // reserved name for deleted users (id: -1)
+		"gitea-actions",   // gitea builtin user (id: -2)
+		"forgejo-actions", // forgejo builtin user (id: -2)
 	}
 
-	// DON'T ADD ANY NEW STUFF, WE SOLVE THIS WITH `/user/{obj}` PATHS!
+	// These names are reserved for user accounts: user's keys, user's rss feed, user's avatar, etc.
+	// DO NOT add any new stuff! The paths with these names are processed by `/{username}` handler (UsernameSubRoute) manually.
 	reservedUserPatterns = []string{"*.keys", "*.gpg", "*.rss", "*.atom", "*.png"}
 )
 
diff --git a/services/user/user_test.go b/services/user/user_test.go
index 45bf1e6993..edd8d5020c 100644
--- a/services/user/user_test.go
+++ b/services/user/user_test.go
@@ -114,12 +114,10 @@ func TestRenameUser(t *testing.T) {
 	})
 
 	t.Run("Non usable username", func(t *testing.T) {
-		usernames := []string{"--diff", "aa.png", ".well-known", "search", "aaa.atom"}
+		usernames := []string{"--diff", ".well-known", "gitea-actions", "aaa.atom", "aa.png"}
 		for _, username := range usernames {
-			t.Run(username, func(t *testing.T) {
-				require.Error(t, user_model.IsUsableUsername(username))
-				require.Error(t, RenameUser(db.DefaultContext, user, username))
-			})
+			require.Error(t, user_model.IsUsableUsername(username), "non-usable username: %s", username)
+			require.Error(t, RenameUser(db.DefaultContext, user, username), "non-usable username: %s", username)
 		}
 	})
 
diff --git a/tests/integration/user_test.go b/tests/integration/user_test.go
index 73976b9a35..3ea2761d11 100644
--- a/tests/integration/user_test.go
+++ b/tests/integration/user_test.go
@@ -114,10 +114,7 @@ func TestRenameReservedUsername(t *testing.T) {
 		"avatar",
 		"avatars",
 		"captcha",
-		"commits",
-		"debug",
 		"devtest",
-		"error",
 		"explore",
 		"favicon.ico",
 		"ghost",
@@ -126,16 +123,12 @@ func TestRenameReservedUsername(t *testing.T) {
 		"manifest.json",
 		"metrics",
 		"milestones",
-		"new",
 		"notifications",
 		"org",
 		"pulls",
-		"raw",
 		"repo",
 		"repo-avatars",
 		"robots.txt",
-		"search",
-		"serviceworker.js",
 		"ssh_info",
 		"swagger.v1.json",
 		"user",

From 68aa530fb2bacdc2770c364d6cd0f7247fb8ed9c Mon Sep 17 00:00:00 2001
From: cloudchamb3r 
Date: Fri, 11 Oct 2024 02:12:27 +0900
Subject: [PATCH 149/443] Fix checkbox bug on private/archive filter (#32236)

fix #32235

---------

Co-authored-by: wxiaoguang 
(cherry picked from commit cb739f533358a8cf6e1b6875b3d4f0da3bfa7c95)
---
 web_src/js/components/DashboardRepoList.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue
index e5874133b1..007891a39f 100644
--- a/web_src/js/components/DashboardRepoList.vue
+++ b/web_src/js/components/DashboardRepoList.vue
@@ -358,9 +358,9 @@ export default sfc; // activate the IDE's Vue plugin
             

               
                 

-                  
-                  
+                  
                   
               
                 

-                  
+                  
                   %[2]s
 migrated_from_fake=Migriert von %[1]s
 migrate.migrate=Migrieren von %s
-migrate.migrating=Migriere von %s ...
+migrate.migrating=Migriere von %s …
 migrate.migrating_failed=Migrieren von %s fehlgeschlagen.
 migrate.migrating_failed.error=Migration fehlgeschlagen: %s
 migrate.migrating_failed_no_addr=Migration fehlgeschlagen.
 migrate.github.description=Daten von github.com oder GitHub-Enterprise-Server migrieren.
-migrate.git.description=Ein Repository von einem beliebigen Git Service klonen.
+migrate.git.description=Ein Repository von einem beliebigen Git-Service klonen.
 migrate.gitlab.description=Daten von gitlab.com oder anderen GitLab-Instanzen migrieren.
 migrate.gitea.description=Daten von gitea.com oder anderen Gitea-Instanzen migrieren.
 migrate.gogs.description=Daten von notabug.org oder anderen Gogs-Instanzen migrieren.
@@ -1276,7 +1276,7 @@ org_labels_desc_manage=verwalten
 milestones=Meilensteine
 commits=Commits
 commit=Commit
-release=Erscheinungsdatum
+release=Release
 releases=Releases
 tag=Tag
 released_this=hat released
@@ -1300,7 +1300,7 @@ ambiguous_character=`%[1]c [U+%04[1]X] kann mit %[2]c [U+%04[2]X] verwechselt we
 escape_control_characters=Escapen
 unescape_control_characters=Unescapen
 file_copy_permalink=Permalink kopieren
-view_git_blame=Git Blame ansehen
+view_git_blame=„git blame“ ansehen
 video_not_supported_in_browser=Dein Browser unterstützt das HTML5-„video“-Tag nicht.
 audio_not_supported_in_browser=Dein Browser unterstützt das HTML5-„audio“-Tag nicht.
 stored_lfs=Gespeichert mit Git LFS
@@ -1317,7 +1317,7 @@ commit.load_referencing_branches_and_tags=Lade Branches und Tags, die diesen Com
 blame=Blame
 download_file=Datei herunterladen
 normal_view=Normale Ansicht
-line=zeile
+line=Zeile
 lines=Zeilen
 from_comment=(Kommentar)
 
@@ -1522,7 +1522,7 @@ issues.remove_milestone_at=`hat dieses Issue %[2]s vom %[1]s Meilenstein
 issues.remove_project_at=`hat dies vom Projekt %s %s entfernt`
 issues.deleted_milestone=`(gelöscht)`
 issues.deleted_project=`(gelöscht)`
-issues.self_assign_at=`hat sich das Issue %s selbst zugewiesen`
+issues.self_assign_at=`hat sich %s selbst zugewiesen`
 issues.add_assignee_at=`wurde von %s %s zugewiesen`
 issues.remove_assignee_at=`wurde von %s von der Zuweisung %s befreit`
 issues.remove_self_assignment=`hat die Selbstzuweisung %s entfernt`
@@ -1648,7 +1648,7 @@ issues.label_archive_tooltip=Archivierte Labels werden bei der Suche nach Labels
 issues.label_exclusive_desc=Nenn das Label Bereich/Element, um es gegenseitig ausschließend mit anderen Bereich/-Labels zu machen.
 issues.label_exclusive_warning=Alle im Konflikt stehenden Labels werden beim Bearbeiten der Labels eines Issues oder eines Pull-Requests entfernt.
 issues.label_count=%d Labels
-issues.label_open_issues=%d offene Issues
+issues.label_open_issues=%d offene Issues/Pull-Requests
 issues.label_edit=Bearbeiten
 issues.label_delete=Löschen
 issues.label_modify=Label bearbeiten
@@ -1852,7 +1852,7 @@ pulls.still_in_progress=Noch in Bearbeitung?
 pulls.add_prefix=Präfix „%s“ hinzufügen
 pulls.remove_prefix=Präfix „%s“ entfernen
 pulls.data_broken=Dieser Pull-Requests ist kaputt, da Fork-Informationen gelöscht wurden.
-pulls.files_conflicted=Dieser Pull-Request hat Änderungen, die im Widerspruch zum Ziel-Branch stehen.
+pulls.files_conflicted=Dieser Pull-Request hat Änderungen, die Konflikte mit dem Ziel-Branch haben.
 pulls.is_checking=Die Merge-Konfliktprüfung läuft noch. Bitte aktualisiere die Seite in wenigen Augenblicken.
 pulls.is_ancestor=Dieser Branch ist bereits im Zielbranch enthalten. Es existiert nichts zusammenzuführen.
 pulls.is_empty=Die Änderungen an diesem Branch sind bereits auf dem Zielbranch. Dies wird ein leerer Commit sein.
@@ -2309,32 +2309,32 @@ settings.event_push_desc=Git push in ein Repository.
 settings.event_repository=Repository
 settings.event_repository_desc=Repository erstellt oder gelöscht.
 settings.event_header_issue=Issue-Ereignisse
-settings.event_issues=Issues
+settings.event_issues=Änderung
 settings.event_issues_desc=Issue geöffnet, geschlossen, wieder geöffnet oder bearbeitet.
-settings.event_issue_assign=Issue zugewiesen
+settings.event_issue_assign=Zuweisung
 settings.event_issue_assign_desc=Issue zugewiesen oder Zuweisung entfernt.
-settings.event_issue_label=Issue mit Label versehen
-settings.event_issue_label_desc=Issue-Labels aktualisiert oder geleert.
-settings.event_issue_milestone=Meilenstein einem Issue zugewiesen
-settings.event_issue_milestone_desc=Meilenstein zu Issue hinzugefügt oder entfernt.
-settings.event_issue_comment=Issue-Kommentar
+settings.event_issue_label=Labels
+settings.event_issue_label_desc=Issue-Labels hinzugefügt oder entfernt.
+settings.event_issue_milestone=Meilensteine
+settings.event_issue_milestone_desc=Meilenstein hinzugefügt, entfernt oder verändert.
+settings.event_issue_comment=Kommentare
 settings.event_issue_comment_desc=Issue-Kommentar angelegt, geändert oder gelöscht.
 settings.event_header_pull_request=Pull-Request-Ereignisse
-settings.event_pull_request=Pull-Request
+settings.event_pull_request=Änderung
 settings.event_pull_request_desc=Pull-Request geöffnet, geschlossen, wieder geöffnet oder bearbeitet.
-settings.event_pull_request_assign=Pull-Request zugewiesen
+settings.event_pull_request_assign=Zuweisung
 settings.event_pull_request_assign_desc=Pull-Request zugewiesen oder Zuweisung entfernt.
-settings.event_pull_request_label=Pull-Request mit Label versehen
-settings.event_pull_request_label_desc=Pull-Request-Labels aktualisiert oder geleert.
-settings.event_pull_request_milestone=Pull-Request zum Meilenstein hinzugefügt
-settings.event_pull_request_milestone_desc=Pull-Request zum Meilenstein hinzugefügt oder entfernt.
-settings.event_pull_request_comment=Pull-Request-Kommentar
+settings.event_pull_request_label=Labels
+settings.event_pull_request_label_desc=Pull-Request-Labels hinzugefügt oder entfernt.
+settings.event_pull_request_milestone=Meilensteine
+settings.event_pull_request_milestone_desc=Meilenstein hinzugefügt, entfernt oder bearbeitet.
+settings.event_pull_request_comment=Kommentare
 settings.event_pull_request_comment_desc=Pull-Request-Kommentar angelegt, geändert oder gelöscht.
-settings.event_pull_request_review=Pull-Request überprüft
-settings.event_pull_request_review_desc=Pull-Request genehmigt, abgelehnt oder Kommentar hinterlassen.
-settings.event_pull_request_sync=Pull-Request synchronisiert
-settings.event_pull_request_sync_desc=Pull-Request synchronisiert.
-settings.event_pull_request_review_request=Überprüfung des Pull-Requests angefragt
+settings.event_pull_request_review=Reviews
+settings.event_pull_request_review_desc=Pull-Request genehmigt, abgelehnt oder Review-Kommentare hinterlassen.
+settings.event_pull_request_sync=Synchronisiert
+settings.event_pull_request_sync_desc=Branch automatisch mit Zielbranch aktualisiert.
+settings.event_pull_request_review_request=Review-Anfragen
 settings.event_pull_request_review_request_desc=Überprüfung des Pull-Requests angefragt oder die Anfrage entfernt.
 settings.event_pull_request_approvals=Genehmigungen zum Pull-Request
 settings.event_pull_request_merge=Pull-Request-Merge
@@ -2504,7 +2504,7 @@ settings.lfs_invalid_locking_path=Ungültiger Pfad: %s
 settings.lfs_invalid_lock_directory=Verzeichnis kann nicht gesperrt werden: %s
 settings.lfs_lock_already_exists=Sperre existiert bereits: %s
 settings.lfs_lock=Sperren
-settings.lfs_lock_path=Zu sperrender Dateipfad...
+settings.lfs_lock_path=Zu sperrender Dateipfad …
 settings.lfs_locks_no_locks=Keine Sperren
 settings.lfs_lock_file_no_exist=Gesperrte Datei existiert nicht im Standard-Branch
 settings.lfs_force_unlock=Freigabe erzwingen
@@ -2685,7 +2685,7 @@ rss.must_be_on_branch = Du musst auf einem Branch sein, um einen RSS-Feed zu hab
 new_repo_helper = Ein Repository enthält alle Projektdateien inklusive der Revisionshistorie. Bereits woanders gehostet? Repository migrieren.
 issues.comment.blocked_by_user = Du kannst kein Kommentar für dieses Issue erstellen, weil du vom Repository-Besitzer oder dem Autoren des Issues blockiert wurdest.
 clone_in_vscodium = In VSCodium klonen
-settings.units.add_more = Mehr hinzufügen …
+settings.units.add_more = Mehr aktivieren
 settings.wiki_rename_branch_main_desc = Den Branch, der intern vom Wiki benutzt wird, zu „%s“ umbenennen. Dies ist permanent und kann nicht rückgängig gemacht werden.
 desc.sha256 = SHA256
 object_format_helper = Objektformat des Repositorys. Kann später nicht geändert werden. SHA1 ist am kompatibelsten.
@@ -2728,7 +2728,7 @@ pulls.fast_forward_only_merge_pull_request = Nur Fast-forward
 pulls.cmd_instruction_checkout_desc = Checke einen neuen Branch aus deinem Projekt-Repository aus und teste die Änderungen.
 pulls.cmd_instruction_merge_title = Zusammenführen
 pulls.cmd_instruction_merge_desc = Die Änderungen zusammenführen und auf Forgejo aktualisieren.
-settings.units.units = Repository-Einheiten
+settings.units.units = Einheiten
 settings.units.overview = Übersicht
 settings.wiki_rename_branch_main_notices_1 = Diese Aktion KANN NICHT rückgängig gemacht werden.
 settings.wiki_rename_branch_main_notices_2 = Dies wird den internen Branch des Repository-Wikis von %s permanent umbenennen. Existierende Checkouts müssen aktualisiert werden.
@@ -2829,6 +2829,7 @@ settings.mirror_settings.push_mirror.copy_public_key = Öffentlichen Schlüssel
 mirror_use_ssh.not_available = SSH-Authentifizierung ist nicht verfügbar.
 issues.new.assign_to_me = Mir selbst zuweisen
 issues.all_title = Alle
+settings.discord_icon_url.exceeds_max_length = Die Icon-URL darf eine Länge von 2048 Zeichen nicht überschreiten
 
 [graphs]
 
@@ -3268,12 +3269,12 @@ auths.tip.bitbucket=Registriere einen neuen OAuth-Consumer unter %s
 auths.tip.nextcloud=Registriere einen neuen OAuth-Consumer auf deiner Instanz über das folgende Menü: „Settings -> Security -> OAuth 2.0 client“
 auths.tip.dropbox=Erstelle eine neue App auf %s
 auths.tip.facebook=Erstelle eine neue Anwendung auf %s und füge das Produkt „Facebook Login“ hinzu
-auths.tip.github=Erstelle unter %s eine neue OAuth-Anwendung.
+auths.tip.github=Registriere unter %s eine neue OAuth-Anwendung
 auths.tip.gitlab=Erstelle unter https://gitlab.com/profile/applications eine neue Anwendung.
 auths.tip.google_plus=Du erhältst die OAuth2-Client-Zugangsdaten in der Google-API-Konsole unter %s
 auths.tip.openid_connect=Benutze die OpenID-Connect-Discovery-URL (/.well-known/openid-configuration), um die Endpunkte zu spezifizieren
 auths.tip.twitter=Gehe auf %s, erstelle eine Anwendung und stelle sicher, dass die Option „Allow this application to be used to Sign in with Twitter“ aktiviert ist
-auths.tip.discord=Erstelle unter %s eine neue Anwendung.
+auths.tip.discord=Registriere unter %s eine neue Anwendung
 auths.tip.gitea=Registriere eine neue OAuth2-Anwendung. Eine Anleitung findest du unter %s
 auths.tip.yandex=`Erstelle eine neue Anwendung auf %s. Wähle folgende Berechtigungen aus dem Abschnitt „Yandex.Passport API“: „Zugriff auf E-Mail-Adresse“, „Zugriff auf Benutzeravatar“ und „Zugriff auf Benutzername, Vor- und Nachname, Geschlecht“`
 auths.tip.mastodon=Gib eine benutzerdefinierte URL für die Mastodon-Instanz ein, mit der du dich authentifizieren möchtest (oder benutze die standardmäßige)
diff --git a/options/locale/locale_eo.ini b/options/locale/locale_eo.ini
index 5210c2c428..1c36206eb1 100644
--- a/options/locale/locale_eo.ini
+++ b/options/locale/locale_eo.ini
@@ -468,7 +468,7 @@ link_not_working_do_paste = ĉu ne funkcias? Provu kopii kaj alglui al via retfo
 repo.transfer.body = Akceptu per vizito al %s, malakceptu per malatento.
 team_invite.text_3 = Noto: Ĉi tiu invito estas alcelita al %[1]s. Se vi ne atendis tiun ĉi invito, vi povus simple malatenti tiun ĉi retletero.
 repo.collaborator.added.subject = %s aldonis vin al %3
-team_invite.subject = %[1]s invitis vin aliĝi la organizaĵon %[2]
+team_invite.subject = %[1]s invitis vin aliĝi la organizaĵon %[2]s
 reset_password.text = Bonvolu klaki la sekvontan ligilon por rehavigi vian konton ĝis %:
 issue.action.reopen = @%[1]s remalfermis #%[2]d.
 issue.action.approve = @%[1]s aprobis tiun ĉi tirpeton.
diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini
index f1e109c953..a9e150a7cb 100644
--- a/options/locale/locale_fa-IR.ini
+++ b/options/locale/locale_fa-IR.ini
@@ -26,11 +26,11 @@ return_to_forgejo=بازگشت به Forgejo
 username=نام کاربری
 email=نشانی رایانامه
 password=رمز عبور
-access_token=ژتون دسترسی
+access_token=توکن دسترسی
 re_type=تأیید گذرواژه
 captcha=کپچا
 twofa=احراز هویت دو مرحله‌ای
-twofa_scratch=کد احراز هویت
+twofa_scratch=کد احراز هویت دو محله ای
 passcode=رمز عبور
 
 
@@ -40,7 +40,7 @@ mirror=قرینه
 new_repo=مخزن جدید
 new_migrate=انتقال جدید
 new_mirror=آینه جدید
-new_fork=انشعاب مخزن جدید
+new_fork=انشعاب جدید از مخزن
 new_org=سازمان جدید
 new_project=پروژه جدید
 manage_org=مدیریت سازمان‌ها
@@ -118,7 +118,21 @@ unpin = حذف سنجاق
 locked = قفل شده
 copy_hash = رونوشت هش
 unknown = نامشخص
-copy_type_unsupported = این نوع از فایل نمی‌تواند رونوشت شود.
+copy_type_unsupported = این نوع از فایل نمی‌تواند رونوشت شود
+webauthn_insert_key = کلید امنیتی خود را وارد کنید
+webauthn_sign_in = دکمۀ روی کلید امنیتی را فشار دهید. اگر کلید امنیتی شما دکمه‌ای ندارد، آن را دوباره وارد کنید.
+webauthn_use_twofa = از یک کد دومرحله‌ای از تلفنتان استفاده کنید
+webauthn_error = کلید امنیتی شما نتوانست خوانده شود.
+more_items = موارد بیشتر
+webauthn_error_duplicated = کلید امنیتی برای این درخواست مجاز نیست. لطفاً مطمئن شوید که این کلید در حال حاضر ثبت نشده است.
+webauthn_error_timeout = مهلت زمانی قبل از اینکه کلید شما خوانده شود تمام شد. لطفاً این صفحه را تازه‌سازی کرده و مجدد تلاش کنید.
+new_org.link = سازمان جدید
+new_org.title = سازمان جدید
+new_migrate.link = مهاجرت جدید
+webauthn_error_empty = شما باید یک نام برای این کلید انتخاب کنید.
+new_repo.title = مخزن جدید
+new_migrate.title = مهاجرت جدید
+new_repo.link = مخزن جدید
 
 [aria]
 
@@ -204,7 +218,7 @@ offline_mode.description=غیر فعال کردن شبکه های شخص ثال
 disable_gravatar=غیر فعال کردن Gravatar
 disable_gravatar.description=غیر فعال کردن کلیک و منابع آواتار شخص ثالث. مگر در مواردی که کاربر محلی بارگزاری آواتار پیش فرض استفاده خواهد شد.
 federated_avatar_lookup=فعال سازی آواتار مشترک
-federated_avatar_lookup.description=مراجعه مشترک آواتار با استفاده از Libravatar را قادر می سازد.
+federated_avatar_lookup.description=پیدا کردن آواتار با استفاده از Libravatar.
 disable_registration=غیرفعال‌کردن خود ثبت نامی
 disable_registration.description=غیرفعال کردن ثبت نام کاربر. تنها مدیر ها قادر خواهند بود حساب کاربری جدید اضافه کنند.
 allow_only_external_registration.description=اجازه ثبت نام فقط از طریق خدمات خارجی
@@ -594,7 +608,7 @@ ssh_helper=آیا نمی دانید چگونه؟راهنمای
 gpg_helper=به کمک نیاز دارید؟ نگاهی به در GitHub را راهنمای مورد GPG است.
 add_new_key=اضافه کردن کلید SSH
 add_new_gpg_key=اضافه کردن کلید GPG
-key_content_ssh_placeholder=معمولا با  'ssh-ed25519', 'ssh-rsa', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', 'ecdsa-sha2-nistp521', 'sk-ecdsa-sha2-nistp256@openssh.com',  یا 'sk-ssh-ed25519@openssh.com' شروع می‌شود.
+key_content_ssh_placeholder=معمولا با 'ssh-ed25519', 'ssh-rsa', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', 'ecdsa-sha2-nistp521', 'sk-ecdsa-sha2-nistp256@openssh.com', یا 'sk-ssh-ed25519@openssh.com' شروع می‌شود.
 key_content_gpg_placeholder=با عبارت -----BEGIN PGP PUBLIC KEY BLOCK----- شروع می‌شود
 add_new_principal=یک کلید اصلی اضافه کنید
 ssh_key_been_used=این کلید SSH پیش از این به سرور افزوده شده است.
@@ -667,7 +681,7 @@ manage_oauth2_applications=مدیریت برنامه‎های OAuth2
 edit_oauth2_application=ویرایش برنامه OAuth2
 oauth2_applications_desc=برنامه‎های OAuth2 احراز هویت برنامه های شخص ثالث را با بستری امن میسر می‎کند.
 remove_oauth2_application=حذف برنامه OAuth2
-remove_oauth2_application_desc=حذف برنامه OAuth2  دسترسی تمام برنامه های متصل با آن را از بین می‎برد. آیا ادامه می‎دهید؟
+remove_oauth2_application_desc=حذف برنامه OAuth2 دسترسی تمام برنامه های متصل با آن را از بین می‎برد. آیا ادامه می‎دهید؟
 remove_oauth2_application_success=برنامه حذف شده است.
 create_oauth2_application=ساختن یک برنامه OAuth2 جدید
 create_oauth2_application_button=ایجاد برنامه
@@ -1440,7 +1454,7 @@ wiki.page=صفحه
 wiki.filter_page=صافی صفحه
 wiki.new_page=صفحه
 wiki.default_commit_message=نوشتن متنی پیرامون به‌روزرسانی این صفحه (اختیاری).
-wiki.save_page=نوشتن متنی پیرامون  به‌روزرسانی این صفحه (اختیاری).
+wiki.save_page=ذخیره صفحه
 wiki.last_commit_info=%s این صفحه %s را ویرایش کرده است
 wiki.edit_page_button=ویرایش
 wiki.new_page_button=صفحه جدید
@@ -2633,13 +2647,31 @@ runners.task_list.commit=کامیت
 runners.status.active=فعال
 
 runs.commit=کامیت
+variables.edit = تغییر متغیر
+variables.deletion.success = متغیر حذف شد.
+variables.deletion = حذف متغیر
+variables.creation.success = متغیر "%s" ایجاد شد.
+variables = متغیرها
+variables.management = مدیریت متغیرها
+variables.update.failed = عدم موفقیت در تغییر متغیر
+variables.update.success = تغییر متغیر با موفقیت انجام شد.
+variables.creation = افزودن متغیر
+variables.none = هیچ متغیری هنوز وجود ندارد.
 
 
 
 
 [projects]
+type-1.display_name = پروژه ی مستقل
+type-2.display_name = مخزن پروژه
+type-3.display_name = سازمان پروژه
+deleted.display_name = پاک کردن پروژه
 
 [git.filemode]
 ; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", …
 symbolic_link=پیوند نمادین
+executable_file = فایل اجرایی
+normal_file = فایل معمولی
+changed_filemode = %[1] ها ← %[2] ها
+directory = پوشه
 
diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini
index 2fb63b50c0..af6f20a305 100644
--- a/options/locale/locale_fi-FI.ini
+++ b/options/locale/locale_fi-FI.ini
@@ -158,13 +158,16 @@ confirm_delete_artifact = Oletko varma, että haluat poistaa artifaktin "%s" ?
 new_migrate.title = Uusi migraatio
 test = Testi
 concept_system_global = Globaali
+sign_in_with_provider = Kirjaudu %s-tilillä
 
 [aria]
 footer.links = Linkit
+navbar = Navigaatiopalkki
 
 [heatmap]
 less = Vähemmän
 more = Enemmän
+number_of_contributions_in_the_last_12_months = %s kontribuutiota viimeisimmän vuoden aikana
 
 [editor]
 buttons.code.tooltip = Lisää koodia
@@ -172,6 +175,13 @@ buttons.link.tooltip = Lisää linkki
 buttons.mention.tooltip = Mainitse käyttäjä tai tiimi
 buttons.list.task.tooltip = Lisää tehtävälista
 buttons.disable_monospace_font = Poista tasalevyinen fontti käytöstä
+buttons.heading.tooltip = Lisää otsikko
+buttons.bold.tooltip = Lisää lihavoitua tekstiä
+buttons.italic.tooltip = Lisää kursivoitua tekstiä
+buttons.list.unordered.tooltip = Lisää järjestämätön lista
+buttons.list.ordered.tooltip = Lisää numeroitu lista
+buttons.switch_to_legacy.tooltip = Käytä vanhentunutta tekstieditoria
+buttons.indent.tooltip = Sisennä yhden tason verran
 
 [filter]
 string.asc = A - Ö
@@ -183,6 +193,7 @@ missing_csrf=Virheellinen pyyntö: CSRF-tunnusta ei ole olemassa
 invalid_csrf=Virheellinen pyyntö: Virheellinen CSRF-tunniste
 not_found=Kohdetta ei löytynyt.
 network_error=Verkkovirhe
+server_internal = Palvelinvirhe
 
 [startpage]
 app_desc=Kivuton, itsehostattu Git-palvelu
@@ -199,8 +210,8 @@ install=Asennus
 title=Alkuperäiset asetukset
 docker_helper=Jos ajat Forgejoa Dockerin sisällä, lue ohjeet ennen minkään asetuksen muuttamista.
 require_db_desc=Forgejo tarvitsee toimiakseen MySQL, PostgreSQL, SQLite3 tai TiDB (MySQL protokolla) tietokannan.
-db_title=Tietokanta asetukset
-db_type=Tietokanta tyyppi
+db_title=Tietokanta-asetukset
+db_type=Tietokantatyyppi
 host=Isäntä
 user=Käyttäjätunnus
 password=Salasana
@@ -224,48 +235,48 @@ err_admin_name_is_invalid=Ylläpitäjän käyttäjätunnus on virheellinen
 general_title=Yleiset asetukset
 app_name=Sivuston otsikko
 app_name_helper=Voit syöttää yrityksesi nimen tähän.
-repo_path=Repon juuren polku
+repo_path=Repositorion juuren polku
 repo_path_helper=Muualla olevat git-repositoriot tullaan tallentamaan tähän kansioon.
 lfs_path=Git LFS -juuripolku
 lfs_path_helper=Git LFS:n ylläpitämät tiedostot tullaan tallentamaan tähän hakemistoon. Jätä tyhjäksi kytkeäksesi toiminnon pois.
 run_user=Aja käyttäjänä
 domain=Palvelimen verkkotunnus
 ssh_port=SSH-palvelimen portti
-ssh_port_helper=Porttinumero, jossa SSH-palvelimesi kuuntelee. Jätä tyhjäksi kytkeäksesi pois.
-http_port=Forgejon HTTP-kuunteluportti
+ssh_port_helper=Porttinumero, jossa SSH-palvelimesi kuuntelee. Jätä tyhjäksi kytkeäksesi SSH-palvelimen pois päältä.
+http_port=HTTP-kuunteluportti
 http_port_helper=Portti, jossa Forgejon web-palvelin kuuntelee.
-app_url=Forgejon juuriosoite
+app_url=Juuriosoite
 app_url_helper=Juuriosoite HTTP(S)-klooniosoitteille ja sähköpostimuistutuksille.
-log_root_path=Lokin polku
+log_root_path=Lokitiedostojen polku
 log_root_path_helper=Lokitiedostot kirjoitetaan tähän kansioon.
 
 optional_title=Valinnaiset asetukset
 email_title=Sähköpostiasetukset
 smtp_addr=SMTP isäntä
-smtp_port=SMTP portti
+smtp_port=SMTP-portti
 smtp_from=Lähetä sähköpostit osoitteella
 smtp_from_helper=Sähköpostiosoite, jota Forgejo käyttää. Kirjoita osoite ”nimi”  -muodossa.
 mailer_user=SMTP-käyttäjätunnus
 mailer_password=SMTP-salasana
-register_confirm=Vaadi sähköpostin vahvistaminen rekisteröintiin
-mail_notify=Ota käyttöön sähköpostiilmoitukset
-server_service_title=Palvelin ja kolmansien osapuolten palveluiden asetukset
+register_confirm=Vaadi sähköpostinvahvistus rekisteröinnin edellytykseksi
+mail_notify=Ota sähköposti-ilmoitukset käyttöön
+server_service_title=Palvelimen ja kolmansien osapuolten palveluiden asetukset
 offline_mode=Ota käyttöön lokaali tila
-offline_mode.description=Poista kolmannen osapuolen sisällöstä jakeluverkot ja tarjoa kaikki resurssit paikallisesti.
+offline_mode.description=Poista kolmannen osapuolen sisällönjakeluverkot ja tarjoa kaikki resurssit paikallisesti.
 disable_gravatar=Poista Gravatar käytöstä
 disable_gravatar.description=Poista Gravatar ja kolmannen osapuolen avaratir käytöstä. Oletus-avatar näytetään, ellei käyttäjä ole ladannut omaansa.
-federated_avatar_lookup=Käytä ulkopuolisia profiilikuvia
-federated_avatar_lookup.description=Enable federated avatars lookup to use federated open source service based on libravatar.
+federated_avatar_lookup=Käytä federoituja profiilikuvia
+federated_avatar_lookup.description=Käytä Libravatar-palvelua profiilikuvien hakemiseen.
 disable_registration=Poista rekisteröinti käytöstä
 disable_registration.description=Poista käyttäjän itse-rekisteröinti, vain ylläpito voi luoda tilejä.
-allow_only_external_registration.description=Salli rekisteröinti vain ulkopuolisista palveluista
-openid_signin=Ota OpenID kirjautuminen käyttöön
-openid_signin.description=Ota käyttöön kirjautuminen OpenID:n kautta.
-openid_signup=Ota käyttöön OpenID itse-rekisteröinti
-openid_signup.description=Ota käyttöön OpenID-pohjainen käyttäjän itse-rekisteröinti.
+allow_only_external_registration.description=Käyttäjät voivat luoda uusia käyttäjiä vain erikseen konfiguroituja ulkoisia palveluja käyttäen.
+openid_signin=Ota OpenID-kirjautuminen käyttöön
+openid_signin.description=Salli OpenID:n kautta kirjautuminen.
+openid_signup=Ota OpenID-itserekisteröinti käyttöön
+openid_signup.description=Salli OpenID:n kautta rekisteröinti mikäli itserekisteröinti on käytössä.
 enable_captcha=Ota käyttöön CAPTCHA rekisteröityessä
-enable_captcha.description=Pakollinen captcha käyttäjän itse rekisteröityessä.
-require_sign_in_view=Vaadi sisäänkirjautuminen sivujen näkemiseksi
+enable_captcha.description=Vaadi CAPTCHA rekisteröinnin yhteydessä.
+require_sign_in_view=Vaadi sisäänkirjautuminen sisällön näkemiseksi
 admin_setting.description=Ylläpitotilin luominen on valinnaista. Ensimmäisestä rekisteröityneestä käyttäjästä tulee automaattisesti ylläpitäjä.
 admin_title=Ylläpitotilin asetukset
 admin_name=Ylläpitäjän käyttäjätunnus
@@ -273,20 +284,39 @@ admin_password=Salasana
 confirm_password=Varmista salasana
 admin_email=Sähköpostiosoite
 install_btn_confirm=Asenna Forgejo
-test_git_failed=Epäonnistui testata 'git' komentoa: %v
-sqlite3_not_available=Tämä Forgejo versio ei tue SQLite3. Lataa virallinen binääriversio kohteesta %s (ei 'gobuild' versio).
+test_git_failed=Komennon 'git' testaus ei onnistunut: %v
+sqlite3_not_available=Tämä Forgejo-versio ei tue SQLite3-ohjelmistoa. Lataa virallinen binääriversio kohteesta %s (ei 'gobuild'-versio).
 invalid_db_setting=Tietokanta-asetukset ovat väärin: %v
 invalid_repo_path=Repojen juuri polku on virheellinen: %v
 invalid_app_data_path=Sovelluksen datapolku on virheellinen: %v
 internal_token_failed=Sisäisen pääsymerkin luonti epäonnistui: %v
 save_config_failed=Asetusten tallentaminen epäonnistui: %v
 default_keep_email_private=Piilota sähköpostiosoitteet oletuksena
-default_keep_email_private.description=Piilota oletusarvoisesti uusien käyttäjätilien sähköpostiosoitteet.
-default_enable_timetracking=Ota ajan seuranta oletusarvoisesti käyttöön
-default_enable_timetracking.description=Ota käyttöön uusien repojen aikaseuranta oletusarvoisesti.
+default_keep_email_private.description=Piilota oletusarvoisesti uusien käyttäjätilien sähköpostiosoitteet estääksesi tietojen vuotamisen rekisteröinnin yhteydessä.
+default_enable_timetracking=Ota ajanseuranta oletusarvoisesti käyttöön
+default_enable_timetracking.description=Salli uusien repositorioiden aikaseurannan käyttöönotto oletusarvoisesti.
 no_reply_address=Piilotettu sähköpostin verkkotunnus
-no_reply_address_helper=Verkkotunnuksen nimi käyttäjille, joilla on piilotettu sähköpostiosoite. Esimerkiksi käyttäjätunnus 'joe' kirjataan Git nimellä 'joe@noreply.example.org' jos piilotettu sähköpostiosoite on asetettu 'noreply.example.org'.
+no_reply_address_helper=Verkkotunnuksen nimi käyttäjille, joilla on piilotettu sähköpostiosoite. Esimerkiksi käyttäjätunnus 'joe' kirjataan Git-palveluun nimellä 'joe@noreply.example.org' jos piilotetun sähköpostiosoitteen arvoksi on asetettu 'noreply.example.org'.
 password_algorithm=Salasanan hajautusalgoritmi
+enable_update_checker_helper_forgejo = Se tarkistaa tietyin väliajoin uusia Forgejo-versioita tutkimalla sen TXT DNS record -tietoja osoitteesta release.forgejo.org .
+invalid_admin_setting = Järjestelmänvalvojatilin asetukset eivät kelpaa: %v
+env_config_keys = Ympäristökonfiguraatio
+run_user_helper = Käyttöjärjestelmätason käyttäjänimi, jona Forgejo ajetaan. Huomaa, että kyseinen käyttäjä tarvitsee pääsyn repositorion juuripolkuun.
+env_config_keys_prompt = Seuraavat ympäristömuuttujat sisällytetään myös asetustiedostoonne:
+secret_key_failed = Salausavaimen generointi epäonnistui: %v
+default_allow_create_organization.description = Salli organisaatioiden luonti uusille käyttäjille oletuksena. Järjestelmänvalvojan tarvitsee antaa lupa luoda organisaatioita mikäli tämä asetus on pois päältä.
+config_location_hint = Tallennettujen asetusten sijainti:
+invalid_db_table = Tietokantataulu "%s" ei kelpaa: %v
+invalid_password_algorithm = Salasananhajautusalgoritmi ei kelpaa
+password_algorithm_helper = Aseta salasananhajautusalgoritmi. Eri algoritmeilla on erilaisia vaatimuksia ja vahvuuksia - argon2-algoritmi on erityisen turvallinen mutta vaatii paljon muistia ja voi näin ollen olla pienille järjestelmille soveltumaton.
+db_schema_helper = Jätä tyhjäksi käyttääksesi oletusarvoa ("public").
+run_user_not_match = Tämänhetkinen käyttäjänimi ei täsmää tiettynä käyttäjänä ajettavan käyttäjänimen kanssa: %s -> %s
+invalid_log_root_path = Lokitiedoston polku ei kelpaa: %v
+require_sign_in_view.description = Rajoita sisältö vain kirjautuneille. Vieraat pääsevät vain autentikaatiosivuille.
+allow_only_external_registration = Salli rekisteröinti vain ulkoisia palveluja käyttäen
+default_allow_create_organization = Salli organisaatioiden luonti oletuksena
+allow_dots_in_usernames = Salli pisteiden käyttö käyttäjänimissä. Ei vaikuta olemassaoleviin käyttäjiin.
+enable_update_checker = Ota päivitystentarkistus käyttöön
 
 [home]
 uname_holder=Käyttäjätunnus tai sähköpostiosoite
@@ -327,6 +357,9 @@ user_no_results=Vastaavia käyttäjiä ei löytynyt.
 org_no_results=Ei löytynyt vastaavia organisaatioita.
 code_no_results=Hakuehtoasi vastaavaa lähdekoodia ei löytynyt.
 code_last_indexed_at=Viimeksi indeksoitu %s
+stars_one = %d tähti
+stars_few = %d tähteä
+relevant_repositories = Vain relevantit repositoriot näytetään, näytä suodattamattomat tulokset.
 
 [auth]
 create_new_account=Rekisteröi tili
@@ -338,10 +371,10 @@ remember_me=Muista tämä laite
 forgot_password_title=Unohtuiko salasana
 forgot_password=Unohtuiko salasana?
 sign_up_now=Tarvitsetko tilin? Rekisteröidy nyt.
-confirmation_mail_sent_prompt=Uusi varmistussähköposti on lähetetty osoitteeseen %s, ole hyvä ja tarkista saapuneet seuraavan %s tunnin sisällä saadaksesi rekisteröintiprosessin valmiiksi.
+confirmation_mail_sent_prompt=Uusi varmistussähköposti on lähetetty osoitteeseen %s. Tarkista sähköpostisi ja seuraa saamaasi linkkiä seuraavan %s aikana saadaksesi rekisteröintiprosessin valmiiksi. Mikäli annettu sähköpostiosoite on väärin, voit kirjautua sisään ja pyytää uutta varmistussähköpostia toiseen osoitteeseen.
 must_change_password=Vaihda salasanasi
 allow_password_change=Vaadi käyttäjää vaihtamaan salasanansa (suositeltava)
-reset_password_mail_sent_prompt=Varmistussähköposti on lähetetty osoitteeseen %s. Tarkista saapuneet seuraavan %s tunnin sisällä saadaksesi tilin palauttamisen valmiiksi.
+reset_password_mail_sent_prompt=Varmistussähköposti on lähetetty osoitteeseen %s. Tarkista sähköpostisi ja seuraa annettua linkkiä seuraavan %s aikana saadaksesi tilin palauttamisen valmiiksi.
 active_your_account=Aktivoi tilisi
 account_activated=Tili on aktivoitu
 prohibit_login=Kirjautuminen estetty
@@ -383,6 +416,11 @@ authorize_application_description=Jos myönnät valtuuden, sovellus voi käyttä
 authorize_title=Valtuutatko "%s" pääsemään tilillesi?
 authorization_failed=Käyttöoikeuden varmistus epäonnistui
 sspi_auth_failed=SSPI todennus epäonnistui
+sign_up_successful = Käyttäjätili luotiin onnistuneesti. Tervetuloa!
+hint_login = Onko sinulla jo käyttäjätili? Kirjaudu sisään!
+hint_register = Tarvitsetko käyttäjätilin? Rekisteröidy nyt.
+sign_up_button = Rekisteröidy nyt.
+manual_activation_only = Ota yhteyttä järjestelmänvalvojaanne viimeistelläksesi aktivoinnin.
 
 [mail]
 view_it_on=Näytä %s
@@ -1799,13 +1837,81 @@ runners.task_list.repository=Repo
 runners.task_list.commit=Commit
 
 runs.commit=Commit
+status.success = Onnistunut
+status.unknown = Tuntematon
+status.waiting = Odotustilassa
+status.running = Käynnissä
+status.blocked = Estetty
+status.failure = Epäonnistunut
+status.cancelled = Peruttu
+status.skipped = Ohitettu
+runners.none = Testinajajia ei saatavilla
+runners.status.unspecified = Tuntematon
+runners.update_runner = Päivitä muutokset
+runners.edit_runner = Muokkaa testinajajaa
+runners.update_runner_success = Testinajaja päivitetty onnistuneesti
+runners.delete_runner_success = Testinajaja poistettu onnistuneesti
+runners.reset_registration_token = Uudelleenaseta rekisteröintiavain
+runs.scheduled = Ajastettu
+runs.status = Tila
+runs.empty_commit_message = (tyhjä commit-viesti)
+variables.deletion = Poista muuttuja
+runners.new_notice = Testinajajan aloitusohjeet
+workflow.dispatch.input_required = Arvo syötteelle "%s" vaadittu.
+runners.status.active = Aktiivinen
+runs.no_workflows.documentation = Katso lisätietoja Forgejo Actions -ohjelmistosta dokumentaatiosta.
+variables.description = Muuttujat asetetaan tietyille toiminnoille eikä niitä voida lukea muutoin.
+runners.labels = Tunnisteet
+runners.delete_runner_failed = Testinajajan poisto epäonnistui
+runners.delete_runner_header = Varmista testinajajan poisto
+runners.task_list.status = Tila
+runners.reset_registration_token_success = Testiajajan rekisteröintiavain uudelleenasetettu onnistuneesti
+variables.none = Muuttujia ei ole vielä määritelty.
+runners.id = Tunniste
+runners.status = Tila
+runners.task_list = Ajajan viimeisimmät tehtävät
+runners.task_list.no_tasks = Tehtäviä ei ole vielä määritelty.
+runners.last_online = Viimeisin käynnissäoloajankohta
+runners.runner_title = Testinajaja
+runners.task_list.done_at = Valmistunut ajankohtana
+runs.no_matching_online_runner_helper = Testiajajaa tunnisteella %s ei löytynyt
+runs.no_results = Ei tuloksia.
+runners.delete_runner = Poista testinajaja
+variables.deletion.description = Muuttujan poistaminen on lopullista eikä sitä voi peruuttaa. Jatketaanko?
+workflow.dispatch.invalid_input_type = Syötetyyppi "%s" ei kelpaa.
+workflow.dispatch.warn_input_limit = Näytetään vain ensimmäiset %d syötettä.
+runners.runner_manage_panel = Hallinnoi testinajajia
+variables = Muuttujat
+variables.management = Hallinnoi muuttujia
+variables.creation = Lisää muuttuja
+runs.no_workflows.quick_start = Etkö tiedä kuinka Forgejo Actions toimii? Katso aloitusohje.
+runners.new = Luo uusi testinajaja
+runners.version = Versio
+runs.expire_log_message = Lokitiedostot on tyhjätty vanhenemisen vuoksi.
+runners.delete_runner_notice = Mikäli testinajajalla on keskeneräinen tehtävä, se pysäytetään ja merkitään epäonnistuneeksi. Tämä saattaa johtaa testinajoprosessin rikkoutumiseen.
+runners.update_runner_failed = Testinajajan päivitys epäonnistui
+variables.deletion.success = Muuttuja poistettu.
+variables.edit = Muokkaa muuttujaa
+variables.creation.success = Muuttuja "%s" lisätty.
+variables.deletion.failed = Muuttujan poisto epäonnistui.
+variables.creation.failed = Muuttujan lisäys epäonnistui.
+variables.update.failed = Muuttujan muokkaus epäonnistui.
+variables.update.success = Muuttuja muokattu.
+variables.id_not_exist = Muuttujaa tunnisteella %d ei ole olemassa.
 
 
 
 
 [projects]
+type-1.display_name = Yksittäinen projekti
+deleted.display_name = Poistettu projekti
 
 [git.filemode]
+changed_filemode = %[1]s -> %[2]s
+executable_file = Ajettava tiedosto
+symbolic_link = Symbolinen linkki
+normal_file = Tavallinen tiedosto
+directory = Kansio
 ; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", …
 
 
@@ -1815,4 +1921,18 @@ search = Hae...
 type_tooltip = Haun tyyppi
 fuzzy_tooltip = Sisällytä tulokset, jotka myös melkein vastaavat hakusanaa
 regexp = RegExp
-regexp_tooltip = Tulkitse hakutermi säännöllisenä lausekkeena
\ No newline at end of file
+regexp_tooltip = Tulkitse hakutermi säännöllisenä lausekkeena
+package_kind = Etsi paketteja...
+exact = Täsmällinen
+exact_tooltip = Sisällytä vain täsmälleen hakusanaa vastaavat tulokset
+team_kind = Etsi ryhmiä...
+code_kind = Etsi koodia...
+code_search_unavailable = Koodihaku ei tällä hetkellä ole saatavilla. Ota yhteyttä järjestelmänvalvojaan.
+union = yhdistelmähaku
+union_tooltip = Sisällytä minkä tahansa yksittäisen avainsanan kanssa täsmänneet tulokset
+project_kind = Etsi projekteja...
+no_results = Hakutuloksia ei löytynyt.
+keyword_search_unavailable = Avainsanahaku ei tällä hetkellä ole saatavilla. Ota yhteyttä järjestelmänvalvojaan.
+repo_kind = Etsi repositorioita...
+user_kind = Etsi käyttäjiä...
+org_kind = Etsi organisaatioita...
\ No newline at end of file
diff --git a/options/locale/locale_fil.ini b/options/locale/locale_fil.ini
index b0c515dccb..6bc508020c 100644
--- a/options/locale/locale_fil.ini
+++ b/options/locale/locale_fil.ini
@@ -1883,7 +1883,7 @@ issues.dependency.no_permission_n = Wala kang pahintulot na basahin ang mga %d d
 issues.dependency.removed_dependency = `nagtanggal ng dependency %s`
 settings.mirror_settings.push_mirror.add = Magdagdag ng salaming pangtulak
 settings.mirror_settings.last_update = Huling nabago
-settings.units.add_more = Magdagdag ng higit pa...
+settings.units.add_more = Paganahin ang higit pa
 activity.closed_issues_count_n = Mga saradong isyu
 activity.new_issues_count_1 = Bagong isyu
 settings.branches.add_new_rule = Magdagdag ng bagong patakaran
@@ -2009,7 +2009,7 @@ settings.mirror_settings.docs.disabled_push_mirror.instructions = I-set up ang i
 settings.mirror_settings.docs.disabled_pull_mirror.instructions = I-set up ang iyong proyekto na awtomatikong magtulak ng mga commit, tag at branch sa isa pang repositoryo. Na-disable ng iyong tagapangasiwa ng site ang mga pull mirror.
 activity.overview = Pangkalahatang Ideya
 mirror_public_key = Pampublikong susi ng SSH
-milestones.cancel = 
+milestones.cancel =
 
 [search]
 commit_kind = Maghanap ng mga commit...
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
index ec67e8fb92..f35054d72c 100644
--- a/options/locale/locale_fr-FR.ini
+++ b/options/locale/locale_fr-FR.ini
@@ -483,7 +483,7 @@ unauthorized_credentials = Vos identifiants sont invalides ou ont expiré. Rées
 [mail]
 view_it_on=Voir sur %s
 reply=ou répondez directement à ce courriel
-link_not_working_do_paste=Le lien ne fonctionne pas ? Essayez de le copier-coller dans barre de navigation de votre navigateur.
+link_not_working_do_paste=Le lien ne fonctionne pas ? Essayez de le copier-coller dans la barre de navigation de votre navigateur.
 hi_user_x=Bonjour %s,
 
 activate_account=Veuillez activer votre compte
@@ -546,13 +546,13 @@ team_invite.text_1=%[1]s vous a invité à rejoindre l’équipe %[2]s dans l’
 team_invite.text_2=Veuillez cliquer sur le lien suivant pour rejoindre l'équipe :
 team_invite.text_3=Remarque : Cette invitation était destinée à %[1]s. Si vous n’attendiez pas cette invitation, vous pouvez ignorer ce courriel.
 admin.new_user.user_info = Information à propos de l'utilisateur
-admin.new_user.text = Veuillez clicker ici afin de gérer l'utilisateur depuis la page d'administration.
+admin.new_user.text = Veuillez cliquer ici afin de gérer l'utilisateur depuis la page d'administration.
 admin.new_user.subject = L'utilisateur %s vient de créer un compte
 reset_password.text_1 = Le mot de passe de votre compte vient d'être modifié.
 password_change.subject = Votre mot de passe a été modifié
 password_change.text_1 = Le mot de passe de votre compte vient d'être modifié.
 primary_mail_change.subject = Votre courriel principal a été modifié
-primary_mail_change.text_1 = Le courriel principal de votre compte vient d'être modifié en %[1]s.
+primary_mail_change.text_1 = Le courriel principal de votre compte vient d'être modifié en %[1]s. Cela signifie que cette adresse e-mail ne recevra plus de notifications par e-mail pour votre compte.
 totp_disabled.no_2fa = Il n'y a plus de méthodes 2FA configurées ce qui signifie qu'il n'est plus nécessaire d'utiliser 2FA pour se connecter à votre compte.
 totp_disabled.text_1 = Mot de passe à usage unique basé sur le temps (TOTP) vient d'être désactivé pour votre compte.
 removed_security_key.subject = Une clé de sécurité a été supprimée
@@ -1039,7 +1039,7 @@ user_unblock_success = Cet utilisateur a été débloqué avec succès.
 user_block_success = Cet utilisateur a été bloqué avec succès.
 change_password = Modifier le mot de passe
 hints = Suggestions
-additional_repo_units_hint_description = Afficher un bouton "Ajouter plus d'unités..." pour les dépôts qui n'ont pas toutes les unités disponibles activées.
+additional_repo_units_hint_description = Afficher un bouton "Ajouter en plus..." pour les dépôts qui n'ont pas toutes les unités disponibles activées.
 additional_repo_units_hint = Suggérer l'ajout de nouvelles unités pour le dépôt
 update_hints = Mettre à jour les suggestions
 update_hints_success = Les suggestions ont été mises à jour.
@@ -2690,9 +2690,9 @@ branch.renamed=La branche %s à été renommée en %s.
 tag.create_tag=Créer l'étiquette %s
 tag.create_tag_operation=Créer une étiquette
 tag.confirm_create_tag=Créer une étiquette
-tag.create_tag_from=`Créer une nouvelle étiquette à partir de "%s"`
+tag.create_tag_from=Créer une nouvelle étiquette à partir de « %s »
 
-tag.create_success=L'étiquette "%s" a été créée.
+tag.create_success=L'étiquette « %s » a été créée.
 
 topic.manage_topics=Gérer les sujets
 topic.done=Terminé
@@ -2745,11 +2745,11 @@ settings.add_collaborator_blocked_our = Il n'est pas possible d'ajouter ce colla
 settings.wiki_rename_branch_main_notices_1 = Cette operation NE PEUT PAS être annulée.
 settings.wiki_branch_rename_failure = Le nom de la branche associée au wiki du dépôt n'a pu être normalisé.
 pulls.reopen_failed.head_branch = La pull request ne peut pas être re-ouverte car la branch d'origine n'existe plus.
-settings.units.units = Fonctionnalités des dépôt
+settings.units.units = Fonctionnalités
 pulls.fast_forward_only_merge_pull_request = Fast-forward uniquement
 pulls.reopen_failed.base_branch = La pull request ne peut pas être re-ouverte car la branche de destination n'existe plus.
 settings.units.overview = Vue générale
-settings.units.add_more = Ajouter en plus...
+settings.units.add_more = Ajouter en plus
 activity.navbar.pulse = Pouls
 activity.navbar.contributors = Contributeurs
 contributors.contribution_type.commits = Commits
@@ -2840,10 +2840,11 @@ pulls.cmd_instruction_merge_warning = Avertissement : Le paramètre "dét
 release.type_external_asset = Actif Externe
 activity.published_prerelease_label = Pré-version
 activity.published_tag_label = Étiquette
-release.asset_name = Nom de l'Actif
-release.add_external_asset = Ajouter un Actif Externe
+release.asset_name = Nom de l'actif
+release.add_external_asset = Ajouter un actif externe
 issues.new.assign_to_me = Assigner à moi-même
 issues.all_title = Tous
+settings.discord_icon_url.exceeds_max_length = L'URL de l’icône ne doit pas dépasser 2048 caractères
 
 [graphs]
 component_loading=Chargement de %s…
@@ -2930,7 +2931,7 @@ teams.leave.detail=Êtes vous certain·e de vouloir quitter l'équipe «%s» ?
 teams.can_create_org_repo=Créer des dépôts
 teams.can_create_org_repo_helper=Les membres peuvent créer de nouveaux dépôts dans l'organisation. Le créateur obtiendra l'accès administrateur au nouveau dépôt.
 teams.none_access=Aucun accès
-teams.none_access_helper=L'option "aucun accès" n'agit que sur les dépôts privés.
+teams.none_access_helper=L'option "Aucun accès" n'a pas d'effet sur les dépôts privés.
 teams.general_access=Accès personnalisé
 teams.general_access_helper=Les permissions des membres seront déterminées par la table des permissions ci-dessous.
 teams.read_access=Lecture
@@ -3163,7 +3164,7 @@ orgs.new_orga=Nouvelle organisation
 
 repos.repo_manage_panel=Gestion des dépôts
 repos.unadopted=Dépôts non adoptés
-repos.unadopted.no_more=Aucun dépôt candidat à l'adoption n'a été trouvé
+repos.unadopted.no_more=Aucun dépôt candidat à l'adoption n'a été trouvé.
 repos.owner=Propriétaire
 repos.name=Nom
 repos.private=Privé
@@ -3533,12 +3534,12 @@ config.cache_test_slow = Test du cache réussi, mais le temps de réponse est le
 config.cache_test_failed = Échec du contrôle du cache : %v.
 config.cache_test = Tester le cache
 config.cache_test_succeeded = Test du cache réussi, réponse obtenue en %s.
-emails.delete_desc = Êtes-vous sûr de vouloir supprimer cette adresse e-mail ?
+emails.delete_desc = Êtes-vous sûr de vouloir supprimer cette adresse courriel ?
 users.organization_creation.description = Autoriser la création de nouvelles organisations.
-emails.deletion_success = L'adresse e-mail a été supprimée.
-emails.delete = Supprimer l'Email
-emails.delete_primary_email_error = Vous ne pouvez pas supprimer l'adresse e-mail principale.
-users.activated.description = Achèvement de la vérification de l'email. Le propriétaire d'un compte non activé ne pourra pas se connecter tant que la vérification de l'email n'est pas terminée.
+emails.deletion_success = L'adresse courriel a été supprimée.
+emails.delete = Supprimer le courriel
+emails.delete_primary_email_error = Vous ne pouvez pas supprimer l'adresse courriel principale.
+users.activated.description = Achèvement de la vérification de courriel. Le propriétaire d'un compte non activé ne pourra pas se connecter tant que la vérification de courriel n'est pas terminée.
 users.block.description = Bloquer cet utilisateur d'interagir avec ce service via son compte et interdire la connexion.
 users.admin.description = Accorder à cet utilisateur un accès complet à toutes les fonctionnalités administratives disponibles via l'interface web et l'API.
 users.restricted.description = Autoriser uniquement l'interaction avec les dépôts et les organisations où cet utilisateur est ajouté en tant que collaborateur. Cela empêche l'accès aux dépôts publics sur cette instance.
@@ -3794,7 +3795,7 @@ arch.pacman.repo.multi = %s a la même version dans différentes distributions.
 arch.pacman.repo.multi.item = Configuration pour %s
 arch.pacman.conf = Ajouter un serveur associées à la distribution et l'architecture dans /etc/pacman.conf :
 arch.pacman.sync = Synchroniser le paquet avec pacman :
-arch.version.properties = Propriétés de Version
+arch.version.properties = Propriétés de version
 arch.version.description = Description
 arch.version.provides = Fournit
 arch.version.groups = Groupe
@@ -3804,7 +3805,7 @@ arch.version.checkdepends = Vérifier les dépendances
 arch.version.conflicts = Conflits
 arch.version.replaces = Remplace
 arch.version.backup = Sauvegarde
-arch.version.makedepends = Créer des dépendances
+arch.version.makedepends = Faire des dépendances
 
 [secrets]
 secrets=Secrets
@@ -4010,7 +4011,7 @@ projects.write = Écrire : Créer des projets, des colonnes et les modifi
 code.read = Lire : Accéder au code du dépôt et le cloner.
 ext_issues = Accéder au lien vers un système externe de suivi des problèmes. Les autorisations sont gérées de manière externe.
 code.write = Écrire : Pousser vers le dépôt, créer des branches et des étiquettes.
-issues.read = Lire : Lire et créer des problèmes et des commentaires.
+issues.read = Lire : Lire et créer des tickets et des commentaires.
 wiki.read = Lire : Lire le wiki intégré et son historique.
 wiki.write = Écrire : Créer, mettre à jour et supprimer des pages dans le wiki intégré.
 projects.read = Lire : Accéder aux tableaux de projet du dépôt.
@@ -4018,7 +4019,7 @@ packages.read = Lire : Voir et télécharger les paquets assignés au dé
 packages.write = Écrire : Publier et supprimer des paquets assignés au dépôt.
 actions.write = Écrire : Déclencher manuellement, redémarrer, annuler ou approuver les pipelines CI/CD en attente.
 ext_wiki = Accéder au lien vers un wiki externe. Les autorisations sont gérées de manière externe.
-issues.write = Écrire : Fermer des problèmes et gérer les métadonnées telles que les étiquettes, les jalons, les assignés, les dates d'échéance et les dépendances.
+issues.write = Écrire : Fermer des tickets et gérer les métadonnées telles que les étiquettes, les jalons, les assignés, les dates d'échéance et les dépendances.
 pulls.read = Lire : Lire et créer des demandes de tirage.
 
 [translation_meta]
diff --git a/options/locale/locale_hi.ini b/options/locale/locale_hi.ini
index f89a8483dd..695fd3a9fa 100644
--- a/options/locale/locale_hi.ini
+++ b/options/locale/locale_hi.ini
@@ -2,5 +2,26 @@
 
 
 [common]
-dashboard = डैशबोर्ड
-home = घर
\ No newline at end of file
+dashboard = नियंत्रण कक्ष
+home = मुख्य पृष्ठ
+help = सहायता
+logo = चिह्न
+explore = अन्वेषण करें
+sign_in = प्रवेश करें
+sign_in_with_provider = %s के साथ प्रवेश करें
+sign_in_or = या
+sign_out = बाहर निकलें
+sign_up = पंजीकरण
+register = पंजीकरण
+version = संस्करण
+powered_by = द्वारा संचालित %s
+page = पृष्ठ
+template = सांचा
+language = भाषा
+active_stopwatch = सक्रिय समय ट्रैकर
+create_new = बनाएँ…
+signed_in_as = साइन इन किया गया है
+link_account = खाता लिंक करें
+notifications = सूचनाएँ
+tracked_time_summary = समस्याओं की सूची के फ़िल्टर के आधार पर ट्रैक किए गए समय का सारांश
+user_profile_and_more = प्रोफ़ाइल और सेटिंग्स…
\ No newline at end of file
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
index 6c97d5193e..dc58d62c7c 100644
--- a/options/locale/locale_it-IT.ini
+++ b/options/locale/locale_it-IT.ini
@@ -406,12 +406,10 @@ remember_me=Ricorda questo dispositivo
 forgot_password_title=Password dimenticata
 forgot_password=Password dimenticata?
 sign_up_now=Hai bisogno di un account? Registrati adesso.
-confirmation_mail_sent_prompt=Una nuova e-mail di conferma è stata inviata a %s.
-        Per completare la registrazione, controlla la tua posta in arrivo e clicca sul link in allegato entro i prossimi %s secondi.
-        Se la tua e-mail è errata o incorretta, puoi accedere all'account e richiedere un'altra e-mail di conferma ad un'altro indirizzo.
+confirmation_mail_sent_prompt=Una nuova e-mail di conferma è stata inviata a %s. Per completare la registrazione, controlla la tua posta in arrivo e clicca sul link in allegato entro i prossimi %s secondi. Se la tua e-mail è errata o incorretta, puoi accedere all'account e richiedere un'altra e-mail di conferma ad un'altro indirizzo.
 must_change_password=Aggiorna la tua password
 allow_password_change=Richiede all'utente di cambiare la password (scelta consigliata)
-reset_password_mail_sent_prompt=Un'e-mail di conferma è stata inviata a %s.  Per completare il processo di recupero dell'account, controlla la tua posta in arrivo e clicca sul link entro i prossimi %s secondi.
+reset_password_mail_sent_prompt=Un'e-mail di conferma è stata inviata a %s. Per completare il processo di recupero dell'account, controlla la tua posta in arrivo e clicca sul link entro i prossimi %s secondi.
 active_your_account=Attiva il tuo account
 account_activated=L'account è stato attivato
 prohibit_login=L'accesso è proibito
@@ -2188,23 +2186,23 @@ settings.protect_enable_push_desc=Chiunque con accesso in scrittura sarà autori
 settings.protect_whitelist_committers=Limita immissione alla whitelist
 settings.protect_whitelist_committers_desc=Solo gli utenti o i team nella whitelist potranno pushare su questo ramo (ma non forzare il push).
 settings.protect_whitelist_deploy_keys=Chiavi di deploy in whitelist con permessi di scrittura per il push.
-settings.protect_whitelist_users=Utenti nella whitelist per pushare:
+settings.protect_whitelist_users=Utenti nella whitelist per pushare
 settings.protect_whitelist_search_users=Cerca utenti…
-settings.protect_whitelist_teams=Team nella whitelist per pushare:
+settings.protect_whitelist_teams=Team nella whitelist per pushare
 settings.protect_whitelist_search_teams=Ricerca team…
 settings.protect_merge_whitelist_committers=Attiva la whitelist per le fusioni
 settings.protect_merge_whitelist_committers_desc=Consentire soltanto agli utenti o ai team in whitelist il permesso di unire le pull request di questo branch.
-settings.protect_merge_whitelist_users=Utenti nella whitelist per il merging:
-settings.protect_merge_whitelist_teams=Team nella whitelist per il merging:
+settings.protect_merge_whitelist_users=Utenti nella whitelist per il merging
+settings.protect_merge_whitelist_teams=Team nella whitelist per il merging
 settings.protect_check_status_contexts=Abilita controllo dello stato
 settings.protect_check_status_contexts_desc=Richiedi il superamento di controlli di stato prima dell'unione di due rami. Scegliere quali controlli di stato devono passare prima che i rami possano essere uniti in un ramo che corrisponde a questa regola. Se abilitato, i commit devono prima essere inviati a un altro ramo, quindi uniti o pushati direttamente a un ramo che corrisponde a questa regola dopo aver superato i controlli di stato. Se non viene selezionato alcuna regola, l'ultimo commit avrá successo indipendentemente dal contesto.
 settings.protect_check_status_contexts_list=Controlli di stato trovati nell'ultima settimana per questo repository
-settings.protect_required_approvals=Approvazioni richieste:
+settings.protect_required_approvals=Approvazioni richieste
 settings.protect_required_approvals_desc=Permetti solo di unire la richiesta pull con abbastanza recensioni positive.
 settings.protect_approvals_whitelist_enabled=Limita le approvazioni agli utenti o ai team nella whitelist
 settings.protect_approvals_whitelist_enabled_desc=Solo le recensioni di utenti o team nella whitelist saranno contate alle approvazioni richieste. Senza approvazione nella whitelist, le recensioni di chiunque abbia i permessi di scrittura nella repository verrá contato nelle approvazioni richieste.
-settings.protect_approvals_whitelist_users=Utenti autorizzati:
-settings.protect_approvals_whitelist_teams=Team nella whitelist per le revisioni:
+settings.protect_approvals_whitelist_users=Utenti autorizzati
+settings.protect_approvals_whitelist_teams=Team nella whitelist per le revisioni
 settings.dismiss_stale_approvals=Ignora impostazione vecchie
 settings.dismiss_stale_approvals_desc=Quando i nuovi commit che cambiano il contenuto della pull request vengono pushati nel branch, le vecchie approvazioni verranno eliminate.
 settings.require_signed_commits=Richiedi commit firmati
@@ -2730,11 +2728,11 @@ settings.protected_branch.save_rule = Salva regola
 settings.protected_branch.delete_rule = Elimina regola
 settings.protect_invalid_status_check_pattern = Sequenza per il controllo dello stato non valida: "%s".
 settings.protect_status_check_matched = Coincide
-settings.protect_status_check_patterns = Sequenze per il controllo dello stato:
+settings.protect_status_check_patterns = Sequenze per il controllo dello stato
 settings.protect_enable_merge = Abilita fusione
 settings.protect_enable_merge_desc = Chiunque con permesso di scrittura potrà fondere richieste di modifica in questo ramo.
-settings.protect_unprotected_file_patterns = Sequenze dei file non protetti (separate da punto e virgola ";"):
-settings.protect_protected_file_patterns = Sequenze dei file protetti (separate da punto e virgola ";"):
+settings.protect_unprotected_file_patterns = Sequenze dei file non protetti (separate da punto e virgola ";")
+settings.protect_protected_file_patterns = Sequenze dei file protetti (separate da punto e virgola ";")
 settings.protect_branch_name_pattern_desc = Sequenze di nome di rami protetti. Vedi la documentazione per la sintassi delle sequenze. Esempi: main, release/**
 settings.protect_branch_name_pattern = Sequenza nome di ramo
 settings.ignore_stale_approvals_desc = Non contare le approvazione fatte su vecchi commit (revisioni stantie) nel calcolo delle approvazioni della RM. Irrilevante se le revisioni stantie sono già state respinte.
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
index 73b74fae24..3e90125042 100644
--- a/options/locale/locale_ja-JP.ini
+++ b/options/locale/locale_ja-JP.ini
@@ -1039,7 +1039,7 @@ pronouns = 代名詞
 pronouns_custom = カスタム
 pronouns_unspecified = 未指定
 update_hints = ヒントを更新
-additional_repo_units_hint_description = 利用可能なすべての機能が有効になっていないリポジトリに対して、「機能を追加...」ボタンを表示します。
+additional_repo_units_hint_description = 利用可能なすべての機能が有効になっていないリポジトリに対して、「さらに有効にする」ヒントを表示します。
 update_hints_success = ヒントが更新されました。
 hints = ヒント
 additional_repo_units_hint = リポジトリでより多くの機能を有効にすることを推奨する
@@ -2188,7 +2188,7 @@ settings.admin_settings=管理者設定
 settings.admin_enable_health_check=リポジトリのヘルスチェックを有効にする (git fsck)
 settings.admin_code_indexer=コードインデクサ
 settings.admin_stats_indexer=コード統計インデクサ
-settings.admin_indexer_commit_sha=最新インデックス済みSHA
+settings.admin_indexer_commit_sha=最新インデックス済みコミット
 settings.admin_indexer_unindexed=未インデックス
 settings.reindex_button=インデックス再作成キューに追加
 settings.reindex_requested=再インデックスを要求しました
@@ -2301,7 +2301,7 @@ settings.slack_icon_url=アイコンのURL
 settings.slack_color=色
 settings.discord_username=ユーザー名
 settings.discord_icon_url=アイコンのURL
-settings.event_desc=トリガー:
+settings.event_desc=通知トリガー:
 settings.event_push_only=プッシュのイベント
 settings.event_send_everything=すべてのイベント
 settings.event_choose=イベントを指定…
@@ -2321,32 +2321,32 @@ settings.event_push_desc=Gitがリポジトリにプッシュを行ったとき
 settings.event_repository=リポジトリ
 settings.event_repository_desc=リポジトリが作成・削除されたとき。
 settings.event_header_issue=イシューのイベント
-settings.event_issues=イシュー
+settings.event_issues=変更
 settings.event_issues_desc=イシューがオープン・クローズ・再オープン・編集されたとき。
-settings.event_issue_assign=イシューのアサイン
+settings.event_issue_assign=アサイン
 settings.event_issue_assign_desc=イシューの担当者が割り当てられたとき、解除されたとき。
-settings.event_issue_label=イシューのラベル
-settings.event_issue_label_desc=イシューのラベルが更新・クリアされたとき。
-settings.event_issue_milestone=イシューのマイルストーン
-settings.event_issue_milestone_desc=イシューのマイルストーンが設定・解除されたとき。
-settings.event_issue_comment=イシューへのコメント
+settings.event_issue_label=ラベル
+settings.event_issue_label_desc=イシューのラベルが追加・削除されたとき。
+settings.event_issue_milestone=マイルストーン
+settings.event_issue_milestone_desc=マイルストーンが追加・削除・変更されたとき。
+settings.event_issue_comment=コメント
 settings.event_issue_comment_desc=イシューへのコメントが作成・編集・削除されたとき。
 settings.event_header_pull_request=プルリクエストのイベント
-settings.event_pull_request=プルリクエスト
+settings.event_pull_request=変更
 settings.event_pull_request_desc=プルリクエストがオープン・クローズ・再オープン・編集されたとき。
-settings.event_pull_request_assign=プルリクエストのアサイン
+settings.event_pull_request_assign=アサイン
 settings.event_pull_request_assign_desc=プルリクエストの担当者が割り当て・解除されたとき。
-settings.event_pull_request_label=プルリクエストのラベル
-settings.event_pull_request_label_desc=プルリクエストのラベルが更新・クリアされたとき。
-settings.event_pull_request_milestone=プルリクエストのマイルストーン
-settings.event_pull_request_milestone_desc=プルリクエストのマイルストーンが設定・解除されたとき。
-settings.event_pull_request_comment=プルリクエストへのコメント
+settings.event_pull_request_label=ラベル
+settings.event_pull_request_label_desc=プルリクエストのラベルが追加・削除されたとき。
+settings.event_pull_request_milestone=マイルストーン
+settings.event_pull_request_milestone_desc=マイルストーンが追加・削除・変更されたとき。
+settings.event_pull_request_comment=コメント
 settings.event_pull_request_comment_desc=プルリクエストへのコメントが作成・編集・削除されたとき。
-settings.event_pull_request_review=プルリクエストのレビュー
+settings.event_pull_request_review=レビュー
 settings.event_pull_request_review_desc=プルリクエストの承認・拒否、またはレビューコメントが付いたとき。
-settings.event_pull_request_sync=プルリクエストの同期
-settings.event_pull_request_sync_desc=プルリクエストが同期されたとき。
-settings.event_pull_request_review_request=プルリクエストのレビュー依頼
+settings.event_pull_request_sync=同期
+settings.event_pull_request_sync_desc=ターゲットブランチが自動で更新されたとき。
+settings.event_pull_request_review_request=レビュー依頼
 settings.event_pull_request_review_request_desc=プルリクエストのレビューが依頼されたとき、または依頼が削除されたとき。
 settings.event_pull_request_approvals=プルリクエストの承認
 settings.event_pull_request_merge=プルリクエストのマージ
@@ -2434,12 +2434,12 @@ settings.protect_check_status_contexts_list=この1週間に、このリポジ
 settings.protect_status_check_matched=マッチ
 settings.protect_invalid_status_check_pattern=`不正なステータスチェックパターン: "%s"`
 settings.protect_no_valid_status_check_patterns=有効なステータスチェックパターンがありません。
-settings.protect_required_approvals=必要な承認数:
+settings.protect_required_approvals=必要な承認数
 settings.protect_required_approvals_desc=肯定的なレビューの数を満たしたプルリクエストしかマージできないようにします。
 settings.protect_approvals_whitelist_enabled=ホワイトリストに登録したユーザーやチームに承認を制限
 settings.protect_approvals_whitelist_enabled_desc=ホワイトリストに登録したユーザーやチームによるレビューのみを、必要な承認とみなします。 承認のホワイトリストが無い場合は、書き込み権限がある人によるレビューを必要な承認とみなします。
-settings.protect_approvals_whitelist_users=ホワイトリストに含めるレビューア:
-settings.protect_approvals_whitelist_teams=ホワイトリストに含めるレビューチーム:
+settings.protect_approvals_whitelist_users=ホワイトリストに含めるレビューア
+settings.protect_approvals_whitelist_teams=ホワイトリストに含めるレビューチーム
 settings.dismiss_stale_approvals=古くなった承認を取り消す
 settings.dismiss_stale_approvals_desc=プルリクエストの内容を変える新たなコミットがブランチにプッシュされた場合、以前の承認を取り消します。
 settings.require_signed_commits=コミット署名必須
@@ -2616,10 +2616,10 @@ release.tag_helper_existing=存在するタグです。
 release.title=リリース タイトル
 release.title_empty=タイトルは空にできません。
 release.message=このリリースの説明
-release.prerelease_desc=プレリリース
+release.prerelease_desc=プレリリースとしてマーク
 release.prerelease_helper=このリリースが本番使用に適さないことを示します。
 release.cancel=キャンセル
-release.publish=リリースを発行
+release.publish=リリースを公開
 release.save_draft=下書きを保存
 release.edit_release=リリースを更新
 release.delete_release=リリースを削除
@@ -2636,7 +2636,7 @@ release.tag_already_exist=このタグ名は既に存在します。
 release.downloads=ダウンロード
 release.download_count=ダウンロード数: %s
 release.add_tag_msg=リリースのタイトルと内容をタグのメッセージにする
-release.add_tag=タグのみ作成
+release.add_tag=タグを作成
 release.releases_for=%s のリリース
 release.tags_for=%s のタグ
 
@@ -2731,7 +2731,7 @@ commits.renamed_from = %sから名前を変更
 pulls.made_using_agit = Agit
 pulls.agit_explanation = Agitによるワークフローを作成します。Agitでは、貢献者は変更をforkしたりブランチを作るのではなく、"git push"して提案します。
 contributors.contribution_type.deletions = 削除
-settings.units.add_more = さらに...
+settings.units.add_more = さらに有効にする
 settings.wiki_globally_editable = 誰でもWikiを編集できる様にする
 settings.confirmation_string = 確認
 settings.wiki_rename_branch_main_notices_1 = この操作は 取り消しできません 。
@@ -2739,7 +2739,7 @@ stars = スター
 n_tag_few = %s のタグ
 settings.graphql_url = GraphQL URL
 n_branch_one = %s のブランチ
-settings.units.units = リポジトリ機能
+settings.units.units = 機能設定
 settings.wiki_rename_branch_main_notices_2 = これにより、%s のリポジトリ wiki の内部ブランチの名前が永久に変更されます。既存のチェックアウトを更新する必要があります。
 settings.sourcehut_builds.access_token_helper = JOBS:RW 権限を持つアクセス トークン。meta.sr.ht で builds.sr.ht トークン または シークレット アクセスを持つ builds.sr.ht トークン を生成します。
 settings.enforce_on_admins = リポジトリ管理者にこのルールを適用する
@@ -2816,6 +2816,16 @@ settings.federation_not_enabled = インスタンスでフェデレーション
 settings.federation_apapiurl = このリポジトリのフェデレーション URL。これをコピーして、フォロー リポジトリの URL として別のリポジトリのフェデレーション設定に貼り付けます。
 settings.federation_following_repos = フォローしているリポジトリの URL。空白なしで";"で区切られます。
 settings.mirror_settings.push_mirror.copy_public_key = 公開鍵をコピー
+release.invalid_external_url = 無効な外部URL: "%s"
+release.type_attachment = 添付ファイル
+release.asset_external_url = 外部URL
+release.type_external_asset = 外部アセット
+release.asset_name = アセット名
+release.add_external_asset = 外部アセットを追加
+issues.all_title = 全て
+settings.protect_new_rule = 新しいブランチ保護ルールを作成する
+settings.discord_icon_url.exceeds_max_length = アイコンのURLは 2048 文字以下にする必要があります
+issues.new.assign_to_me = 自分に割り当て
 
 [graphs]
 component_loading = %s の読み込み中...
@@ -2900,18 +2910,18 @@ members.invite_now=今すぐ招待
 
 teams.join=参加
 teams.leave=脱退
-teams.leave.detail=%s から脱退しますか？
+teams.leave.detail=本当に %s から脱退しますか？
 teams.can_create_org_repo=リポジトリを作成
 teams.can_create_org_repo_helper=メンバーは組織のリポジトリを新たに作成できます。作成者には新しいリポジトリの管理者権限が与えられます。
 teams.none_access=アクセスなし
-teams.none_access_helper=メンバは、このユニットで表示や他の操作を行うことはできません。
-teams.general_access=一般的なアクセス
+teams.none_access_helper=「アクセスなし」オプションはプライベートリポジトリにのみ影響します。
+teams.general_access=カスタム権限
 teams.general_access_helper=メンバーの権限は下記の権限テーブルで決定されます。
 teams.read_access=読み取り
 teams.read_access_helper=メンバーはチームリポジトリの閲覧とクローンが可能です。
 teams.write_access=書き込み
 teams.write_access_helper=メンバーはチームリポジトリの読み取りとプッシュが可能です。
-teams.admin_access=管理者アクセス権
+teams.admin_access=管理者権限
 teams.admin_access_helper=メンバーは、チームリポジトリへのプル、プッシュ、共同作業者の追加が可能です。
 teams.no_desc=このチームには説明がありません。
 teams.settings=設定
@@ -2927,7 +2937,7 @@ teams.delete_team_desc=チームを削除すると、メンバーはこのリポ
 teams.delete_team_success=チームを削除しました。
 teams.read_permission_desc=このチームは読み取りアクセス権を持ちます: メンバーはチームリポジトリの閲覧とクローンが可能です。
 teams.write_permission_desc=このチームは書き込みアクセス権を持ちます: メンバーはチームリポジトリの読み取りとプッシュが可能です。
-teams.admin_permission_desc=このチームは管理者アクセス権を持ちます: メンバーはチームリポジトリの読み取り、プッシュ、共同作業者の追加が可能です。
+teams.admin_permission_desc=このチームは管理者アクセス権が付与されます: メンバーはチームリポジトリの読み取り、プッシュ、共同作業者の追加が可能です。
 teams.create_repo_permission_desc=さらに、このチームにはリポジトリの作成権限が与えられています: メンバーは組織のリポジトリを新たに作成できます。
 teams.repositories=チームのリポジトリ
 teams.search_repo_placeholder=リポジトリを検索…
@@ -2957,7 +2967,7 @@ dashboard=ダッシュボード
 identity_access=アイデンティティとアクセス
 users=ユーザーアカウント
 organizations=組織
-assets=コード アセット
+assets=コードアセット
 repositories=リポジトリ
 hooks=Webhook
 integrations=連携
@@ -3013,7 +3023,7 @@ dashboard.reinit_missing_repos=レコードが存在するが見当たらない
 dashboard.sync_external_users=外部ユーザーデータの同期
 dashboard.cleanup_hook_task_table=hook_taskテーブルのクリーンアップ
 dashboard.cleanup_packages=期限切れパッケージのクリーンアップ
-dashboard.cleanup_actions=Actionsの期限切れのログとアーティファクトのクリーンアップ
+dashboard.cleanup_actions=Actionsから期限切れのログとアーティファクトのクリーンアップする
 dashboard.server_uptime=サーバーの稼働時間
 dashboard.current_goroutine=現在のGoroutine数
 dashboard.current_memory_usage=現在のメモリ使用量
@@ -3070,7 +3080,7 @@ users.repos=リポジトリ
 users.created=作成日
 users.last_login=前回のサインイン
 users.never_login=未サインイン
-users.send_register_notify=ユーザーに登録通知を送る
+users.send_register_notify=ユーザーに登録メールを送る
 users.new_success=ユーザーアカウント "%s" を作成しました。
 users.edit=編集
 users.auth_source=認証ソース
@@ -3081,21 +3091,21 @@ users.update_profile_success=ユーザーアカウントを更新しました。
 users.edit_account=ユーザーアカウントの編集
 users.max_repo_creation=リポジトリ数の上限
 users.max_repo_creation_desc=( -1を設定するとデフォルトの制限が適用されます)
-users.is_activated=ユーザーアカウントはアクティベート済み
-users.prohibit_login=サインイン無効
+users.is_activated=有効化されたアカウント
+users.prohibit_login=アカウントが停止されました
 users.is_admin=管理者
-users.is_restricted=制限あり
-users.allow_git_hook=Gitフックを作成可
+users.is_restricted=制限付きアカウント
+users.allow_git_hook=Gitフックを作成可能
 users.allow_git_hook_tooltip=Gitフックは、Forgejoを実行しているOSユーザーの権限で実行され、同じレベルのホストアクセス権を持つようになります。 その結果、この特別なGitフック権限を持つユーザーは、Forgejo上のすべてのリポジトリとForgejoで使用されているデータベースにアクセスし、変更を加えることができます。 したがって、Forgejoの管理者権限を取得することもできます。
-users.allow_import_local=ローカルリポジトリをインポート可
-users.allow_create_organization=組織を作成可
+users.allow_import_local=ローカルリポジトリをインポート可能
+users.allow_create_organization=組織を作成可能
 users.update_profile=ユーザーアカウントを更新
 users.delete_account=ユーザーアカウントを削除
 users.cannot_delete_self=自分自身を削除することはできません
 users.still_own_repo=このユーザーはまだ1つ以上のリポジトリを所有しています。 先にそれらのリポジトリを削除するか移転してください。
 users.still_has_org=このユーザーは組織のメンバーになっています。 先に組織からこのユーザーを削除してください。
-users.purge=ユーザーを抹消
-users.purge_help=強制的にユーザーとそのユーザーが所有していたリポジトリ、組織、パッケージを削除します。コメントもすべて削除します。
+users.purge=ユーザーを消去
+users.purge_help=強制的にユーザーとそのユーザーが所有していたリポジトリ、組織、パッケージを削除します。コメントとイシューもすべて削除します。
 users.still_own_packages=このユーザーはまだ1つ以上のパッケージを所有しています。先にそれらのパッケージを削除してください。
 users.deletion_success=ユーザーアカウントを削除しました。
 users.reset_2fa=2要素認証をリセット
@@ -3492,6 +3502,20 @@ self_check.database_collation_case_insensitive = データベースは %s とい
 config_settings = 設定
 config_summary = 概要
 self_check.database_inconsistent_collation_columns = データベースは %s という collation を用いていますが、これらのカラムは別のcollationを用いています。これは想定外の問題を引き起こす可能性があります。
+users.organization_creation.description = 新しい組織の作成を許可します。
+users.restricted.description = このユーザーが共同作業者として追加されているリポジトリおよび組織とのやり取りのみを許可します。これにより、このインスタンス上のパブリックリポジトリへのアクセスが防止されます。
+users.activated.description = メール認証の完了。アクティブ化されていないアカウントの所有者は、メール認証が完了するまでログインできません。
+users.admin.description = このユーザーに、Web UI および API を通じて利用できるすべての管理機能へのフルアクセス権を付与します。
+users.local_import.description = サーバーのローカルファイル システムからリポジトリをインポートできるようにします。これはセキュリティ上の問題になる可能性があります。
+users.block.description = このユーザーが自分のアカウントを通じてこのサービスとやり取りすることをブロックし、サインインを禁止します。
+emails.delete = メールアドレスを削除
+emails.delete_desc = このメールアドレスを削除してもよろしいですか?
+config.cache_test_succeeded = キャッシュ テストが成功しました。%s で応答が返されました。
+config.cache_test_slow = キャッシュ テストは成功しましたが、応答が遅いです: %s。
+emails.deletion_success = メールアドレスは削除されました。
+emails.delete_primary_email_error = プライマリメールを削除することはできません。
+config.app_slogan = インスタンスのスローガン
+config.cache_test = テストキャッシュ
 
 
 [action]
@@ -3847,6 +3871,14 @@ runs.no_workflows.documentation = Forgejo Action の詳細については、workflow_dispatch イベントトリガーがあります。
+workflow.dispatch.use_from = ワークフローを使用する
+workflow.dispatch.input_required = 入力 "%s" に値が必要です。
+workflow.dispatch.invalid_input_type = 入力タイプ「%s」が無効です。
+workflow.dispatch.warn_input_limit = 最初の %d 個の入力のみを表示します。
+runs.no_job = ワークフローには少なくとも1つのジョブが含まれている必要があります
 
 [projects]
 type-1.display_name=個人プロジェクト
@@ -3892,6 +3924,7 @@ issue_kind = イシューを検索...
 pull_kind = プルを検索...
 exact = 完全一致
 regexp_tooltip = 検索語句を正規表現として解釈する
+regexp = 正規表現
 
 
 [munits.data]
@@ -3906,4 +3939,27 @@ b = B
 [markup]
 filepreview.lines = %[3]s の %[1]d 行目から %[2]d 行目
 filepreview.line = %[2]s の %[1]d 行目
-filepreview.truncated = プレビューは途中から省略されています
\ No newline at end of file
+filepreview.truncated = プレビューは途中から省略されています
+
+[repo.permissions]
+actions.write = 書き込み: 保留中の CI/CD パイプラインを手動でトリガー、再起動、キャンセル、または承認します。
+ext_issues = 外部のイシュー追跡へのリンクにアクセスします。権限は外部で管理されます。
+ext_wiki = 外部 Wiki へのリンクにアクセスします。権限は外部で管理されます。
+projects.write = 書き込み: プロジェクトと列を作成し、編集します。
+packages.read = 読み取り: リポジトリに割り当てられたパッケージを表示およびダウンロードします。
+packages.write = 書き込み: リポジトリに割り当てられたパッケージを公開および削除します。
+code.read = 読み取り: リポジトリのコードにアクセスしてクローンを作成します。
+code.write = 書き込み: リポジトリにプッシュし、ブランチとタグを作成します。
+issues.read = 読み取り: イシューとコメントを読んで作成します。
+issues.write = 書き込み: イシューを解決し、ラベル、マイルストーン、担当者、期限、依存関係などのメタデータを管理します。
+pulls.read = 読み取り: プルリクエストの読み取りと作成。
+releases.read = 読み取り: リリースを表示およびダウンロードします。
+releases.write = 書き込み: リリースとそのアセットを公開、編集、削除します。
+pulls.write = 書き込み: プルリクエストをクローズし、ラベル、マイルストーン、担当者、期限、依存関係などのメタデータを管理します。
+wiki.read = 読み取り: 統合された wiki とその履歴を読み取れます。
+wiki.write = 書き込み: 統合された Wiki 内のページを作成、更新、削除します。
+projects.read = 読み取り: リポジトリ プロジェクト ボードにアクセスします。
+actions.read = 読み取り: 統合された CI/CD パイプラインとそのログを表示します。
+
+[translation_meta]
+test = これはテスト文字列です。Forgejo UI には表示されませんが、テスト目的で使用されます。早く済ませるために"ok"と入力するか楽しかった出来事を入力して下さい。そうすれば、完了することができます :)
\ No newline at end of file
diff --git a/options/locale/locale_lt.ini b/options/locale/locale_lt.ini
index 32d66f8a73..62be471c1a 100644
--- a/options/locale/locale_lt.ini
+++ b/options/locale/locale_lt.ini
@@ -171,6 +171,8 @@ branch_kind = Ieškoti šakų...
 milestone_kind = Ieškoti gairių...
 pull_kind = Ieškoti sujungimų...
 keyword_search_unavailable = Ieškoti pagal raktažodį šiuo metu nepasiekiamas. Susisiekite su svetainės administratoriumi.
+regexp = Reguliarusis reiškinys
+regexp_tooltip = Interpretuoti paieškos terminą kaip reguliariąją reiškinį
 
 [actions]
 workflow.disable = Išjungti darbo eigą
@@ -230,6 +232,7 @@ buttons.switch_to_legacy.tooltip = Vietoj to naudoti senąjį rengyklę
 buttons.enable_monospace_font = Įjungti vienspalvį šriftą
 buttons.disable_monospace_font = Išjungti vienspalvį šriftą
 buttons.indent.tooltip = Įdėti elementus vienu lygiu
+buttons.unindent.tooltip = Išdėti elementus vienu lygiu
 
 [error]
 network_error = Tinklo klaida
diff --git a/options/locale/locale_nds.ini b/options/locale/locale_nds.ini
new file mode 100644
index 0000000000..5c39d4b5a2
--- /dev/null
+++ b/options/locale/locale_nds.ini
@@ -0,0 +1,1956 @@
+
+
+
+[common]
+home = Heimaad
+explore = Utförsken
+help = Hülp
+sign_in = Anmellen
+sign_in_with_provider = Mit %s anmellen
+sign_in_or = of
+sign_out = Ofmellen
+sign_up = Registreren
+link_account = Konto verbinnen
+version = Versioon
+powered_by = Dreven mit %s
+page = Sied
+template = Vörlaag
+language = Spraak
+notifications = Narichtens
+tracked_time_summary = Tosamenfaten vun erfaat Tied na de Filters in de Gefall-List
+create_new = Neei …
+user_profile_and_more = Profil un Instellens …
+signed_in_as = Anmellt as
+enable_javascript = Deese Internett-Sied bruukt JavaScript.
+toc = Inhaltens-Verteeknis
+return_to_forgejo = Torügg to Forgejo
+toggle_menu = Menü umschalten
+more_items = Mehr Dingen
+username = Brukernaam
+access_token = Togang-Teken
+captcha = CAPTCHA
+twofa = Twee-Faktooren-Anmellen
+twofa_scratch = Twee-Faktooren-Eenmaalpasswoord
+webauthn_insert_key = Steek dienen Sekerheids-Slötel in
+webauthn_press_button = Bidde drück de Knoop up dienem Sekerheids-Slötel …
+webauthn_use_twofa = Bruuk eene Twee-Faktooren-Tahl vun dienem Telefoon
+webauthn_error = Kunn dienen Sekerheids-Slötel nich lesen.
+webauthn_unsupported_browser = Dien Browser unnerstütt stedenwies WebAuthn nich.
+webauthn_error_unknown = Een unbekannter Fehler is uptreden. Bidde versöök dat noch eenmaal.
+passcode = Pass-Tahl
+webauthn_error_empty = Du muttst de Slötel eenen Naam geven.
+repository = Repositorium
+organization = Verenigung
+new_fork = Neje Repositoriums-Gabel
+dashboard = Mien Disk
+logo = Logo
+active_stopwatch = Aktive Tied-Erfatens
+password = Passwoord
+register = Registreren
+licenses = Lizenzen
+email = E-Mail-Adress
+re_type = Passwoord utwiesen
+webauthn_error_unable_to_process = De Server kunn diene Anfraag nich verarbeiden.
+new_mirror = Nejer Spegel
+webauthn_sign_in = Drück de Knopp up dienem Sekerheids-Slötel. Wenn dien Slötel keenen Knopp hett, steek ’t ut un weer in.
+webauthn_error_insecure = WebAuthn unnerstütt blots seker Verbinnens. Wenn du över HTTP testen willst, kannst du de Quell »localhost« of »127.0.0.1« bruken
+webauthn_error_duplicated = De Sekerheids-Slötel is för deese Anfraag nich verlöövt. Bidde wees wiss, dat de Slötel nich al vermarkt is.
+webauthn_error_timeout = Tied överweggahn ehr dien Slötel lesen worden kunn. Bidde laad deese Sied neei un versöök dat noch eenmaal.
+mirror = Spegel
+new_project = Nejes Projekt
+new_project_column = Neje Rieg
+admin_panel = Sied-Administreren
+settings = Instellens
+your_profile = Profil
+your_starred = Steern sett
+your_settings = Instellens
+new_repo.title = Nejes Repositorium
+new_org.title = Neje Verenigung
+new_repo.link = Nejes Repositorium
+all = All
+mirrors = Spegels
+forks = Gabels
+activities = Doon
+pull_requests = Haalvörslagen
+issues = Gefallens
+milestones = Markstenen
+ok = Jau
+cancel = Ofbreken
+rerun = Weer lopen laten
+rerun_all = All Upgavens weer lopen laten
+save = Sekern
+add_all = All hentofögen
+remove = Wegdoon
+remove_all = All wegdoon
+remove_label_str = Ding »%s« wegdoon
+edit = Bewarken
+view = Wiesen
+test = Testen
+enabled = Anknipst
+disabled = Utknipst
+locked = Tosloten
+copy = Koperen
+copy_generic = To Tüskenavlaag koperen
+copy_url = URL koperen
+copy_hash = Prüfsumm koperen
+copy_content = Inholl koperen
+copy_branch = Twiegnaam koperen
+copy_success = Kopeert!
+copy_error = Koperen fehlslagen
+write = Schrieven
+preview = Vörschau
+loading = Lädt …
+error = Fehler
+error404 = De Sied, wat du söchst, gifft dat of nich of du hest nich de Rechten, se antokieken.
+error413 = Du hest diene Quote överweggahn.
+go_back = Torügg gahn
+invalid_data = Ungültiger Weert: %v
+never = Nie
+unknown = Unbekannt
+rss_feed = RSS-Schuuv
+pin = Faststeken
+unpin = Lösssteken
+artifacts = Objekten
+confirm_delete_artifact = Willst du dat Objekt »%s« würrelk lösken?
+archived = Archiveert
+concept_user_individual = Enkelt
+concept_code_repository = Repositorium
+show_log_seconds = Sekünnen wiesen
+show_full_screen = Hele Billschirm wiesen
+download_logs = Utgaav runnerladen
+name = Naam
+value = Weert
+filter = Filter
+filter.is_archived = Archiveert
+filter.not_archived = Nich archiveert
+filter.is_fork = Gabels
+filter.not_fork = Nich Gabels
+filter.not_mirror = Nich Spegels
+filter.is_template = Vörlagen
+filter.not_template = Nich Vörlagen
+filter.public = Publik
+filter.private = Privaat
+new_migrate.link = Nejer Umtreck
+concept_system_global = Överall
+new_migrate.title = Nejer Umtreck
+retry = Weer versöken
+sources = Quellen
+show_timestamps = Tiedstempels wiesen
+confirm_delete_selected = Willst du all de utköört Dingen lösken?
+collaborative = Mitnanner arbeiden
+add = Hentofögen
+copy_type_unsupported = Deese Aard vun Datei kann nich kopeert worden
+new_org.link = Neje Verenigung
+concept_user_organization = Verenigung
+filter.clear = Filters leegmaken
+filter.is_mirror = Spegels
+
+[search]
+search = Söken …
+type_tooltip = Söök-Aard
+fuzzy = um de Slag
+fuzzy_tooltip = Ok Resultaten wiesen, wat dicht to de Söökwoorden passen
+union = Passt
+union_tooltip = Resultaten wiesen, wat to eets of anner vun de mit Leegtekens trennt Söökwoorden passen
+exact = Akkeraat
+exact_tooltip = Blots Resultaten wiesen, wat akkeraat to de Söökwoord passen
+regexp = RegEx
+regexp_tooltip = De Söökwoord as Regel-Utdruck behanneln
+repo_kind = In Repos söken …
+user_kind = In Brukers söken …
+org_kind = In Verenigungen söken …
+team_kind = In Klottjen söken …
+project_kind = In Projekten söken …
+commit_kind = In Kommitterens söken …
+runner_kind = In Lopers söken …
+no_results = Nix funnen, wat passt.
+milestone_kind = In Markstenen söken …
+pull_kind = In Haalvörslagens söken …
+code_search_unavailable = Quelltext-Söök is stedenwies nich verföögbaar. Bidde kuntakteer de Sied-Chef.
+branch_kind = In Twiegen söken …
+code_kind = In Quelltext söken …
+package_kind = In Paketen söken …
+issue_kind = In Gefallens söken …
+keyword_search_unavailable = Woorden-Söök is stedenwies nich verföögbaar. Bidde kuntakteer de Sied-Chef.
+
+[aria]
+navbar = Navigerens-Balken
+footer = Footbalken
+footer.software = Över deeses Programm
+footer.links = Verwiesens
+
+[heatmap]
+number_of_contributions_in_the_last_12_months = %s Bidragens in de lesten 12 Maanten
+contributions_zero = Keene Bidragens
+contributions_format = {contributions} am {day}. {month} {year}
+contributions_one = Bidrag
+less = Minner
+more = Mehr
+contributions_few = Bidragens
+
+[editor]
+buttons.bold.tooltip = Fetten Text hentofögen
+buttons.italic.tooltip = Schüünen Text hentofögen
+buttons.quote.tooltip = Text ziteren
+buttons.code.tooltip = Quelltext hentofögen
+buttons.link.tooltip = Verwies hentofögen
+buttons.list.unordered.tooltip = Punkierte List hentofögen
+buttons.list.task.tooltip = List vun Upgavens hentofögen
+buttons.mention.tooltip = Eenen Bruker of eene Klottje nömen
+buttons.ref.tooltip = Een Gefall of Haalvörslag nömen
+buttons.switch_to_legacy.tooltip = In Stee daarvun de olle Bewarker bruken
+buttons.disable_monospace_font = Fastbreden-Schrift utknipsen
+buttons.indent.tooltip = Dingen um een Stand inschuven
+buttons.unindent.tooltip = Dingen um een Stand utschuven
+buttons.heading.tooltip = Överschrift hentofögen
+buttons.list.ordered.tooltip = Nummereerte List hentofögen
+buttons.enable_monospace_font = Fastbreden-Schrift anknipsen
+
+[filter]
+string.desc = Z – A
+string.asc = A – Z
+
+[error]
+not_found = Dat Enn kunn nich funnen worden.
+network_error = Nettwark-Fehler
+server_internal = Binnerer Server-Fehler
+occurred = Een Fehler is uptreden
+report_message = Wenn du glöövst, dat dat een Fehler mit Forgejo is, dann söök bidde up Codeberg na Gefallens of maak falls nödig een nejes Gefall op.
+
+[startpage]
+app_desc = Een sülvst-hostet Git-Deenst sünner Pien
+install = Licht to installeren
+
+[home]
+uname_holder = Brukernaam of E-Mail-Adress
+switch_dashboard_context = Mien-Disk-Umgeven wesseln
+my_repos = Repositoriums
+my_orgs = Verenigungen
+view_home = %s wiesen
+filter_by_team_repositories = Na Klottjen-Repositoriums filtern
+feed_of = Schuuv vun »%s«
+show_archived = Archiveert
+show_only_unarchived = Wiest blots nich archiveert
+show_private = Privaat
+show_only_private = Wiest blots privaat
+show_only_public = Wiest blots publik
+show_only_archived = Wiest blots archiveert
+issues.in_your_repos = In dienen Repositoriums
+filter = Anner Filters
+show_both_archived_unarchived = Wiest archiveert un nicht archiveert
+show_both_private_public = Wiest publik un privaat
+
+[explore]
+repos = Repositoriums
+users = Brukers
+stars_one = %d Steern
+stars_few = %d Steerns
+forks_one = %d Gabel
+forks_few = %d Gabels
+go_to = Gah to
+code = Quelltext
+code_last_indexed_at = Tolest indizeert %s
+relevant_repositories_tooltip = Repositoriums, wat Gabels sünd of wat keene Themen, keen Bill un keen Beschrieven hebben, sünd versteekt.
+relevant_repositories = Blots Repositoriums vun Belang worden wiest; wies Resultaten sünner Filter.
+organizations = Verenigungen
+
+[auth]
+create_new_account = Konto vermarken
+disable_register_prompt = Registreren is utknipst. Bidde kuntakteer de Sied-Chef.
+disable_register_mail = E-Mail-Utwiiesen för ’t Registreren is utknipst.
+manual_activation_only = Kuntakteer de Sied-Chef, um dat Aktiveren oftosluten.
+remember_me = Deeses Gereed marken
+forgot_password = Passwoord vergeten?
+hint_register = Bruukst du een Konto? Registreer di nu.
+sign_up_button = Registreer di nu.
+sign_up_successful = Dien Konto is anleggt worden. Willkomen!
+must_change_password = Verneei dien Passwoord
+active_your_account = Aktiveer dien Konto
+account_activated = Konto is aktiveert worden
+prohibit_login = Konto is sperrt
+resent_limit_prompt = Du hest körtens eerst eene Aktiverens-E-Mail anfordert. Bidde wacht 3 Menüten un versöök dat dann weer.
+change_unconfirmed_email_summary = Änner de E-Mail-Adress, waar de Aktiverens-E-Mail hen sennt wordt.
+send_reset_mail = Torügghalens-E-Mail sennen
+reset_password = Konto torügghalen
+invalid_code = Diene Utwies-Tahl is ungültig of avlopen.
+invalid_password = Dien Passwoord passt nich to de Passwoord, wat bruukt worden is, um dat Konto intorichten.
+reset_password_helper = Konto torügghalen
+reset_password_wrong_user = Du büst as %s anmellt, aver de Konto-Torügghalens-Verwies is för %s dacht
+allow_password_change = Verlangen, dat de Bruker sien Passwoord ännert (anraadt)
+change_unconfirmed_email = Wenn du bi’m Registreren de falske E-Mail-Adress angeven hest, kannst du se ünnern ännern, un de Utwies-Naricht word in Stee daarvun to de neje Adress sennt.
+forgot_password_title = Passwoord vergeten
+hint_login = Hest du al een Konto? Nu anmellen!
+change_unconfirmed_email_error = Kann de E-Mail-Adress nich ännern: %v
+prohibit_login_desc = Dien Konto is daartegen sperrt worden, mit de Instanz to warken. Kuntakteer de Instanz-Chef, um weer Togang to kriegen.
+resend_mail = Klick hier, um de AktiverensE-Mail neei to sennen
+invalid_code_forgot_password = Diene Utwies-Tahl is ungültig of avlopen. Klick hier, um eene neje Sitzung to begünnen.
+verify = Utwiesen
+scratch_code = Eenmaalpasswoord
+use_scratch_code = Een Eenmaalpasswoord bruken
+login_userpass = Anmellen
+oauth_signup_submit = Konto ofsluten
+oauth_signin_tab = Mit eenem bestahn Konto verbinnen
+oauth_signin_submit = Konto verbinnen
+openid_connect_submit = Verbinnen
+authorize_application = Programm verlöven
+authorize_application_created_by = Deeses Programm is vun %s maakt worden.
+authorize_title = »%s« verlöven, up dien Konto totogriepen?
+authorization_failed = Verlööv fehlslagen
+back_to_sign_in = Torügg tum Anmellen
+openid_register_title = Nejes Konto maken
+password_pwned_err = Kunn Anfraag to HaveIBeenPwned nich ofsluten
+password_too_short = Passwoord kann nich körter as %d Bookstavens wesen.
+email_domain_blacklisted = Du kannst di nich mit deener E-Mail-Adress registreren.
+authorize_redirect_notice = Du worst na %s umleit, wenn du deeses Programm verlöövst.
+oauth.signin.error.access_denied = De Anmell-Anfraag is oflehnt worden.
+last_admin = Du kannst de leste Chef nich wegdoon. Dat mutt tominnst eenen Chef geven.
+unauthorized_credentials = Anmell-Informatioon is falsk of avlopen. Bidde versöök de Örder noch eenmaal of kiek för mehr Informatioonen %s an
+twofa_scratch_token_incorrect = Dien Eenmaalpasswoord is falsk.
+sign_in_openid = Mit OpenID wiedermaken
+oauth_signup_tab = Nejes Konto vermarken
+oauth_signup_title = Nejes Konto ofsluten
+oauth_signin_title = Mell di an, um dat Konto-Verbinnen to verlöven
+openid_connect_title = Mit eenem bestahn Konto verbinnen
+
+[mail]
+view_it_on = Up %s wiesen
+activate_account = Bidde aktiveer dien Konto
+register_notify.text_1 = dat is diene Registrerens-Utwiesen-E-Mail för %s!
+register_notify.text_3 = Wenn well anners deeses Konto för di maakt hett, muttst du toeerst dien Passwoord setten.
+reset_password = Haal dien Konto torügg
+password_change.text_1 = Dat Passwoord för dien Konto is jüüst ännert worden.
+totp_disabled.subject = TOTP is utknipst
+totp_disabled.text_1 = Tied-baseert Eenmaalpasswoord (TOTP) för dien Konto is jüüst utknipst worden.
+totp_disabled.no_2fa = Keene anner 2FA-Aarden sünd mehr inricht, sodat dat nu nich mehr nödig is, dat du di mit 2FA to dien Konto anmellst.
+removed_security_key.subject = Een Sekerheids-Slötel is wegdaan worden
+removed_security_key.text_1 = Sekerheids-Slötel »%[1]s« is jüüst ut dienem Konto wegdaan worden.
+account_security_caution.text_1 = Wenn du dat weerst, kannst du deese E-Mail seker minnachten.
+account_security_caution.text_2 = Wenn du dat nich weerst, hett well in dien Konto inbroken. Bidde kuntakteer de Sied-Chefs.
+register_success = Registreren kumpleet
+issue_assigned.pull = @%[1]s hett di to Haalvörslag %[2]s in Repositorium %[3]s towiesen.
+issue.action.reopen = @%[1]s hett #%[2]s weer opmaakt.
+issue.action.merge = @%[1]s hett #%[2]s in %[3]s tosamenföhrt.
+issue.action.reject = @%[1]s hett um Änners för deesen Haalvörslag beden.
+issue.action.ready_for_review = @%[1]s hett deesen Haalvörslag as klaar tum Nakieken markeert.
+issue.action.new = @%[1]s hett #%[2]d opmaakt.
+release.new.subject = %s in %s publik maakt
+release.note = Notiz:
+release.downloads = Runnerladen:
+repo.transfer.subject_to = %s will Repositorium »%s« to %s överdragen
+repo.transfer.to_you = du
+link_not_working_do_paste = Gaht de Verwies nich? Versöök, dat to koperen un in de URL-Rieg vun dienem Browser intofögen.
+hi_user_x = Moin %s,
+activate_account.text_2 = Bidde klick up deesen Verwies, um dien Konto binnen %s to aktiveren:
+admin.new_user.user_info = Bruker-Informatioon
+activate_email.text = Bidde klick up deesen Verwies, um diene E-Mail-Adress binnen %s uttowiesen:
+reset_password.text = Wenn du dat weerst, klick bidde up deesen Verwies, um dien Konto binnen %s torüggtohalen:
+password_change.subject = Dien Passwoord is ännert worden
+issue_assigned.issue = @%[1]s hett di to Gefall %[2]s in Repositorium %[3]s towiesen.
+issue.action.push_1 = @%[1]s hett %[3]Kommitteren to %[2]s schuven
+issue.action.push_n = @%[1]s hett %[3]Kommitterens to %[2]s schuven
+activate_account.text_1 = Moin %[1]s, wees bedankt, dat du di up %[2]s registreert hest!
+issue.action.review_dismissed = @%[1]s hett dat leste Nakieken vun %[2]s för deesen Haalvörslag ofseggt.
+issue.in_tree_path = In %s:
+reply = of anter deeser E-Mail stracks
+activate_email = Wies diene E-Mail-Adress ut
+admin.new_user.subject = Nejer Bruker %s jüüst registreert
+register_notify = Willkomen up %s
+register_notify.text_2 = Du kannst di to dien Konto mit dienem Brukernaam anmellen: %s
+primary_mail_change.text_1 = De Höövd-E-Mail-Adress vun dienem Konto is jüüst to %[1]s ännert worden. Dat heet, dat deese E-Mail-Adress keene E-Mail-Narichtens för dien Konto mehr kriegen word.
+release.title = Titel: %s
+repo.collaborator.added.subject = %s hett di to %s as Mitarbeider hentoföögt
+team_invite.text_2 = Bidde klick up deesen Verwies, um de Klottje bitotreden:
+issue.action.force_push = %[1]s hett de %[2]s vun %[3]s to %[4]s dwangsschuven.
+issue.action.review = @%[1]s hett över deesen Haalvörslag kommenteert.
+primary_mail_change.subject = Diene Höövd-E-Mail-Adress is ännert worden
+release.new.text = @%[1]s hett %[2]s in %[3]s publik maakt
+release.download.targz = Quelltext (TAR.GZ)
+repo.collaborator.added.text = Du büst as Mitarbeider to deesem Repositorium hentoföögt worden:
+team_invite.text_1 = %[1]s hett di inladen, in de Klottje %[2]s in de Verenigung %[3]s intotreden.
+removed_security_key.no_2fa = Keene anner 2FA-Aarden sünd mehr inricht, sodat dat nu nich mehr nödig is, dat du di mit 2FA to dien Konto anmellst.
+totp_enrolled.subject = Du hest TOTP as 2FA-Aard anknipst
+totp_enrolled.text_1.no_webauthn = Du hest jüüst TOTP för dien Konto anknipst. Dat heet, dat du bi all tokünftig Anmellens TOTP as 2FA-Aard bruken muttst.
+totp_enrolled.text_1.has_webauthn = Du hest jüüst TOTP för dien Konto anknipst. Dat heet, dat du bi all tokünftig Anmellens TOTP as 2FA-Aard of eets vun dien Sekerheids-Slötels bruken kannst.
+issue.x_mentioned_you = @%s hett di nöömt:
+issue.action.approve = @%[1]s hett deesem Haalvörslag tostimmt.
+repo.transfer.subject_to_you = %s will Repositorium »%s« to di överdragen
+team_invite.text_3 = Wahrschau: Deese Inladen weer för %[1]s dacht. Wenn du deese Inladen nich verwacht hest, kannst du deese E-Mail minnachten.
+issue.action.close = @%[1]s hett #%[2]s dichtmaakt.
+repo.transfer.body = Um dat antonehmen of oftolehnen, besöök %s, of ignoreer dat eenfach.
+release.download.zip = Quelltext (ZIP)
+team_invite.subject = %[1]s hett di inladen, in de Verenigung %[2]s intotreden
+
+[modal]
+no = Nee
+confirm = Utwiesen
+cancel = Ofbreken
+yes = Jau
+modify = Vernejen
+
+[form]
+UserName = Brukernaam
+FullName = Kumpleter Naam
+Pronouns = Pronomens
+Biography = Levensloop
+Website = Internett-Sied
+Location = Stee
+RepoName = Repositoriums-Naam
+TeamName = Klottjen-Naam
+AuthName = Verlööv-Naam
+AdminEmail = Chef-E-Mail
+AccessToken = Togang-Teken
+CommitMessage = Kommitteren-Naricht
+TreeName = Dateipadd
+SSPISeparatorReplacement = Trenner
+SSPIDefaultLanguage = Normaalspraak
+email_error = ` is keene gültige E-Mail-Adress.`
+captcha_incorrect = De CAPTCHA-Tahl is falsk.
+username_been_taken = Deeser Brukernaam word al bruukt.
+To = Twieg-Naam
+CommitChoice = Kommitteren-Utköör
+git_ref_name_error = ` mutt een gültig Git-Beteekner-Naam wesen.`
+include_error = ` mutt de Text »%s« enthollen.`
+password_not_match = De Passwoorden passen nich.
+Password = Passwoord
+Content = Inholl
+require_error = ` kann nich leeg wesen.`
+alpha_dash_error = ` sall nix as alphanumerisk Bookstavens un Binnestrekens (»-«) un Unnerstrekens (»_«) enthollen.`
+size_error = ` mutt de Grött %s hebben.`
+glob_pattern_error = ` Glob-Muster is ungültig: %s.`
+Email = E-Mail-Adress
+Retype = Passwoord utwiesen
+CommitSummary = Kommitteren-Tosamenfaten
+Description = Beschrieven
+NewBranchName = Nejer Twieg-Naam
+min_size_error = ` mutt tominnst %s Bookstavens enthollen.`
+regex_pattern_error = ` Regex-Muster is ungültig: %s.`
+username_error_no_dots = ` kann nix as alphanumerisk Bookstavens (»0-9«, »a-z«, »A-Z«) un Binnestrekens (»-«) un Unnerstrekens (»_«) enthollen. ’t kann nich mit nich-alphanumerisk Bookstavens begünnen of ennen, un ’t düür nich twee nich-alphanumerisk Bookstavens stracks achternanner geven.`
+lang_select_error = Köör eene Spraak ut de List ut.
+alpha_dash_dot_error = ` sall nix as alphanumerisk Bookstavens un Binnestrekens (»-«), Unnerstrekens (»_«) un Punkten (».«) enthollen.`
+max_size_error = ` düür nich mehr as %s Bookstavens enthollen.`
+url_error = `»%s« is keene gültige URL.`
+username_error = ` kann nix as alphanumerisk Bookstavens (»0-9«, »a-z«, »A-Z«) un Binnestrekens (»-«), Unnerstrekens (»_«) un Punkten (».«) enthollen. ’t kann nich mit nich-alphanumerisk Bookstavens begünnen of ennen, un ’t düür nich twee nich-alphanumerisk Bookstavens stracks achternanner geven.`
+invalid_group_team_map_error = ` Towiesen is ungültig: %s`
+unknown_error = Unbekannter Fehler:
+repo_name_been_taken = De Repositoriums-Naam word al bruukt.
+username_change_not_local_user = Frömde Brukers düren hör Brukernaam nich ännern.
+repository_files_already_exist.adopt = Dateien för deeses Repositorium gifft ’t al un kann blots övernohmen worden.
+repository_files_already_exist.delete = Dateien för deeses Repositorium gifft ’t al. Du muttst se lösken.
+password_uppercase_one = Tominnst een Grootbookstaav
+password_digit_one = Tominnst eene Tahl
+enterred_invalid_repo_name = De Repositoriums-Naam, wat du ingeven hest, is falsk.
+enterred_invalid_org_name = De Verenigungs-Naam, wat du ingeven hest, is falsk.
+enterred_invalid_owner_name = De neje Eegner-Naam is nich gültig.
+user_not_exist = De Bruuker gifft ’t nich.
+team_not_exist = De Klottje gifft ’t nich.
+unset_password = De Anmell-Bruker hett dat Passwoord nich sett.
+last_org_owner = Du kannst nich de leste Bruker ut de »Eegners«-Klottje wegdoon. Eene Verenigung mutt alltieden tominnst eenen Eegner hebben.
+cannot_add_org_to_team = Eene Verenigung kann nich as Liddmaat hentoföögt worden.
+organization_leave_success = Du hest de Verenigung %s verlaten.
+invalid_ssh_key = Kann dienen SSH-Slötel nich utwiesen: %s
+repository_force_private = Dwang-Privaat is anknipst: Privaate Repositoriums könen nich publik maakt worden.
+repository_files_already_exist.adopt_or_delete = Dateien för deeses Repositorium gifft ’t al. Nehm se an of löske se.
+username_password_incorrect = Brukernaam of Passwoord is falsk.
+repository_files_already_exist = Dateien för deeses Repositorium gifft ’t al. Kuntakteer de Systeemchef.
+email_invalid = De E-Mail-Adress is ungültig.
+password_special_one = Tominnst een Sünnerbookstaav (Punkte, Klammern, Anföhrens-Tekens of so wat)
+org_name_been_taken = De Verenigungs-Naam word al bruukt.
+team_name_been_taken = De Klottjen-Naam word al bruukt.
+team_no_units_error = Verlööv Togang to tominnst eenem Repositoriums-Deel.
+email_been_used = De E-Mail-Adress word al bruukt.
+enterred_invalid_password = Dat Passwoord, wat du ingeven hest, is falsk.
+password_complexity = Passwoord is nich kumplizeert genoog:
+invalid_gpg_key = Kann dienen GPG-Slötel nich utwiesen: %s
+openid_been_used = De OpenID-Adress »%s« word al bruukt.
+password_lowercase_one = Tominnst een Kleenbookstaav
+duplicate_invite_to_team = De Bruker is al as Liddmaat inladen.
+unsupported_login_type = De Anmell-Aard unnerstütt dat Konto-Lösken nich.
+invalid_ssh_principal = Ungültiger Höövdmann: %s
+unable_verify_ssh_key = Kann de SSH-Slötel nich utwiesen, bidde kiek noch eenmaal, dat daar keen Fehler drin is.
+auth_failed = Verlöven fehlslagen: %v
+still_own_repo = Dien Konto is een Eegner vun een of mehr Repositoriums, löske of överdraag se eerst.
+still_own_packages = Dien Konto is een Eegner vun een of mehr Paketen, löske se eerst.
+org_still_own_repo = Deese Verenigung is een Eegner vun een of mehr Repositoriums, löske of överdraag se eerst.
+target_branch_not_exist = Enn-Twieg gifft ’t nich.
+admin_cannot_delete_self = Du kannst di nich sülvst lösken, wenn du een Chef büst. Löske eerst diene Chef-Rechten.
+required_prefix = Ingaav mutt mit »%s« begünnen
+must_use_public_key = Du hest eenen privaaten Slötel ingeven. Bidde laad dienen privaaten Slötel nienich elkeenwaar up. Bruuk in Stee daarvun dienen publiken Slötel.
+still_has_org = Dien Konto is een Liddmaat in een of mehr Verenigungen, verlaat se eerst.
+org_still_own_packages = Deese Verenigung is een Eegner vun een of mehr Paketen, löske se eerst.
+
+[user]
+change_avatar = Änner dien Kontobill …
+joined_on = Am %s bitreden
+repositories = Repositoriums
+activity = Publikes Doon
+followers.title.one = Nagaher
+followers.title.few = Nagahers
+following.title.one = Gaht na
+followers_one = %d Nagaher
+followers_few = %d Nagahers
+following_one = %d gaht na
+following_few = %d gahn na
+follow = Nagahn
+unfollow = Nich mehr nagahn
+block_user = Bruker blockeren
+starred = Repositoriums mit Steernen
+watched = Beluurt Repositoriums
+code = Quelltext
+projects = Projekten
+following.title.few = Gaht na
+overview = Översicht
+block = Blockeren
+unblock = Nich mehr blockeren
+user_bio = Levensloop
+email_visibility.limited = All anmellt Brukers könen diene E-Mail-Adress sehn
+show_on_map = Deese Stee up eener Kaart wiesen
+settings = Bruker-Instellens
+disabled_public_activity = Deeser Bruker hett dat publike Ankieken vun de Doon utknipst.
+form.name_chars_not_allowed = Brukernaam »%s« enhollt ungültig Bookstavens.
+form.name_pattern_not_allowed = Dat Muster »%s« is in eenem Brukernaam nich verlöövt.
+form.name_reserved = De Brukernaam »%s« is vörbehollen.
+
+[settings]
+profile = Profil
+security = Sekerheid
+repos = Repositoriums
+delete = Konto lösken
+organization = Verenigungen
+uid = UID
+webauthn = Twee-Faktooren-Anmellen (Sekerheids-Slötels)
+blocked_users = Blockeert Brukers
+public_profile = Publikes Profil
+location_placeholder = Deel umslag diene Stee mit annerns
+pronouns = Pronomens
+pronouns_custom = Eegene
+update_theme = Thema ännern
+update_profile = Profil vernejen
+update_language_success = Spraak is verneeit worden.
+update_profile_success = Dien Profil is verneeit worden.
+change_username_prompt = Wahrschau: Wenn du dienen Brukernaam ännerst, ännert sik ok diene Konto-URL.
+change_username_redirect_prompt = De olle Brukernaam leit daarhen um, bit well anners hüm nimmt.
+continue = Wiedermaken
+cancel = Ofbreken
+language = Spraak
+language.title = Normaalspraak
+language.localization_project = Hülp uns, Forgejo in diene Spraak to översetten! Mehr unnerhören.
+hints = Wenken
+update_hints = Wenken vernejen
+update_hints_success = Wenken sünd verneeit worden.
+hidden_comment_types = Verbargen Kommentaar-Aarden
+hidden_comment_types.issue_ref_tooltip = Kommentaren, waar de Bruker de Twieg/Mark, wat mit deesem Gefall verbunnen is, ännert hett
+comment_type_group_branch = Twieg
+comment_type_group_time_tracking = Tied-Erfaten
+comment_type_group_pull_request_push = Kommitterens hentoföögt
+comment_type_group_project = Projekt
+comment_type_group_issue_ref = Gefall-Nömen
+saved_successfully = Diene Instellens sünd sekert worden.
+privacy = Privaatheid
+lookup_avatar_by_mail = Kontobill vun E-Mail-Adress söken
+enable_custom_avatar = Eegen Kontobill bruken
+choose_new_avatar = Nejes Kontobill utkören
+update_avatar = Kontobill vernejen
+delete_current_avatar = Stedenwies Kontobill lösken
+uploaded_avatar_is_too_big = De upladen Dateigrött ((%d KiB) is mehr as verlöövt (%d KiB).
+update_avatar_success = Dien Kontobill is verneeit worden.
+change_password = Passwoord ännern
+update_password = Passwoord vernejen
+old_password = Stedenwies Passwoord
+new_password = Nejes Passwoord
+theme_desc = Dat word dien normaales Thema dör de Sied wesen.
+primary = Höövd
+activated = Aktiveert
+requires_activation = Mutt aktiveert worden
+primary_email = As Höövd setten
+activations_pending = Aktiveren staht ut
+delete_email = Wegdoon
+email_deletion = E-Mail-Adress wegdoon
+add_new_openid = Neje OpenID-URI hentofögen
+add_email = E-Mail-Adress hentofögen
+add_openid = OpenID-URI hentofögen
+keep_email_private = E-Mail-Adress verbargen
+manage_gpg_keys = GPG-Slötels verwalten
+ssh_principal_been_used = Deeser Höövdmann is al to de Server hentoföögt worden.
+gpg_key_id_used = Eenen publiken GPG-Slötel mit de sülve ID gifft ’t al.
+gpg_token_signature = Beschütt GPG-Unnerschrift
+key_signature_gpg_placeholder = Begünnt mit »-----BEGIN PGP SIGNATURE-----«
+ssh_key_verified = Utwiest Slötel
+ssh_key_verify = Utwiesen
+ssh_token = Teken
+ssh_token_help = So kannst du de Unnerschrift maken:
+ssh_token_signature = Beschütt SSH-Unnerschrift
+key_signature_ssh_placeholder = Begünnt mit »-----BEGIN SSH SIGNATURE-----«
+verify_ssh_key_success = SSH-Slötel »%s« is utwiest worden.
+key_id = Slötel-ID
+principal_content = Inholl
+add_gpg_key_success = De GPG-Slötel »%s« is hentoföögt worden.
+delete_key = Wegdoon
+ssh_key_deletion = SSH-Slötel wegdoon
+ssh_principal_deletion_success = De Höövdmann is wegdaan worden.
+orgs = Verenigungen
+biography_placeholder = Vertell uns een bietje wat över di! (Du kannst Markdown bruken)
+change_username = Dien Brukernaam is ännert worden.
+ui = Thema
+additional_repo_units_hint_description = Wiest eenen Wenk »Mehr anknipsen« för Repositoriums, in wat nich all verföögbaar Delen anknipst sünd.
+comment_type_group_label = Vermark
+comment_type_group_title = Titel
+keep_activity_private = Doon vun de Profil-Sied verbargen
+appearance = Utsehn
+twofa = Twee-Faktooren-Anmellen (TOTP)
+update_language_not_found = Spraak »%s« is nich verföögbaar.
+hidden_comment_types.ref_tooltip = Kommentaren, waar deeses Gefall vun eenem anner Gefall/Kommitteren/… nöömt worden is
+comment_type_group_assignee = Towiesen
+comment_type_group_deadline = Anstahn
+password_change_disabled = Frömde Brukers könen hör Passwoord nich dör de Forgejo-Internett-Brukerschnittstee vernejen.
+manage_openid = OpenID-Adressen
+openid_deletion_desc = Wenn du deese OpenID-Adress ut dienem Konto wegdoost, kannst du di nich mehr daarmit anmellen. Wiedermaken?
+add_new_email = E-Mail-Adress hentofögen
+applications = Programmen
+full_name = Kumpleter Naam
+update_language = Spraak ännern
+update_user_avatar_success = Dat Kontobill vum Bruker is verneeit worden.
+ssh_gpg_keys = SSH- un GPG-Slötels
+password_incorrect = De stedenwies Passwoord is falsk.
+manage_emails = E-Mail-Adressen verwalten
+activate_email = Aktiveren sennen
+email_deletion_success = De E-Mail-Adress is wegdaan worden.
+uploaded_avatar_not_a_image = De upladen Datei is keen Bill.
+openid_deletion_success = De OpenID-Adress is wegdaan worden.
+openid_desc = OpenID lett di dat Anmellen to eenem frömden Anbeder utlagern.
+account = Konto
+password = Passwoord
+avatar = Kontobill
+website = Internett-Sied
+pronouns_unspecified = Nich angeven
+additional_repo_units_hint = Vörslagen, mehr Repositorium-Delen antoknipsen
+comment_type_group_reference = Nömen
+comment_type_group_milestone = Marksteen
+comment_type_group_lock = Slutens-Tostand
+comment_type_group_review_request = Nakiekens-Anfraag
+keep_activity_private.description = Dien publikes Doon kann blots vun di un de Instanz-Chefs sehn worden.
+ssh_key_deletion_success = De SSH-Slötel is wegdaan worden.
+location = Stee
+language.description = Deese Spraak word in deenem Konto sekert un na de Anmellen toeerst bruukt.
+comment_type_group_dependency = Ofhangen
+retype_new_password = Nejes Passwoord utwiesen
+change_password_success = Dien Passwoord is verneeit worden. Bruuk vun nu an tum Anmellen dat neje Passwoord.
+manage_themes = Normaalthema
+theme_update_success = Dien Thema is verneeit worden.
+theme_update_error = Dat utköört Thema gifft ’t nich.
+add_new_principal = Höövdmann hentofögen
+ssh_key_name_used = Dien Konto hett al eenen SSH-Slötel mit de sülven Naam.
+gpg_key_verified = Utwiest Slötel
+subkeys = Unnerslötels
+key_content = Inholl
+add_key_success = De SSH-Slötel »%s« is hentoföögt worden.
+gpg_key_deletion = GPG-Slötel wegdoon
+manage_ssh_principals = SSH-Zertifikaat-Höövdmannen verwalten
+openid_deletion = OpenID-Adress wegdoon
+add_email_success = De neje E-Mail-Adress is hentoföögt worden.
+email_preference_set_success = E-Mail-Instellen is sett worden.
+add_openid_success = De neje OpenID-Adress is hentoföögt worden.
+ssh_key_been_used = Deeser SSH-Slötel is al to de Server hentoföögt worden.
+verify_gpg_key_success = GPG-Slötel »%s« is utwiest worden.
+manage_ssh_keys = SSH-Slötels verwalten
+add_key = Slötel hentofögen
+gpg_key_verify = Utwiesen
+gpg_token = Teken
+gpg_token_help = So kannst du de Unnerschrift maken:
+key_name = Slötel-Naam
+gpg_key_deletion_success = De GPG-Slötel is wegdaan worden.
+key_content_gpg_placeholder = Begünnt mit »-----BEGIN PGP PUBLIC KEY BLOCK-----«
+key_content_ssh_placeholder = Begünnt mit »ssh-ed25519«, »ssh-rsa«, »ecdsa-sha2-nistp256«, »ecdsa-sha2-nistp384«, »ecdsa-sha2-nistp521«, »sk-ecdsa-sha2-nistp256@openssh.com« of »sk-ssh-ed25519@openssh.com«
+gpg_key_matched_identities = Passt up Identitäten:
+gpg_token_required = Du muttst eene Unnerschrifft för dat Teken unnern angeven
+gpg_invalid_token_signature = De angeven GPG-Slötel, Unnerschrift un Teken passen nich tonanner of dat Teken is verollt.
+ssh_invalid_token_signature = De angeven SSH-Slötel, Unnerschrift of Teken passen nich tonanner of dat Teken is verollt.
+add_principal_success = De SSH-Zertifikaat-Höövdmann »%s« is hentoföögt worden.
+gpg_key_deletion_desc = Wenn du eenen GPG-Slötel wegdoost, sünd Kommitterens, wat daarmit unnerschreven sünd, nich mehr utwiest. Wiedermaken?
+added_on = Am %s hentoföögt
+valid_until_date = Gültig bit %s
+no_activity = In de lesten Tied nich bruukt
+can_read_info = Lesen
+key_state_desc = Deeser Slötel is in de lesten 7 Dagen bruukt worden
+show_openid = Im Profil wiesen
+hide_openid = Im Profil verbargen
+ssh_externally_managed = Deeser SSH-Slötel word för deesen Bruker frömd verwalt
+manage_access_token = Togang-Tekens
+generate_new_token = Nejes Teken maken
+token_name = Teken-Naam
+access_token_deletion = Togang-Teken lösken
+delete_token_success = Dat Teken is lösket worden. Programmen, wat dat bruken, könn nich mehr up dien Konto togriepen.
+repo_and_org_access = Togang to Repositoriums un Verenigungen
+permissions_public_only = Blots publik
+permissions_access_all = All (publik, privaat un begrenzt)
+select_permissions = Verlöövnissen utkören
+permission_no_access = Keen Togang
+permission_read = Lesen
+permission_write = Lesen un Schrieven
+permissions_list = Verlöövnissen:
+at_least_one_permission = Du muttst tominnst eene Verlöövnis utkören, um een Teken to maken
+manage_oauth2_applications = OAuth2-Programmen verwalten
+edit_oauth2_application = OAuth2-Programm bewarken
+remove_oauth2_application = OAuth2-Programm wegdoon
+gpg_key_verified_long = Slötel is mit eenem Teken utwiest worden un kann bruukt worden, um Kommitterens uttowiesen, wat up elkeen aktiveert E-Mail-Adress för deesen Bruker passen, un daarto ok för de Identitäten, up wat deeser Slötel passt.
+valid_forever = Ewig gültig
+principal_state_desc = Deeser SSH-Zertifikaat-Höövdmann is in de lesten 7 Dagen bruukt worden
+token_state_desc = Deeses Teken is in de lesten 7 Dagen bruukt worden
+ssh_disabled = SSH is utknipst
+ssh_key_verified_long = Slötel is mit eenem Teken utwiest worden un kann bruukt worden, um Kommitterens uttowiesen, wat up elkeen aktiveert E-Mail-Adress för deesen Bruker passen.
+tokens_desc = Deese Tekens geven över de Forgejo-API Togang to dienem Konto.
+ssh_token_required = Du muttst eene Unnerschrifft för dat Teken unnern angeven
+ssh_key_deletion_desc = Wenn du eenen SSH-Slötel wegdoost, kann he nich mehr up dien Konto togriepen. Wiedermaken?
+gpg_no_key_email_found = Deeser GPG-Slötel passt up keene aktiveert E-Mail-Adress, wat mit dien Konto verbunnen is. He kann doch hentoföögt worden, wenn du dat angeven Teken unnerschriffst.
+gpg_key_matched_identities_long = De Identitäten, wat in deesem Slötel binnen liggen, passen up deese aktiveert E-Mail-Adressen för deesen Bruker. Kommitterens, wat up deese E-Mail-Adressens passen, könen mit deesem Slötel utwiest worden.
+ssh_principal_deletion = SSH-Zertifikaat-Höövdmann wegdoon
+can_write_info = Schrieven
+generate_token = Teken maken
+generate_token_name_duplicate = %s word al as Programm-Naam bruukt. Bidde bruuk eenen nejen.
+ssh_principal_deletion_desc = Wenn du eenen SSH-Zertifikaat-Höövdmann wegdoost, kann he nich mehr up dien Konto togriepen. Wiedermaken?
+last_used = Tolest bruukt am
+ssh_signonly = SSH is stedenwies utknipst, sodat deese Slötels blots tum Utwiesen vun de Kommitterens-Unnerschrift bruukt worden.
+generate_token_success = Dien nejes Teken is maakt worden. Kopeer dat nu, denn dat word nich noch eenmaal wiest.
+delete_token = Lösken
+access_token_deletion_desc = Wenn du een Teken löskest, können Programmen, wat dat bruken, nich mehr up dien Konto togriepen. Dat kann man nich torüggnehmen. Wiedermaken?
+oauth2_applications_desc = OAuth2-Programmen verlöövt dienen Frömdprogrammen, Brukers in deeser Forgejo-Instanz seker antomellen.
+remove_oauth2_application_desc = Wenn du een OAuth2-Programm wegdoost, word sien Togriep to all unnerschreven Togang-Tekens torüggnohmen. Wiedermaken?
+create_oauth2_application_success = Du hest een nejes OAuth2-Programm hentoföögt.
+oauth2_application_name = Programm-Naam
+save_application = Sekern
+oauth2_client_id = Klient-ID
+oauth2_client_secret = Klient-Geheimnis
+oauth2_regenerate_secret = Geheimnis neei maken
+oauth2_application_remove_description = Wenn du een OAuth2-Programm wegdoost, kann ’t nich mehr up anmellt Brukerkonten in deeser Instanz togriepen. Wiedermaken?
+authorized_oauth2_applications = Anmellt OAuth2-Programmen
+revoke_key = Torüggnehmen
+revoke_oauth2_grant = Togriep torüggnehmen
+revoke_oauth2_grant_description = Wenn du Togriep för deeses Frömdprogramm torügggnimmst, kann deeses Programm nich mehr up diene Daten togriepen. Willst du dat würrelk?
+revoke_oauth2_grant_success = Togriep torüggnohmen.
+twofa_disable = Twee-Faktooren-Anmellen utknipsen
+twofa_scratch_token_regenerate = Eenmaal-Bruuk-Torügghalens-Slötel neei maken
+twofa_disable_note = Du kannst dat Twee-Faktooren-Anmellen wenn nödig utknipsen.
+twofa_disabled = Twee-Faktooren-Anmellen is utknipst worden.
+scan_this_image = Bekiek deeses Bill mit dienem Anmellens-Programm:
+remove_oauth2_application_success = Dat Programm is wegdaan worden.
+create_oauth2_application = Een nejes OAuth2-Programm hentofögen
+update_oauth2_application_success = Du hest dat OAuth2-Programm verneeit.
+create_oauth2_application_button = Nejes Programm
+oauth2_redirect_uris = Umleit-URIs. Bidde schriev elkeen URI up eene neje Rieg.
+twofa_disable_desc = Wenn du Twee-Faktooren-Anmellen utknipst, is dien Konto minner seker. Wiedermaken?
+oauth2_regenerate_secret_hint = Geheimnis verloren?
+oauth2_client_secret_hint = Dat Geheimnis word nich weer wiest, nadeem du deese Sied verlettst of neei laadst. Bidde wees wiss, dat du ’t sekert hest.
+oauth2_application_edit = Bewarken
+twofa_is_enrolled = Dien Konto hett stedenwies Twee-Faktooren-Anmellen anknipst.
+twofa_enroll = Twee-Faktooren-Anmellen anknipsen
+twofa_not_enrolled = Dien Konto hett stedenwies keen Twee-Faktooren-Anmellen anknipst.
+oauth2_application_create_description = OAuth2-Programmen gifft dienen Frömdprogrammen Togriep up Brukers in deeser Instanz.
+authorized_oauth2_applications_description = Du hest in deenem eegenen Forgejo-Konto deesen Frömdprogrammen Togriep geven. Bidde nimm Togriep för Programmen, wat nich mehr bruukt worden, torügg.
+twofa_scratch_token_regenerated = Dien Eenmaal-Bruuk-Torügghalens-Slötel is nu %s. Bewahr dat an eener sekeren Stee up, denn dat word nich noch eenmaal wiest.
+regenerate_scratch_token_desc = Wenn du dienen Torügghalens-Slötel verloren of al tum Anmellen bruukt hest, kannst du ’t hier torüggsetten.
+twofa_failed_get_secret = Kunn dat Geheimnis nich halen.
+webauthn_register_key = Sekerheids-Slötel hentofögen
+webauthn_nickname = Spitznaam
+webauthn_delete_key_desc = Wenn du eenen Sekerheids-Slötel wegdoost, kannst du di nich mehr daarmit anmellen. Wiedermaken?
+link_account = Konto verbinnen
+remove_account_link_success = Dat verbunnt Konto is wegdaan worden.
+repos_none = Du büst keen Eegner vun elkeen Repositoriums.
+orgs_none = Du büst keen Liddmaat in elkeen Verenigungen.
+blocked_users_none = ’t gifft keene blockeerten Brukers.
+delete_account = Dien Konto lösken
+delete_account_title = Brukerkonto lösken
+delete_account_desc = Willst du würrelk deeses Brukerkonto för all Tieden lösken?
+email_notifications.enable = E-Mail-Narichtens anknipsen
+email_notifications.onmention = Blots bi’m Nömen benarichtigen
+email_notifications.submit = E-Mail-Instellen setten
+visibility.limited = Begrenzt
+blocked_since = Blockeert siet %s
+user_block_success = De Bruker is nu blockeert.
+webauthn_alternative_tip = Du willst villicht noch eene anner Twedes-Anmellen-Aard inrichten.
+manage_account_links_desc = Deese frömden Konten sünd mit dienem Forgejo-Konto verbunnen.
+remove_account_link = Verbunnen Konto wegdoon
+remove_account_link_desc = Wenn du een verbunnen Konto wegdoost, hett ’t keenen Togriep mehr to dienem Forgejo-Konto. Wiedermaken?
+then_enter_passcode = Un giff de Pass-Tahl in, wat dat Programm wiest:
+webauthn_delete_key = Sekerheids-Slötel wegdoon
+webauthn_key_loss_warning = Wenn du diene Sekerheids-Slötels verlüst, verlüst du ok Togriep to dien Konto.
+manage_account_links = Verbunnt Konten
+hooks.desc = Föög Internett-Hakens hento, wat för all Repositoriums, vun wat du een Eegner büst, upropen worden.
+email_notifications.andyourown = Un ok för diene eegenen Narichtens
+visibility = Bruker-Sichtbaarkeid
+visibility.limited_tooltip = Blots anmellt Brukers könen ’t sehn
+visibility.private = Privaat
+user_unblock_success = De Bruker is nu nich mehr blockeert.
+or_enter_secret = Of giff dat Geheimnis in: %s
+passcode_invalid = De Pass-Tahl is falsk. Versöök dat bidde noch eenmaal.
+twofa_enrolled = Twee-Faktooren-Anmellen is för dien Konto nu inricht. Bewahr dienen Eenmaal-Bruuk-Toorügghalens-Slötel (%s) an eener sekeren Stee up, denn dat word nich noch eenmaal wiest.
+delete_prompt = Dat lösket dien Brukerkonto för all Tieden. Dat KANN NICH torüggnohmen worden.
+visibility.private_tooltip = Blots de Liddmaten vun Verenigungen, waar du Liddmaat büst, könen ’t sehn
+visibility.public = Publik
+delete_with_all_comments = Dien Konto is junger as %s. Um Spöök-Kommentaren to vermieden, worden all Kommentaren up Gefallens un HVs daar ok mit lösket.
+confirm_delete_account = Lösken utwiesen
+email_notifications.disable = Nich över E-Mail benarichtigen
+visibility.public_tooltip = Elkeen kann ’t sehen
+
+[repo]
+rss.must_be_on_branch = Du muttst up eenem Twieg wesen, um eenen RSS-Schuuv to hebben.
+admin.manage_flags = Flaggen verwalten
+admin.flags_replaced = Repositoriums-Flaggen utwesselt
+owner = Eegner
+repo_name = Repositoriums-Naam
+repo_size = Repositoriums-Grött
+size_format = %[1]s: %[2]s; %[3]s: %[4]s
+template = Vörlaag
+template_select = Köör eene Vörlaag ut
+template_helper = Dat Repositorium as Vörlaag bruken
+visibility = Sichtbaarkeid
+visibility_helper = Repositorium privaat maken
+visibility_fork_helper = (Wenn du dat ännerst, ännert dat ok de Sichtbaarkeid vun all Gabels.)
+fork_repo = Repositorium gabeln
+fork_from = Gabeln vun
+already_forked = Du hest %s al gabelt
+fork_branch = Twieg, wat to de Gabel, kloont worden sall
+open_with_editor = Mit %s opmaken
+download_tar = TAR.GZ runnerladen
+generate_repo = Repositorium maken
+generate_from = Maken ut
+repo_desc = Beschrieven
+admin.update_flags = Flaggen vernejen
+new_repo_helper = In eenem Repositorium sünd all Dateien vun eenem Projekt, ok hör Versioons-Histoorje. Hest du al annerwaar eens? Treck een Repositorium um.
+owner_helper = Eenige Verenigungen worden in de List villicht nich wiest, denn ’t gifft eene Grenz, wo völe Repositoriums man hebben kann.
+admin.enabled_flags = Flaggen, wat för deeses Repositorium anknipst sünd:
+admin.failed_to_replace_flags = Kunn Repositoriums-Flaggen nich utwesseln
+fork_no_valid_owners = Deeses Repositorium kann nich gabelt worden, denn ’t gifft keene gültigen Eegners.
+repo_name_helper = Gode Repositoriums-Namen sünd kört, licht to marken un eenmaalige Slötelwoorden.
+visibility_helper_forced = Dien Sied-Chef dwingt, dat neje Repositoriums privaat ween mutten.
+template_description = Vörlaag-Repositoriums verlöven Brukers, neje Repositoriums mit de sülve Verteeknisstruktur, Dateien un Instellens to maken.
+clone_helper = Bruukst du Hülp bi’m Klonen? Besöök Hülp.
+repo_lang = Spraak
+repo_gitignore_helper = Vörlaag för .gitignore utkören
+visibility_description = Blots de Eegner vun de Verenigung, of de Liddmaten vun de Verenigung, wenn se deeses Recht hebben, worden dat sehn könen.
+fork_to_different_account = To een anner Konto gabeln
+fork_visibility_helper = De Sichtbaarkeid vun eenem gabelt Repositorium kann nich ännert worden.
+all_branches = All Twiegen
+use_template = Deese Vörlaag bruken
+repo_desc_helper = Giff een körte Beschrieven in (wenn du willst)
+download_zip = ZIP runnerladen
+download_bundle = BUNDLE runnerladen
+license_helper = Köör eene Lizenz-Datei ut
+object_format = Objekt-Formaat
+object_format_helper = Objekt-Formaat in deesem Repositorium. Kann naher nich mehr ännert worden. SHA1 is dat, wat am wiedesten unnerstütt word.
+readme = LEESMI
+readme_helper = Köör eene Vörlaag för de LEESMI-Datei ut
+readme_helper_desc = Dat is de Stee, waar du eene kumplete Beschrieven för dien Projekt schrieven kannst.
+create_repo = Repositorium maken
+default_branch_label = Höövd
+default_branch_helper = De Höövd-Twieg is de Grund-Twieg för Haalvörslagens un Quelltext-Kommitterens.
+mirror_prune = Schörtjen
+mirror_interval_invalid = De Spegel-Tiedofstand is ungültig.
+mirror_public_key = Publiker SSH-Slötel
+mirror_use_ssh.not_available = SSH is nich tum Anmellen verföögbaar.
+mirror_sync = spegelt
+mirror_address = Vun URL klonen
+mirror_interval = Tied-Ofstand för ’t Spegeln (gültige Tied-Eenheiden sünd »h«, »m« un »s«). 0 um dat automatisk Spegeln uttoknipsen. (Minnster Ofstand: %s)
+issue_labels = Vermarkens
+issue_labels_helper = Köör eene Vermarkens-Sammlung ut
+license = Lizenz
+auto_init = Repositorium inrichten (Föögt .gitignore, Lizenz un LEESMI hento)
+mirror_sync_on_commit = Spegeln, wenn Kommitterens schuuvt worden
+repo_gitignore_helper_desc = Köör ut eener List vun Vörlagen för bekannte Spraken ut, welke Dateien nich verfolgt worden. Normaale Objekten, wat vun de Bauwarktüüg vun elkeen Spraak utgeven worden, sünd in deeser .gitignore dann al enthollen.
+default_branch = Höövd-Twieg
+mirror_prune_desc = Feern-Verfolgens-Nömens, wat nich mehr bruukt worden, wegdoon
+mirror_use_ssh.text = SSH tum Anmellen bruken
+license_helper_desc = Eene Lizenz regelt, wat anners mit dienem Quelltext doon un nich doon düren. Nich wiss, welke för dien Projekt passt? Kiek Köör eene Lizenz an.
+mirror_denied_combination = Kann nich publiken Slötel un Passwoord tum Anmellen beide tosammen bruken.
+mirror_address_desc = Giff de nödigen Anmell-Informatioonen unner »Anmellen« in.
+mirror_lfs_endpoint = LFS-Ennpunkt
+mirror_last_synced = Tolest spegelt
+mirror_password_placeholder = (Nich ännert)
+mirror_password_blank_placeholder = (Nich sett)
+watchers = Belurers
+stargazers = Steernenkiekers
+stars_remove_warning = Dat lösket all Steernen vun deesem Repositorium.
+forks = Gabels
+stars = Steernen
+reactions_more = un noch %d daarto
+language_other = Anner
+adopt_preexisting_label = Dateien övernehmen
+delete_preexisting_label = Lösken
+delete_preexisting_content = Dateien in %s lösken
+delete_preexisting_success = Dateien sünner Eegner in %s lösken
+tree_path_not_found_branch = Padd %[1]s gifft ’t nich in Twieg %[2]s
+transfer.accept = Överdragen annehmen
+transfer.accept_desc = To »%s« överdragen
+transfer.reject = Överdragen oflehnen
+transfer.no_permission_to_reject = Du hest nich dat Recht, deeses Överdragen oftolehnen.
+desc.private = Privaat
+desc.public = Publik
+desc.template = Vörlaag
+desc.archived = Archiveert
+template.topics = Themen
+template.avatar = Kontobill
+template.one_item = Tominnst een Vörlaag-Ding mutt utköört worden
+template.invalid = Een Vörlaag-Repositorium mutt utköört worden
+migrate_options_lfs_endpoint.label = LFS-Ennpunkt
+migrate_options_lfs_endpoint.placeholder = Wenn leeg laten, word de Ennpunkt vun de Kloon-URL avleit
+migrate_items = Umtreck-Dingen
+migrate_items_wiki = Wiki
+migrate_items_milestones = Markstenen
+migrate_items_pullrequests = Haalvörslagen
+migrate_items_releases = Publizerens
+migrate_repo = Repositorium umtrecken
+migrate.clone_address = Umtrecken / Klonen vun URL
+migrate.failed = Umtreck fehlslagen: %v
+migrate.migrate_items_options = Togang-Teken is nödig, um mehr Dingen umtotrecken
+migrated_from = Vun %[2]s umtrucken
+migrate.migrate = Vun %s umtrecken
+migrate.migrating = Treckt vun %s um …
+migrate.github.description = Daten vun github.com of eenem GitHub-Enterprise-Server umtrecken.
+migrate.gitlab.description = Daten vun gitlab.com of anner GitLab-Instanzen umtrecken.
+migrate.codebase.description = Daten vun codebasehq.com umtrecken.
+migrate.migrating_git = Git-Daten worden umtrucken
+migrate.migrating_topics = Themen worden umtrucken
+migrate.migrating_labels = Vermarkens worden umtrucken
+migrate.migrating_releases = Publizerens worden umtrucken
+migrate.migrating_issues = Gefallens worden umtrucken
+migrate.cancel_migrating_title = Umtreck ofbreken
+mirror_from = Spegel vun
+forked_from = gabelt vun
+fork_from_self = Du kannst dien eegen Repositorium nich gabeln.
+watch_guest_user = Mell di an, um deeses Repositorium to beluren.
+star_guest_user = Mell di an, um eenen Steern up deeses Repositorium to setten.
+subscribe.issue.guest.tooltip = Mell di an, um deeses Gefall to abonneren.
+watch = Beluren
+unwatch = Nich mehr beluren
+star = Steern setten
+unstar = Steern wegnehmen
+download_archive = Repositorium runnerladen
+no_desc = Nich beschrieven
+quick_guide = Fixanwies
+clone_this_repo = Deeses Repositorium klonen
+cite_this_repo = Deeses Repositorium ziteren
+push_exist_repo = Een bestahn Repositorium vun de Oorderreeg schuven
+code = Quelltext
+code.desc = Wies Quelltext, Dateien, Kommitterens un Twiegen.
+branch = Twieg
+tree = Boom
+unit_disabled = De Sied-Chef hett deesen Repositoriums-Deel utknipst.
+delete_preexisting = Vörbestahn Dateien lösken
+desc.internal = Binnern
+template.git_content = Git-Inholl (Höövd-Twieg)
+template.webhooks = Internett-Hakens
+mirror_password_help = Änner de Brukernaam, um een sekert Passwoord to lösken.
+author_search_tooltip = Wiest bit to 30 Brukers
+transfer.reject_desc = Överdragen to »%s« ofbreken
+migrate_options_lfs = LFS-Dateien umtrecken
+migrate_items_labels = Vermarkens
+migrate.clone_address_desc = De HTTP(S) of Git »clone« URL vun eenem bestahn Repositorium
+migrate.invalid_local_path = De stedenwies Padd is ungültig. ’t gifft dat nich of dat is keen Verteeknis.
+migrate.gitea.description = Daten vun gitea.com of anner Gitea-Instanzen umtrecken.
+fork_guest_user = Mell di an, um deeses Repositorium to gabeln.
+fork = Gabeln
+adopt_preexisting = Vörbestahn Dateien övernehmen
+blame_prior = Schüld vör deeser Ännern wiesen
+adopt_search = Giff Brukernaam in, um na Repositoriums sünner Eegner to söken … (leeg laten, um se all to finnen)
+adopt_preexisting_success = Vun %s Dateien övernohmen un Repositorium maakt
+tree_path_not_found_commit = Padd %[1]s gifft ’t nich in Kommitteren %[2]s
+tree_path_not_found_tag = Padd %[1]s gifft ’t nich in Mark %[2]s
+desc.sha256 = SHA256
+template.issue_labels = Gefall-Vermarkens
+form.name_pattern_not_allowed = Dat Muster »%s« is in eenem Repositoriums-Naam nich verlöövt.
+mirror_lfs = Spieker för grote Dateien (LFS)
+mirror_lfs_desc = Spegeln vun LFS-Daten anknipsen.
+adopt_preexisting_content = Repositorium vun %s maken
+transfer.no_permission_to_accept = Du hest nich dat Recht, deeses Överdragen antonehmen.
+template.git_hooks = Git-Hakens
+archive.title_date = Deeses Repositorium is up %s archiveert worden. Du kannst de Dateien ankieken un ’t klonen, aver nich schuven un keene Gefallens un Haalvörslagen opmaken.
+form.reach_limit_of_creation_1 = De Eegner is al bi de Grenz vun %d Repositorium.
+form.name_reserved = De Repositoriums-Naam »%s« is vörbehollen.
+form.string_too_long = De angeven Text is langer as %d Bookstavens.
+migrate_items_issues = Gefallens
+template.items = Vörlaag-Dingen
+template.git_hooks_tooltip = Du kannst jüüst keene Git-Hakens bewarken of lösken, nadeem se hentoföögt sünd. Köör dat blots ut, wenn du de Vörlaag-Repositorium vertraust.
+archive.issue.nocomment = Deeses Repositorium is archiveert. Du kannst nich up Gefallens kommenteren.
+archive.pull.nocomment = Deeses Repositorium is archiveert. Du kannst nich up Haalvörslagens kommenteren.
+form.reach_limit_of_creation_n = De Eegner is al bi de Grenz vun %d Repositoriums.
+migrate_options_mirror_helper = Deeses Repositorium word een Spegel wesen
+migrate_options_lfs_endpoint.description.local = Een stedenwies Server-Padd word ok unnerstütt.
+migrate_items_merge_requests = Tosamenföhren-Vörslagen
+migrate.permission_denied = Du düürst keene stedenwies Repositoriums importeren.
+archive.title = Deeses Repositorium is archiveert. Du kannst de Dateien ankieken un ’t klonen, aver nich schuven un keene Gefallens un Haalvörslagen opmaken.
+need_auth = Anmellen
+migrate_options = Umtreck-Instellens
+migrate.clone_local_path = of een stedenwies Server-Padd
+migrate.migrating_failed.error = Umtrecken fehlslagen: %s
+migrate.migrating_failed_no_addr = Umtreck fehlslagen.
+migrate.migrating_pulls = Haalvörslagen worden umtrucken
+empty_message = Deeses Repositorium hett noch keenen Inholl.
+migrate.invalid_lfs_endpoint = De LFS-Ennpunkt is nich gültig.
+migrated_from_fake = Vun %[1]s umtrucken
+migrate.git.description = Een Repositorium blots vun elkeen Git-Deenst umtrecken.
+migrate.onedev.description = Daten vun code.onedev.io of anner OneDev-Instanzen umtrecken.
+generated_from = maakt vun
+migrate.migrating_failed = Umtrecken un %s fehlslagen.
+migrate.forgejo.description = Daten vun codeberg.org of anner Forgejo-Instanzen umtrecken.
+migrate.gogs.description = Daten vun notabug.org of anner Gogs-Instanzen umtrecken.
+migrate.migrating_milestones = Markstenen worden umtrucken
+create_new_repo_command = Een nejes Repositorium in de Oorderreeg maken
+migrate.cancel_migrating_confirm = Willst du deesen Umtreck ofbreken?
+subscribe.pull.guest.tooltip = Mell di an, um deesen Haalvörslag to abonneren.
+more_operations = Mehr doon
+migrate.gitbucket.description = Daten vun GitBucket-Instanzen umtrecken.
+find_tag = Mark finnen
+branches = Twiegen
+tag = Mark
+tags = Markens
+issues = Gefallens
+pulls = Haalvörslagen
+packages = Paketen
+actions = Aktioonen
+releases = Publizerens
+milestones = Markstenen
+org_labels_desc_manage = Verwalten
+commits = Kommitterens
+commit = Kommitteren
+n_commit_one = %s Kommitteren
+n_commit_few = %s Kommitterens
+n_branch_one = %s Twieg
+n_tag_one = %s Mark
+n_tag_few = %s Markens
+n_release_one = %s Publizeren
+n_release_few = %s Publizerens
+file.title = %s am %s
+file_history = Histoorje
+file_view_source = Quelltext wiesen
+file_view_rendered = Tekent wiesen
+file_view_raw = Ruug wiesen
+file_permalink = Ewig Verwies
+file_too_large = De Datei is to grot tum Wiesen.
+file_copy_permalink = Ewig Verwies koperen
+view_git_blame = Git-Schüld wiesen
+video_not_supported_in_browser = Dien Browser unnerstütt de HTML5-»video«-Mark nich.
+audio_not_supported_in_browser = Dien Browser unnerstütt de HTML5-»audio«-Mark nich.
+stored_lfs = Mit Git LFS sekert
+unescape_control_characters = Inkielen
+executable_file = Utföhrbaar Datei
+vendored = Verkoperig
+generated = Maakt
+commit_graph = Kommitterens-Boom
+commit_graph.select = Twiegen utkören
+commit_graph.monochrome = Eenfarvig
+commit_graph.color = Klöör
+commit.contained_in = Deeses Kommitteren is enthollen in:
+commit.contained_in_default_branch = Deeses Kommitteren is Deel vun de Höövd-Twieg
+commit.load_referencing_branches_and_tags = Twiegen un Markens laden, wat deeses Kommitteren nömen
+blame = Schüld
+download_file = Datei runnerladen
+normal_view = Normaale Sicht
+line = Rieg
+lines = Riegen
+from_comment = (Kommentaar)
+no_eol.text = Keen Riegenenn
+no_eol.tooltip = Deese Datei ennt nich mit eenem Riegenenn-Bookstaven.
+editor.add_file = Datei hentofögen
+editor.new_file = Neje Datei
+editor.edit_file = Datei bewarken
+editor.cannot_edit_lfs_files = LFS-Datein könen nich in de Internett-Schnittstee bewarkt worden.
+editor.delete_this_file = Datei lösken
+editor.file_delete_success = Datei »%s« is lösket worden.
+editor.name_your_file = Benööm diene Datei …
+editor.or = of
+editor.cancel_lower = Ofbreken
+editor.commit_signed_changes = Unnerschrieven Ännerns kommitteren
+editor.commit_changes = Ännerns kommitteren
+editor.add_tmpl = »Dateinaam« hentofögen
+editor.add = %s hentofögen
+editor.update = %s vernejen
+editor.delete = %s lösken
+editor.patch = Plack anwennen
+editor.patching = Plackt:
+editor.fail_to_apply_patch = Kann Plack »%s« nich anwennen
+editor.new_patch = Nejer Plack
+editor.commit_message_desc = Wenn du willst, föög een wiederes Beschrieven hento …
+editor.commit_directly_to_this_branch = Kommitteer stracks up de %s-Twieg.
+editor.propose_file_change = Datei-Ännern vörslagen
+editor.new_branch_name = Benööm de Twieg för deeses Kommitteren
+editor.new_branch_name_desc = Nejer Twig-Naam …
+editor.cancel = Ofbreken
+editor.filename_is_invalid = De Dateinaam is ungültig: »%s«.
+editor.invalid_commit_mail = Ungültige E-Mail för dat Kommitteren.
+editor.branch_does_not_exist = Twieg »%s« gifft dat in deesem Repositorium nich.
+editor.branch_already_exists = Twieg »%s« gifft dat in deesem Repositorium al.
+editor.filename_is_a_directory = Dateinaam »%s« word in deesem Repositorium al as Verteeknisnaam bruukt.
+editor.file_deleting_no_longer_exists = De Datei, wat lösket word, »%s«, gifft dat in deesem Repositorium nich mehr.
+editor.file_already_exists = Eene Datei mit de Naam »%s« gifft dat in deesem Repositorium al.
+editor.commit_id_not_matching = De Datei is ännert worden, as du se bewarkt hest. Kommitteer up eenen nejen Twieg un föhr dann tosamen.
+editor.push_out_of_date = De Schuuv schient verollt to wesen.
+editor.commit_empty_file_header = Eene lege Datei kommitteren
+editor.no_changes_to_show = 't gifft keene Ännerns to wiesen.
+editor.fail_to_update_file_summary = Fehler-Naricht:
+editor.push_rejected_summary = Kumpleete Oflehnens-Naricht:
+editor.add_subdir = Verteeknis hentofögen …
+editor.upload_file_is_locked = Datei »%s« is vun %s tosluten.
+editor.upload_files_to_dir = Dateien to »%s« upladen
+editor.cannot_commit_to_protected_branch = Kann nich up schütt Twieg »%s« kommitteren.
+editor.no_commit_to_branch = Kann nich stracks to de Twieg kommitteren, denn:
+editor.require_signed_commit = Twieg bruuk een unnerschreven Kommitteren
+editor.cherry_pick = Rosienenbick %s up:
+editor.revert = Nehm %s torügg up:
+commits.desc = Stöver dör de Quelltext-Ännerns-Histoorje.
+commits.commits = Kommitterens
+commits.no_commits = Keene gemeensaamen Kommitterens. »%s« un »%s« hebben kumpleet verscheden Histoorjes.
+commits.nothing_to_compare = Deese Twiegen sünd gliek.
+commits.search_branch = Deeser Twieg
+commits.search_all = All Twiegen
+commits.author = Author
+commits.message = Naricht
+commits.date = Datum
+commits.older = Oller
+commits.newer = Nejer
+commits.signed_by_untrusted_user_unmatched = Unnerschrieven vun eenem unvertraut Bruker, well nich de Kommitterer is
+commits.gpg_key_id = GPG-Slötel-ID
+commits.ssh_key_fingerprint = SSH-Slötel-Fingerspoor
+commit.operations = Doon
+commit.revert = Torüggnehmen
+commit.revert-header = Torüggnehmen: %s
+commit.cherry-pick = Rosienenbicken
+commit.cherry-pick-header = Rosienenbicken: %s
+commit.cherry-pick-content = Twieg utkören, up wat du Rosienenbicken willst:
+commitstatus.error = Fehler
+commitstatus.failure = Fehlslagen
+commitstatus.pending = Staht ut
+commitstatus.success = Daankregen
+projects = Projekten
+projects.description_placeholder = Beschrieven
+projects.create = Projekt maken
+projects.title = Titel
+projects.create_success = Dat Projekt »%s« is maakt worden.
+projects.deletion = Projekt lösken
+projects.deletion_success = Dat Projekt is lösket worden.
+projects.edit = Projekt bewarken
+projects.edit_subheader = Projekten organiseren Gefallens un verfolgen dat Wiederkomen.
+projects.modify = Projekt bewarken
+projects.edit_success = Projekt »%s« is verneeit worden.
+projects.type.none = Nix
+projects.type.basic_kanban = Slichtes Kanban
+projects.type.bug_triage = Fehlers verwalten
+projects.template.desc = Vörlaag
+projects.column.edit = Striep bewarken
+projects.column.edit_title = Naam
+projects.column.new_title = Naam
+projects.column.new_submit = Striep maken
+projects.column.set_default = Höövd setten
+projects.column.delete = Striep lösken
+projects.column.color = Klöör
+projects.open = Opmaken
+projects.close = Dichtmaken
+projects.column.assigned_to = Towiesen an
+projects.card_type.images_and_text = Billers un Text
+projects.card_type.text_only = Blots Text
+issues.filter_assignees = Towiesen filtern
+issues.filter_milestones = Marksteen filtern
+issues.filter_projects = Projekt filtern
+issues.filter_labels = Vermark filtern
+issues.new = Nejes Gefall
+issues.new.title_empty = Titel kann nich leeg wesen
+issues.new.labels = Vermarkens
+issues.new.clear_labels = Vermarkens leegmaken
+issues.new.projects = Projekten
+issues.new.no_projects = Keen Projekt
+issues.new.closed_projects = Dichtmaakt Projekten
+issues.new.no_items = Keene Dingen
+issues.new.milestone = Marksteen
+issues.new.no_milestone = Keen Marksteen
+issues.new.open_milestone = Open Markstenen
+issues.new.closed_milestone = Dichtmaakt Markstenen
+issues.new.assignees = Towiesen
+issues.new.no_assignees = Keene Towiesens
+issues.new.assign_to_me = An mi towiesen
+project = Projekten
+release = Publizeren
+file_follow = Symbolisk Verwies nagahn
+editor.signoff_desc = Föög am Enn vun de Kommitterens-Naricht eenen »Signed-off-by«-Nadrag för de Kommitterer hento.
+editor.create_new_branch_np = Maak eenen nejen Twieg för deeses Kommitteren.
+editor.filename_cannot_be_empty = De Dateinaam kann nich leeg wesen.
+labels = Vermarkens
+file_raw = Ruug
+commit_graph.hide_pr_refs = Haalvörslagen verbargen
+editor.upload_file = Datei upladen
+editor.preview_changes = Ännerns vörwiesen
+filter_branch_and_tag = Twieg of Mark filtern
+symbolic_link = Symbolisk Verwies
+editor.cannot_edit_non_text_files = Binäär-Datein könen nich in de Internett-Schnittstee bewarkt worden.
+editor.must_be_on_a_branch = Du muttst up eenem Twieg wesen, um Ännerns an deeser Datei to maken of vörtoslagen.
+editor.fork_before_edit = Du muttst deeses Repositorium gabeln, um Ännerns an deeser Datei to maken of vörtoslagen.
+n_branch_few = %s Twiegen
+released_this = hett dat publizeert
+escape_control_characters = Utkielen
+editor.edit_this_file = Datei bewarken
+editor.this_file_locked = Datei is tosluten
+editor.filename_help = Föög een Verteeknis hento, indeem du sienen Naam mit eenem Schüünstreek (»/«) daarna ingiffst. Löske een Verteeknis, indeem du am Begünn vun de Ingaavfeld de Rücktast drückst.
+editor.unable_to_upload_files = Kunn de Dateien to »%s« nich upladen mit Fehler: %v
+commits.signed_by_untrusted_user = Unnerschrieven vun eenem unvertraut Bruker
+projects.deletion_desc = Wenn du een Projekt löskest, word ’t vun all verwandt Gefallens wegnohmen. Wiedermaken?
+projects.column.set_default_desc = Deese Striep as de Höövd-Striep för unverwalt Gefallens un Haalvörslagens setten
+issues.desc = Fehlermellens, Upgavens un Markstenen organiseren.
+issues.new.open_projects = Open Projekten
+editor.create_new_branch = Maak eenen nejen Twieg för deeses Kommitteren un maak daarmit eenen Haalvörslag op.
+editor.must_have_write_access = Du muttst Schriev-Togriep hebben, um Ännerns an deeser Datei to maken of vörtoslagen.
+editor.file_is_a_symlink = `»%s« is een symbolisk Verwies. Symbolisk Verwiesen könen in de Internett-Bewarker nich bewarkt worden`
+editor.commit_empty_file_text = De Datei, wat du kommitteren willst, is leeg. Wiedermaken?
+editor.push_rejected = De Ännern is vun de Server oflehnt worden. Bidde överprüüf de Git-Hakens.
+commits.browse_further = Wiederstövern
+projects.description = Beschrieven (wenn du willst)
+projects.card_type.desc = Kaart-Vörwiesens
+issues.new.no_label = Keene Vermarkens
+issues.new.clear_projects = Projekten leegmaken
+issues.new.clear_assignees = Towiesens leegmaken
+editor.file_editing_no_longer_exists = De Datei, wat bewarkt word, »%s«, gifft dat in deesem Repositorium nich mehr.
+editor.user_no_push_to_branch = Bruker kann nich to Twieg schuven
+editor.directory_is_a_file = Verteeknisnaam »%s« word in deesem Repositorium al as Dateinaam bruukt.
+editor.file_changed_while_editing = De Datei-Inhollens hebben sik ännert, siet du mit de Bewarken begunnen hest. Klick hier, um se to sehn, of kommitteer de Änners weer, um se to överschrieven.
+editor.push_rejected_no_message = De Ännern is vun de Server sünner Naricht oflehnt worden. Bidde överprüüf de Git-Hakens.
+commits.signed_by = Unnerschrieven vun
+commit.revert-content = Twieg utkören, up wat du dat torüggnehmen willst:
+projects.desc = Gefallens un Haalvörslagens in Projekt-Bredden verwalten.
+projects.new = Nejes Projekt
+projects.template.desc_helper = Köör tum Begünnen eene Projekt-Vörlaag ut
+editor.fail_to_update_file = Kunn de Datei »%s« nich vernejen/hentofögen.
+ext_issues = Frömde Gefallens
+projects.column.new = Neje Striep
+projects.column.deletion_desc = Wenn du eene Projekt-Striep löskest, worden all Gefallens daarin in de Höövd-Striep verschuven. Wiedermaken?
+issues.new.clear_milestone = Marksteen leegmaken
+commits.renamed_from = Umbenöömt vun %s
+commits.view_path = To deeser Tied in de Histoorje wiesen
+issues.filter_reviewers = Nakieker filtern
+issues.new.no_reviewers = Keene Nakiekers
+issues.choose.open_external_link = Opmaken
+issues.choose.blank = Normaal
+issues.choose.invalid_templates = %v ungültig Vörlagen(s) funnen
+issues.choose.invalid_config = De Gefall-Instellens enthollen Fehlers:
+issues.no_ref = Keen Twieg/Mark angeven
+issues.new_label = Nejer Vermark
+issues.new_label_placeholder = Vermark-Naam
+issues.new_label_desc_placeholder = Beschrieven
+issues.create_label = Vermark maken
+issues.label_templates.helper = Köör eene Vermarkens-Sammlung ut
+issues.label_templates.use = Vermarkens-Sammlung bruken
+issues.add_labels = hett de Vermarkens %s %s hentogeföögt
+issues.remove_label = hett de Vermark %s %s wegdaan
+issues.add_milestone_at = `hett dat to de Marksteen %s hentoföögt`
+issues.add_project_at = `hett dat to de Projekt %s hentoföögt`
+issues.change_milestone_at = `hett de Marksteen vun %s to %s ännert`
+issues.remove_milestone_at = `hett dat vun de Marksteen %s wegdaan`
+issues.remove_project_at = `hett dat vun de Projekt %s wegdaan`
+issues.deleted_milestone = `(lösket)`
+issues.deleted_project = `(lösket)`
+issues.self_assign_at = `hett dat %s sik sülven towiesen`
+issues.remove_self_assignment = `hett sien Towiesen %s wegnohmen`
+issues.change_title_at = `hett de Titel vun %s to %s %s ännert`
+issues.change_ref_at = `hett de Nömen vun %s to %s %s ännert`
+issues.delete_branch_at = `hett de Twieg %s %s lösket`
+issues.filter_label = Vermark
+issues.filter_label_exclude = `Bruuk Alt+Klick/Enter, um Vermarkens uttosluten`
+issues.filter_label_no_select = All Vermarkens
+issues.filter_label_select_no_label = Keen Vermark
+issues.filter_milestone = Marksteen
+issues.filter_milestone_none = Keene Markstenen
+issues.filter_milestone_open = Open Markstenen
+issues.filter_project = Projekt
+issues.filter_project_all = All Projekten
+issues.filter_project_none = Keen Projekt
+issues.filter_assignee = Towiesen
+issues.filter_assginee_no_select = All Towiesens
+issues.filter_assginee_no_assignee = Nüms towiesen
+issues.filter_poster = Author
+issues.filter_poster_no_select = All Authoren
+issues.filter_type.assigned_to_you = Di towiesen
+issues.filter_type.mentioning_you = Nöömt di
+issues.filter_type.review_requested = Nakieken anfraggt
+issues.filter_sort = Sorteren
+issues.filter_sort.latest = Neeist
+issues.filter_sort.oldest = Ollst
+issues.filter_sort.recentupdate = Körtens ännert
+issues.filter_sort.leastupdate = Lang nich ännert
+issues.filter_sort.mostcomment = Meest kommenteert
+issues.filter_sort.leastcomment = Minnst kommenteert
+issues.filter_sort.nearduedate = Nahst Anstahns-Datum
+issues.filter_sort.farduedate = Feernst Anstahns-Datum
+issues.filter_sort.moststars = Meeste Steernen
+issues.filter_sort.feweststars = Minnste Steernen
+issues.filter_sort.mostforks = Meeste Gabels
+issues.action_open = Opmaken
+issues.action_close = Dichtmaken
+issues.action_label = Vermark
+issues.action_milestone = Marksteen
+issues.action_assignee = Towiesen
+issues.action_check = Utkören/Ofkören
+issues.action_check_all = All Dingen Utkören/Ofkören
+issues.opened_by = %[1]s vun %[3]s opmaakt
+pulls.merged_by_fake = vun %[2]s is %[1]s tosamenföhrt worden
+issues.closed_by = vun %[3]s is %[1]s dichtmaakt worden
+issues.closed_by_fake = vun %[2]s is %[1]s dichtmaakt worden
+issues.opened_by_fake = vun %[2]s is %[1]s opmaakt worden
+issues.previous = Vörig
+issues.all_title = All
+issues.draft_title = Sketts
+issues.num_comments_1 = %d Kommentaar
+issues.delete_comment_confirm = Willst du deesen Kommentaar würrelk lösken?
+issues.context.copy_link = Verwies koperen
+issues.context.reference_issue = In nejem Gefall benömen
+issues.context.edit = Bewarken
+issues.context.delete = Lösken
+issues.no_content = Keen Beschrieven angeven.
+issues.choose.get_started = Lössleggen
+issues.label_templates.fail_to_load_file = Kunn de Vermark-Vörlaag-Datei »%s« nich laden: %v
+issues.add_label = hett de Vermark %s %s hentogeföögt
+issues.add_assignee_at = `is vun %s %s towiesen worden`
+issues.action_milestone_no_select = Keen Marksteen
+issues.choose.blank_about = Een nejes Gefall vun de Normaal-Vörlaag maken.
+issues.create = Gefall maken
+issues.label_templates.title = Eene Vermark-Sammlung laden
+issues.label_templates.info = Dat gifft noch keene Vermarkens. Maak eenen Vermark mit »Nejer Vermark« of bruuk eene Vermarkens-Sammlung:
+issues.change_project_at = `hett dat Projekt vun %s to %s ännert`
+issues.remove_assignee_at = `is sien Towiesen vun %s %s wegnohmen worden`
+issues.open_title = Open
+issues.close = Gefall dichtmaken
+issues.choose.ignore_invalid_templates = Ungültig Vörlagens sünd ignoreert worden
+issues.add_ref_at = `hett de Nömen %s %s hentoföögt`
+issues.filter_type.all_issues = All Gefallens
+issues.filter_type.created_by_you = Vun di maakt
+issues.filter_milestone_closed = Dichtmaakt Markstenen
+issues.commented_at = `hett %s kommenteert`
+issues.remove_labels = hett de Vermarkens %s %s wegdaan
+issues.filter_type = Aard
+pulls.merged_by = vun %[3]s is %[1]s tosamenföhrt worden
+issues.next = Anner
+issues.add_remove_labels = hett de Vermarkens %s hentoföögt un %s %s wegdaan
+issues.remove_ref_at = `hett de Nömen %s %s wegdaan`
+issues.filter_milestone_all = All Markstenen
+issues.filter_type.reviewed_by_you = Vun di nakiekt
+issues.filter_sort.fewestforks = Minnste Gabels
+issues.action_assignee_no_select = Nich towiesen
+issues.closed_title = Dicht
+issues.num_comments = %d Kommentaren
+issues.context.quote_reply = Antwoord ziteren
+issues.comment_pull_merged_at = hett Kommitteren %[1]s in %[2]s %[3]s tosamenföhrt
+issues.close_comment_issue = Mit Kommentaar dichtmaken
+issues.reopen_comment_issue = Mit Kommentaar weer opmaken
+issues.create_comment = Kommentaar
+issues.reopened_at = `hett deeses Gefall %[2]s weer opmaakt`
+issues.comment_manually_pull_merged_at = hett Kommitteren %[1]s in %[2]s %[3]s vun Hand tosamenföhrt
+issues.reopen_issue = Weer opmaken
+issues.closed_at = `hett deeses Gefall %[2]s dichtmaakt`
+issues.commit_ref_at = `hett deeses Gefall %[2]s vun eenem Kommitteren benöömt`
+issues.ref_closing_from = `hett deeses Gefall vun eenem Haalvörslag %[4]s, wat ’t dichtmaken word, %[2]s benöömt`
+issues.ref_closed_from = `hett deeses Gefall %[4]s %[2]s dichtmaakt`
+issues.ref_reopened_from = `hett deeses Gefall %[4]s %[2]s weer opmaakt`
+issues.ref_from = `vun %[1]s`
+issues.author = Author
+issues.author.tooltip.pr = Deeser Bruker is de Author vun deesem Haalvörslag.
+issues.role.owner = Eegner
+issues.role.owner_helper = Deeser Bruker is de Eegner vun deesem Repositorium.
+issues.role.member = Liddmaat
+issues.role.collaborator = Mitarbeider
+issues.role.first_time_contributor = Nejer Bidrager
+issues.role.first_time_contributor_helper = Dat is de eerste Bidrag vun deesem Bruker to deesem Repositorium.
+issues.role.contributor = Bidrager
+issues.role.contributor_helper = Deeser Bruker hett al wat in deesem Repositorium kommitteert.
+issues.remove_request_review = Nakieken-Anfragg wegdoon
+issues.remove_request_review_block = Kann Nakiekens-Anfragg nich wegdoon
+issues.dismiss_review = Nakieken ofseggen
+issues.dismiss_review_warning = Willst du deeses Nakieken würrelk ofseggen?
+issues.sign_in_require_desc = Mell di an um mittosnacken.
+issues.edit = Bewarken
+issues.cancel = Ofbreken
+issues.save = Sekern
+issues.label_description = Beschrieven
+issues.label_color = Klöör
+issues.label_exclusive = Sünner annere
+issues.label_archive = Vermark archiveren
+issues.label_count = %d Vermarkens
+issues.label_open_issues = %d open Gefallens/Haalvörslagens
+issues.label_edit = Bewarken
+issues.label_delete = Lösken
+issues.label_modify = Vermark bewarken
+issues.label_deletion = Vermark lösken
+issues.label_deletion_success = De Vermark is lösket worden.
+issues.label.filter_sort.alphabetically = Na de Alphabeet
+issues.label.filter_sort.reverse_alphabetically = Umdreiht na de Alphabeet
+issues.label.filter_sort.by_size = Lüttste Grött
+issues.num_participants_one = %s Mitmaker
+issues.num_participants_few = %s Mitmakers
+issues.ref_pull_from = `hett deeses Haalvörslag %[4]s %[2]s benöömt`
+issues.label_title = Naam
+issues.label_archived_filter = Archiveert Vermarkens wiesen
+issues.archived_label_description = (Archiveert) %s
+issues.ref_issue_from = `hett deeses Gefall %[4]s %[2]s benöömt`
+issues.ref_reopening_from = `hett deeses Gefall vun eenem Haalvörslag %[4]s, wat ’t weer opmaken word, %[2]s benöömt`
+issues.author.tooltip.issue = Deeser Bruker is de Author vun deesem Gefall.
+issues.role.member_helper = Deeser Bruker is een Liddmaat vun de Verenigung, wat de Eegner vun deesem Repositorium is.
+issues.role.collaborator_helper = Deeser Bruuker is inladen worden, in deesem Repositorium mittoarbeiden.
+issues.re_request_review = Nakieken neei anfragen
+issues.is_stale = ’t hett siet de Nakieken Ännerns in deesem HV geven
+issues.label_deletion_desc = Wenn du een Vermark löskest, word dat vun all Gefallens wegnohmen. Wiedermaken?
+issues.label.filter_sort.reverse_by_size = Gröttste Grött
+issues.review.review = Nakieken
+issues.review.reviewers = Nakiekers
+issues.review.show_resolved = Wies lööst
+issues.review.hide_resolved = Verbarg lööst
+issues.review.resolve_conversation = Snack lösen
+issues.attachment.open_tab = `Klick, um »%s« in eener nejen Karteikaart antokieken`
+issues.attachment.download = `Klick, um »%s« runnertoladen`
+issues.unsubscribe = Ofbestellen
+issues.unpin_issue = Gefall lösssteken
+issues.lock = Snack tosluten
+issues.unlock = Snack upsluten
+issues.lock_duplicate = Een Gefall kann nich dübbelt tosluten worden.
+issues.unlock_comment = hett deesen Snack %s upsluten
+issues.unlock_confirm = Upsluten
+issues.lock_confirm = Tosluten
+issues.lock.notice_3 = - Du kannst deeses Gefall to elkeen Tied weer upsluten.
+issues.unlock.notice_1 = - Elkeenwell kann weer up deesem Gefall kommenteren.
+issues.unlock.notice_2 = - Du kannst deeses Gefall to elkeen Tied weer tosluten.
+issues.lock.reason = Grund för ’t Tosluten
+issues.comment_on_locked = Du kannst nich up een tosloten Gefall kommenteren.
+issues.delete = Lösken
+issues.delete.title = Deeses Gefall lösken?
+issues.tracker = Tied-Erfater
+issues.start_tracking_short = Tiednehmer starten
+issues.start_tracking = Tied-Erfaten begünnen
+issues.stop_tracking_history = `hett %s to warken uphöört`
+issues.cancel_tracking = Wegdoon
+issues.cancel_tracking_history = `hett %s dat Tied-Erfaten wegdaan`
+issues.add_time = Tied vun Hand indragen
+issues.del_time = Deese Tied-Upschrift lösken
+issues.add_time_short = Tied hentofögen
+issues.add_time_cancel = Ofbreken
+issues.add_time_history = `hett %s bruukt Tied hentoföögt`
+issues.del_time_history = `hett %s bruukt Tied wegdaan`
+issues.add_time_hours = Stünnen
+issues.add_time_minutes = Menüten
+issues.add_time_sum_to_small = Keene Tied is indragen worden.
+issues.time_spent_total = Tied bruukt all tosamen
+issues.time_spent_from_all_authors = `Tied bruukt all tosamen: %s`
+issues.due_date = Anstahns-Datum
+issues.push_commit_1 = hett %d Kommitteren %s hentoföögt
+issues.push_commits_n = hett %d Kommitterens %s hentoföögt
+issues.force_push_compare = Verglieken
+issues.due_date_form_edit = Bewarken
+issues.due_date_form_remove = Wegdoon
+issues.due_date_not_set = Keen Anstahns-Datum sett.
+issues.due_date_added = hett dat Anstahns-Datum %s %s hentoföögt
+issues.due_date_remove = hett dat Anstahns-Datum %s %s wegdaan
+issues.due_date_overdue = Staht al lang an
+issues.dependency.title = Ofhangens
+issues.dependency.issue_no_dependencies = Keene Ofhangens sett.
+issues.dependency.pr_no_dependencies = Keene Ofhangens sett.
+issues.dependency.no_permission_1 = Du hest nich de Rechten, um %d Ofhangen to lesen
+issues.dependency.no_permission_n = Du hest nich de Rechten, um %d Ofhangens to lesen
+issues.dependency.add = Ofhangen henntofögen …
+issues.dependency.cancel = Ofbreken
+issues.dependency.issue_closing_blockedby = Dat Dichtmaken vun deesem Gefall word vun deesen Gefallens blockeert
+issues.dependency.pr_closing_blockedby = Dat Dichtmaken vun deesem Haalvörslag word vun deesen Gefallens blockeert
+issues.dependency.pr_close_blocks = Deeser Haalvörslag blockeert dat Dichtmaken vun deesen Gefallens
+issues.dependency.issue_batch_close_blocked = Kann de utköört Gefallens nich all tosamen dichtmaken, denn Gefall #%d hett noch open Ofhangens
+issues.dependency.pr_close_blocked = Du muttst all Gefallens, wat deesen Haalvörslag blockeren, dichtmaken, ehr du dat hier tosamenföhren kannst.
+issues.dependency.blocks_short = Blockeert
+issues.dependency.blocked_by_short = Hang of vun
+issues.dependency.remove_header = Ofhangen wegdoon
+issues.dependency.setting = Ofhangens för Gefallens un Haalvörslagen anknipsen
+issues.dependency.add_error_same_issue = Du kannst een Gefall nich vun sik sülvst ofhangen laten.
+issues.dependency.add_error_dep_issue_not_exist = Ofhangig Gefall gifft dat nich.
+issues.dependency.add_error_dep_not_exist = Ofhangen gifft dat nich.
+issues.dependency.add_error_dep_exists = Ofhangen gifft dat al.
+issues.dependency.add_error_cannot_create_circular = Du kannst keen Ofhangen maken, waar sik twee Gefallens tegensiedig blockeren.
+issues.dependency.add_error_dep_not_same_repo = Beide Gefallens mutten in de sülve Repositorium wesen.
+issues.review.self.approval = Du kannst nich dien eegen Haalvörslag tostimmen.
+issues.review.self.rejection = Du kannst nich up dien eegen Haalvörslag um Ännerns beden.
+issues.review.comment = hett %s nakiekt
+issues.review.dismissed_label = Ofseggt
+issues.review.left_comment = hett kommenteert
+issues.review.content.empty = Du muttst eenen Kommentaar geven, wat för Ännerns du hebben willst.
+issues.review.reject = hett %s um Ännerns beden
+issues.review.remove_review_request = hett de Nakieken-Anfraag för %s %s wegdaan
+issues.review.remove_review_request_self = hett %s dat Nakieken verweigert
+issues.unlock_error = Kann een Gefall nich upsluten, wenn ’t nich tosloten is.
+issues.lock_with_reason = hett dat um %s %s tosluten un Snack up Mitarbeiders begrenzt
+issues.unpin_comment = hett dat %s lössstoken
+issues.lock.notice_1 = - Anner Brukers könen keene nejen Kommentaren to deesem Gefall hentofögen.
+issues.stop_tracking = Tiednehmer anhollen
+issues.lock.unknown_reason = Kann een Gefall nich sünner Grund tosluten.
+issues.subscribe = Abonneren
+issues.max_pinned = Du kannst nich mehr Gefallens faststeken
+issues.pin_comment = hett dat %s faststoken
+issues.lock_no_reason = hett dat %s tosluten un Snack up Mitarbeiders begrenzt
+issues.delete.text = Willst du deeses Gefall würrelk lösken? (Dat lösket för all Tieden all Inhollen. Wenn du ’t blots archiveren willst, maakt ’t lever blots dicht)
+issues.start_tracking_history = `hett %s to warken begunnen`
+issues.lock.notice_2 = - Du un anner Mitarbeiders mit Togriep to deesem Repositorium könnt wiederhen Kommentaren schrieven, wat elkeenwell sücht.
+issues.due_date_modified = hett dat Anstahns-Datum vun %[2]s to %[1]s %[3]s ännert
+issues.dependency.issue_remove_text = Dat word de Ofhangen vun deesem Gefall wegdoon. Wiedermaken?
+issues.review.approve = hett deese Ännerns %s tostimmt
+issues.review.dismissed = hett dat Nakieken vun %s %s ofseggt
+issues.lock.title = Snack up deesem Gefall tosluten.
+issues.unlock.title = Snack up deesem Gefall upsluten.
+issues.tracker_auto_close = Tiednehmer word automatisk anhollt, wenn dat Gefall dichtmaakt word
+issues.dependency.no_permission.can_remove = Du hest nich de Rechten, um deese Ofhangen to lesen, aver du kannst deese Ofhangen wegdoon
+issues.dependency.remove_info = Deese Ofhangen wegdoon
+issues.dependency.removed_dependency = `hett %s eene Ofhangen wegdaan`
+issues.dependency.issue_close_blocked = Du muttst all Gefallens, wat deeses Gefall blockeren, dichtmaken, ehr du dat hier dichtmaken kannst.
+issues.review.outdated = Verollt
+issues.review.option.show_outdated_comments = Verollte Kommentarens wiesen
+issues.review.un_resolve_conversation = Snack weer opmaken
+issues.tracking_already_started = `Du hest dat Tied-Erfaten al in eenem anner Gefall begunnen!`
+issues.due_date_invalid = Dat Anstahns-Datum is ungültig of buten de Rieg. Bidde bruuk dat Formaat »JJJJ-MM-DD«.
+issues.dependency.remove = Wegdoon
+issues.dependency.issue_close_blocks = Deeses Gefall blockeert dat Dichtmaken vun deesen Gefallens
+issues.review.outdated_description = Inholl hett sik ännert, siet deeser Kommentaar schreven worden is
+issues.force_push_codes = `hett %[1]s vun %[2]s to %[4]s %[6]s dwangsschuven`
+issues.dependency.pr_remove_text = Dat word de Ofhangen vun deesem Haalvörslag wegdoon. Wiedermaken?
+issues.review.pending = Staht ut
+issues.review.option.hide_outdated_comments = Verollte Kommentarens verbargen
+issues.due_date_form = JJJJ-MM-DD
+issues.dependency.added_dependency = `hett %s eene neje Ofhangen hentoföögt`
+issues.review.wait = is %s um een Nakieken anfraggt worden
+issues.review.add_review_request = hett um een Nakieken vun %s %s anfraggt
+issues.review.show_outdated = Wies verollt
+issues.review.hide_outdated = Verbarg verollt
+issues.content_history.options = Instellens
+issues.reference_link = Nömen: %s
+compare.compare_base = Grund
+compare.compare_head = Verglieken
+pulls.desc = Haalvörslagen un Quelltext-Nakiekens anknipsen.
+pulls.new = Nejer Haalvörslag
+pulls.view = Haalvörslag wiesen
+pulls.allow_edits_from_maintainers = Bewarkens vun Liddmaten verlöven
+pulls.allow_edits_from_maintainers_err = Vernejen fehlslagen
+pulls.compare_changes_desc = Köör de Twieg ut, waarhen tosamenföhrt worden sall, un vun welkem Twieg haalt worden sall.
+pulls.has_viewed_file = Ankiekt
+pulls.has_changed_since_last_review = Siet lestem Nakieken ännert
+pulls.viewed_files_label = %[1]d vun %[2]d Dateien ankiekt
+pulls.expand_files = All Dateien verwiedern
+pulls.collapse_files = All Dateien tosamenfolden
+pulls.compare_base = tosamenföhren na
+pulls.compare_compare = halen vun
+pulls.switch_head_and_base = Kopp un Grund tuusken
+pulls.filter_branch = Twieg filtern
+pulls.no_results = Keene Resultaten funnen.
+pulls.show_all_commits = All Kommitterens wiesen
+pulls.show_changes_since_your_last_review = Ännerns siet dienem lesten Nakieken wiesen
+pulls.showing_specified_commit_range = Blots Ännerns vun Kommitterens %[1]s bit %[2]s wiesen
+pulls.review_only_possible_for_full_diff = Nakieken gaht blots, wenn de hele Unnerscheed wiest word
+pulls.filter_changes_by_commit = Na Kommitteren filtern
+pulls.nothing_to_compare = Deese Twiegen sünd gliek. ’t is nich nödig, eenen Haalvörslag to maken.
+pulls.nothing_to_compare_have_tag = De utköört Twieg/Mark sünd gliek.
+pulls.create = Haalvörslag maken
+pulls.title_desc_one = will %[1]d Kommitteren vun %[2]s na %[3]s tosamenföhren
+pulls.merged_title_desc_one = hett %[1]d Kommitteren vun %[2]s na %[3]s %[4]s tosamenföhrt
+pulls.change_target_branch_at = `hett de Enn-Twieg vun %s to %s %s ännert`
+pulls.tab_conversation = Snack
+pulls.tab_commits = Kommitterens
+pulls.tab_files = Ännert Dateien
+pulls.reopen_to_merge = Bidde maak deesen Haalvörslag weer op, um dat Tosamenföhren dörtoföhren.
+pulls.cant_reopen_deleted_branch = Deeser Haalvörslag kann nich weer opmaakt worden, denn de Twieg is lösket worden.
+pulls.merged = Tosamenföhrt
+pulls.merged_success = Haalvörslag tosamenföhrt un dichtmaakt
+pulls.closed = Haalvörslag dichtmaakt
+pulls.manually_merged = Vun Hand tosamenföhrt
+pulls.merged_info_text = De Twieg %s kann nu lösket worden.
+pulls.is_closed = De Haalvörslag is dichtmaakt worden.
+pulls.title_wip_desc = `Begünn de Titel mit %s, daarmit de Haalvörslag nich ut Versehn tosamenföhrt word.`
+pulls.still_in_progress = Noch in de Maak?
+pulls.cannot_merge_work_in_progress = Deeser Haalvörslag is as noch in de Maak markeert.
+pulls.ready_for_review = Klaar tum Nakieken?
+pulls.add_prefix = Dat Präfix %s hentofögen
+pulls.remove_prefix = Dat Präfix %s wegdoon
+pulls.files_conflicted = Deeser Haalvörslag hett Ännerns, wat mit de Enn-Twieg unverdragelk sünd.
+pulls.is_ancestor = Deeser Twieg is al in de Enn-Twieg enthollen. Dat gifft nix tum tosamenföhren.
+pulls.is_empty = De Ännerns in deesem Twieg sünd al in de Enn-Twieg. Dat word een leger Kommitteren.
+pulls.required_status_check_failed = Eenige nödig Överprüfens sünd fehlslagen.
+pulls.required_status_check_missing = Eenige nödig Överprüfens sünd nich daar.
+pulls.required_status_check_administrator = As een Chef düürst du deesen Haalvörslag doch tosamenföhren.
+pulls.blocked_by_approvals = Deeser Haalvörslag hett noch nich genoog Tostimmens. %d vun %d Tostimmens geven.
+pulls.blocked_by_rejection = Een offizieller Nakieker hett um Ännerns an deesem Haalvörslag beden.
+pulls.blocked_by_outdated_branch = Deeser Haalvörslag is blockeert, denn he is verollt.
+pulls.cannot_auto_merge_desc = Deeser Haalvörslag kann nich automatisk tosamenföhrt worden, denn dat gifft Unverdragelkheidens.
+pulls.cannot_auto_merge_helper = Föhr dat vun Hand tosamen, um de Unverdragelkheidens oftohelpen.
+pulls.num_conflicting_files_1 = %d unverdragelk Datei
+pulls.approve_count_1 = %d Tostimmen
+pulls.reject_count_n = %d Bidden um Ännerns
+pulls.waiting_count_n = %d Nakiekens stahn ut
+pulls.wrong_commit_id = Kommitteren-ID mutt eene Kommitteren-ID up de Enn-Twieg wesen
+pulls.no_merge_helper = Knips Tosamenföhrens-Instellens in de Repositoriums-Instellens an of föhr de Tosamenföhren vun Hand tosamen.
+pulls.no_merge_wip = De Haalvörslag kann nich tosamenföhrt worden, denn dat is as noch in de Maak markeert.
+pulls.no_merge_not_ready = De Haalvörslag is nich klaar tum Tosamenföhren, bekiek de Nakiekens-Tostand un de Överprüfens.
+pulls.merge_pull_request = Tosamenföhrens-Kommitteren maken
+pulls.has_pull_request = `Eenen Haalvörslag tüsken deesen Twiegen gifft dat al: %[2]s#%[3]d`
+pulls.blocked_by_official_review_requests = Deeser Haalvörslag is blockeert, denn een of mehr offiziell Nakiekers hebben noch nich tostimmt.
+pulls.blocked_by_changed_protected_files_1 = Deeser Haalvörslag is blockeert, denn dat ännert eene beschütt Datei:
+pulls.no_merge_desc = De Haalvörslag kann nich tosamenföhrt worden, denn all Tosamenföhrens-Instellens sünd in deesem Repositorium utknipst.
+issues.review.resolved_by = hett deesen Snack as lööst markeert
+issues.reference_issue.body = Text
+issues.content_history.delete_from_history = Ut Histoorje lösken
+pulls.compare_changes = Nejer Haalvörslag
+pulls.allow_edits_from_maintainers_desc = Brukers, well dat Recht hebben, to de Grund-Twieg to schrieven, düren ok up deesen Twieg schuuven
+pulls.nothing_to_compare_and_allow_empty_pr = Deese Twiegen sünd gliek. De HV word leeg wesen.
+pulls.title_desc_few = will %[1]d Kommitterens vun %[2]s na %[3]s tosamenföhren
+pulls.data_broken = Deeser Haalvörslag is kaputt, denn de Gabel-Informatioon fehlt.
+pulls.waiting_count_1 = %d Nakieken staht ut
+issues.content_history.deleted = lösket
+issues.content_history.created = maakt
+issues.content_history.delete_from_history_confirm = Ut Histoorje lösken?
+issues.blocked_by_user = Du kannst up deesem Repositorium keenen Gefall opmaken, denn de Repositoriums-Eegner hett di blockeert.
+pulls.merged_title_desc_few = hett %[1]d Kommitterens vun %[2]s na %[3]s %[4]s tosamenföhrt
+pulls.reject_count_1 = %d Bidde um Ännerns
+pulls.blocked_by_user = Du kannst in deesem Repositorium keenen Haalvörslag opmaken, denn de Repositoriums-Eegner hett di blockeert.
+pulls.no_merge_access = Du hest nich dat Recht, deesen Haalvörslag tosamentoföhren.
+issues.comment.blocked_by_user = Du kannst up deesem Gefall keenen Kommentaar schrieven, denn de Repositoriums-Eegner of de Author vun de Gefall hett di blockeert.
+pulls.switch_comparison_type = Verglieks-Aard ännern
+pulls.showing_only_single_commit = Blots Ännerns vun Kommitteren %[1]s wiesen
+pulls.blocked_by_changed_protected_files_n = Deeser Haalvörslag is blockeert, denn dat ännert beschütt Dateien:
+pulls.num_conflicting_files_n = %d unverdragelk Dateien
+issues.content_history.edited = bewarkt
+pulls.select_commit_hold_shift_for_range = Kommitteren utkören. Holl Umschalt un Klick, um eene Rieg uttokören
+pulls.is_checking = Överprüfen vun Tosamenföhrens-Unverdragelkheidens löppt. Bidde versöök dat in körter Tied noch eenmaal.
+pulls.can_auto_merge_desc = Deeser Haalvörslag kann automatisk tosamenföhrt worden.
+pulls.approve_count_n = %d Tostimmens
+pulls.rebase_merge_pull_request = Umbaseren dann fix na vörn
+pulls.rebase_merge_commit_pull_request = Umbaseren dann Tosamenföhrens-Kommitteren maken
+pulls.squash_merge_pull_request = Plattdrück-Kommitteren maken
+pulls.fast_forward_only_merge_pull_request = Blots fix na vörn
+pulls.merge_manually = Vun Hand tosamenföhrt
+pulls.merge_commit_id = De Tosamenföhrens-Kommitteren-ID
+pulls.require_signed_wont_sign = De Twieg bruukt unnerschrieven Kommitterens, aver deeses Tosamenföhren word nich unnerschrieven wesen
+pulls.invalid_merge_option = Du kannst deese Tosamenföhrens-Instellen för deesen Haalvörslag nich bruken.
+pulls.merge_conflict = Tosamenföhren fehlslagen: Dat hett bi’m Tosamenföhren eene Unverdragelkheid geven. Wenk: Versöök eene anner Tosamenföhrens-Aard
+pulls.merge_conflict_summary = Fehler-Naricht
+pulls.rebase_conflict = Tosamenföhren fehlslagen: Dat hett bi’m Umbaseren vun Kommitteren %[1]s eene Unverdragelkheid geven. Wenk: Versöök eene anner Tosamenföhrens-Aard
+pulls.rebase_conflict_summary = Fehler-Naricht
+pulls.merge_out_of_date = Tosamenföhren fehlslagen: Bi’m Tosamenföhren is de Grund verneeit worden. Wenk: Versöök dat noch eenmaal.
+pulls.head_out_of_date = Tosamenföhren fehlslagen: Bi’m Tosamenföhren is de Kopp verneeit worden. Wenk: Versöök dat noch eenmaal.
+pulls.push_rejected_summary = Kumpleete Oflehnens-Naricht
+pulls.push_rejected = Schuven fehlslagen: Dat Schuven is oflehnt worden. Bidde överprüüf de Git-Hakens för deeses Repositorium.
+pulls.open_unmerged_pull_exists = `Du kannst dat nich weer opmaken, denn dat gifft een anner open Haalvörslag (#%d) mit akkeraat de sülven Eegenskuppen.`
+pulls.status_checking = Eenige Överprüfens stahn ut
+pulls.status_checks_success = All Överprüfens sünd klaar
+pulls.status_checks_warning = Eenige Överprüfens hebben Wahrschauens mellt
+pulls.status_checks_error = Eenige Överprüfens hebben Fehlers mellt
+pulls.status_checks_failure = Eenige Överprüfens sünd fehlslagen
+pulls.status_checks_requested = Nödig
+pulls.status_checks_hide_all = All Överprüfens verbargen
+pulls.status_checks_details = Mehr Informatioonen
+pulls.status_checks_show_all = All Överprüfens wiesen
+pulls.update_branch_rebase = Twieg mit Umbaseren vernejen
+pulls.outdated_with_base_branch = De Twieg is tegen de Grund-Twieg verollt
+pulls.close = Haalvörslag dichtmaken
+pulls.closed_at = `hett deesen Haalvörslag %[2]s dichtmaakt`
+pulls.reopened_at = `hett deesen Haalvörslag %[2]s weer opmaakt`
+pulls.cmd_instruction_hint = Wies Oorderreeg-Instruksjes
+pulls.cmd_instruction_checkout_title = Utchecken
+pulls.cmd_instruction_merge_title = Tosamenföhren
+pulls.clear_merge_message = Tosamenföhrens-Naricht leegmaken
+pulls.reopen_failed.head_branch = De Haalvörslag kann nich weer opmaakt worden, denn de Kopp-Twieg gifft dat nich mehr.
+pulls.reopen_failed.base_branch = De Haalvörslag kann nich weer opmaakt worden, denn de Grund-Twieg gifft dat nich mehr.
+pulls.made_using_agit = AGit
+pulls.auto_merge_when_succeed = Automatisk Tosamenföhren, wenn all Överprüfens kumpleet sünd
+pulls.auto_merge_newly_scheduled_comment = ` hett de Haalvörslag %[1]s sett, sik tosamentoföhren, wenn all Överprüfens kumpleet sünd`
+pulls.delete.title = Deesen Haalvörslag lösken?
+pulls.recently_pushed_new_branches = Du hest to de Twieg %[1]s %[2]s schuven
+milestones.new = Nejer Marksteen
+milestones.closed = %s dichtmaakt
+milestones.open = Opmaken
+milestones.close = Dichtmaken
+milestones.completeness = %d%% Kumpleet
+milestones.create = Marksteen maken
+milestones.desc = Beschrieven
+milestones.due_date = Anstahns-Datum (kann leeg wesen)
+milestones.create_success = De Marksteen »%s« is maakt worden.
+milestones.edit = Marksteen bewarken
+milestones.edit_subheader = Markstenen organiseren Gefallens un verfolgen Wiederkomen.
+milestones.cancel = Ofbreken
+milestones.modify = Marksteen vernejen
+milestones.edit_success = Marksteen »%s« is verneeit worden.
+milestones.deletion = Marksteen lösken
+pulls.has_merged = Fehlslagen: De Haalvörslag is tosamenföhrt worden, du kannst nich noch eenmaal tosamenföhren of de Enn-Twieg ännern.
+pulls.unrelated_histories = Tosamenföhren fehlslagen: De Tosamenföhrens-Kopp un -Grund hebben keene gemeensame Histoorje. Wenk: Versöök eene anner Tosamenföhrens-Aard
+pulls.update_not_allowed = Du düürst deesen Twieg nich vernejen
+pulls.commit_ref_at = `hett deesen Haalvörslag %[2]s vun eenem Kommitteren benöömt`
+pulls.auto_merge_newly_scheduled = De Haalvörslag weer sett, sik tosamentoföhren, wenn all Överprüfens kumpleet sünd.
+milestones.clear = Leeg maken
+pulls.push_rejected_no_message = Schuven fehlslagen: Dat Schuven is sünner feerne Naricht oflehnt worden. Bidde överprüüf de Git-Hakens för deeses Repositorium
+pulls.update_branch = Twieg mit Tosamenföhren vernejen
+pulls.update_branch_success = Twieg is verneeit worden
+pulls.cmd_instruction_checkout_desc = Check in dienem Projekt-Repositorium eenen nejen Twieg ut un probeer de Ännerns ut.
+pulls.cmd_instruction_merge_desc = Föhr de Ännerns tosamen un veneei up Forgejo.
+pulls.cmd_instruction_merge_warning = Wahrschau: De Instellens »Tosamenföhren vun Hand automatisk erkennen« is för deeses Repositorium utknipst, du muttst deesen Haalvörslag daarna noch as vun Hand tosamenföhrt markeren.
+pulls.auto_merge_button_when_succeed = (Wenn Överprüfens kumpleet sünd)
+pulls.auto_merge_cancel_schedule = Automatisk Tosamenföhren ofbreken
+pulls.auto_merge_canceled_schedule = Dat automatisk Tosamenföhren is för deesen Haalvörslag ofbroken worden.
+pulls.agit_explanation = Mit de AGit-Warkwies maakt. AGit lett Bidragers Ännerns mit »git push« vörslagen, sünner eene Gabel of eenen nejen Twieg to maken.
+pulls.auto_merge_has_pending_schedule = %[1]s hett de Haalvörslag %[2]s sett, sik tosamentoföhren, wenn all Överprüfens kumpleet sünd.
+pulls.auto_merge_not_scheduled = Deeser Haalvörslag is nich för dat automatisk Tosamenföhren sett.
+pull.deleted_branch = (lösket):%s
+pulls.auto_merge_canceled_schedule_comment = ` hett dat automatisk Tosamenföhren vun deesem Haalvörslag, wenn all Överprüfens kumpleet sünd, %[1]s ofbroken`
+pulls.delete.text = Willst du deesen Haalvörslag würrelk lösken? (Dat lösket för all Tieden all Inhollen. Wenn du ’t blots archiveren willst, maakt ’t lever blots dicht)
+milestones.update_ago = %s verneeit
+milestones.no_due_date = Keen Anstahns-Datum
+milestones.new_subheader = Markstenen könen di hülpen, Gefallens to organiseren un hör Wiederkomen to verfolgen.
+milestones.title = Titel
+milestones.invalid_due_date_format = Anstahns-Datums-Formaat mutt »JJJJ-MM-DD« wesen.
+milestones.deletion_desc = Wenn een Marksteen lösket word, word dat vun all benöömt Gefallens wegdaan. Wiedermaken?
+milestones.deletion_success = De Marksteen is lösket worden.
+milestones.filter_sort.name = Naam
+milestones.filter_sort.latest_due_date = Feernst Anstahns-Datum
+milestones.filter_sort.least_complete = Minnst kumpleet
+milestones.filter_sort.most_complete = Meest kumpleet
+milestones.filter_sort.most_issues = Meest Gefallens
+signing.will_sign = Deeses Kommitteren word mit de Slötel »%s« unnerschreven.
+signing.wont_sign.nokey = Deese Instanz hett keenen Slötel, um deeses Kommitteren to unnerschrieven.
+signing.wont_sign.never = Kommitterens worden nie unnerschrieven.
+signing.wont_sign.always = Kommitterens worden alltieden unnerschrieven.
+signing.wont_sign.twofa = Du muttst Twee-Faktooren-Anmellen anknipsen, um Kommitterens to unnerschrieven.
+signing.wont_sign.headsigned = Deeses Kommitteren word nich unnerschrieven, denn dat Kopp-Kommitteren is nich unnerschreven.
+signing.wont_sign.basesigned = Deeses Kommitteren word nich unnerschrieven, denn dat Grund-Kommitteren is nich unnerschreven.
+signing.wont_sign.commitssigned = Dat Tosamenföhren word nich unnerschrieven, denn de Kommitterens vun Belang sünd nich all unnerschreven.
+signing.wont_sign.approved = Dat Tosamenföhren word nich unnerschrieven, denn de HV is nich tostimmt.
+signing.wont_sign.not_signed_in = Du büst nich anmellt.
+ext_wiki = Frömdes Wiki
+wiki = Wiki
+wiki.welcome = Willkomen im Wiki.
+wiki.desc = Schriev un deel Dokumenterens mit Mitarbeiders.
+wiki.create_first_page = Maak de eerste Sied
+wiki.page = Sied
+wiki.filter_page = Sied filtern
+wiki.new_page = Sied
+wiki.page_title = Sied-Titel
+wiki.page_content = Sied-Text
+wiki.default_commit_message = Schriev eene Notiz över deeses Sieden-Vernejen (wenn du willst).
+wiki.save_page = Sied sekern
+wiki.cancel = Ofbreken
+wiki.last_commit_info = %s hett diese Sied %s bewarkt
+wiki.edit_page_button = Bewarken
+wiki.new_page_button = Neje Sied
+wiki.file_revision = Sied-Versioon
+wiki.back_to_wiki = Torügg tur Wiki-Sied
+wiki.delete_page_button = Sied lösken
+wiki.delete_page_notice_1 = Wenn du de Wiki-Sied »%s« löskest, kann se nich mehr torügghaalt worden. Wiedermaken?
+wiki.reserved_page = De Wiki-Sied-Naam »%s« is vörbehollen.
+wiki.pages = Sieden
+wiki.last_updated = Tolest %s verneeit
+wiki.original_git_entry_tooltip = Wies de echte Git-Datei un bruuk nich de fründelk Verwies.
+wiki.search = Im Wiki söken
+wiki.no_search_results = Keene Resultaten
+activity = Doon
+activity.navbar.pulse = Puls
+activity.navbar.code_frequency = Quelltext-Frequenz
+activity.navbar.contributors = Bidragers
+activity.navbar.recent_commits = Leste Kommitterens
+activity.period.filter_label = Tied:
+activity.period.daily = 1 Dag
+activity.period.halfweekly = 3 Dagen
+activity.overview = Översicht
+activity.active_prs_count_1 = %d aktiiv Haalvörslag
+activity.merged_prs_count_1 = Tosamenföhrt Haalvörslag
+activity.opened_prs_count_1 = Nejer Haalvörslag
+activity.title.user_n = %d Brukers
+activity.title.prs_n = %d Haalvörslagen
+activity.title.prs_merged_by = %s vun %s tosamenföhrt
+activity.title.prs_opened_by = %s vun %s opmaakt
+activity.merged_prs_label = Tosamenföhrt
+activity.opened_prs_label = Neei vörslagen
+activity.active_issues_count_1 = %d aktiiv Gefall
+activity.closed_issues_count_1 = Dichtmaakt Gefall
+activity.title.issues_closed_from = %s vun %s dichtmaakt
+activity.title.issues_created_by = %s vun %s opmaakt
+activity.new_issues_count_1 = Nejes Gefall
+activity.new_issues_count_n = Neje Gefallens
+activity.new_issue_label = Opmaakt
+activity.closed_issue_label = Dichtmaakt
+activity.title.unresolved_conv_1 = %d nich lööst Snack
+activity.unresolved_conv_desc = Deese körtens ännert Gefallens un Haalvörslagen sünd noch nich lööst worden.
+activity.unresolved_conv_label = Open
+activity.published_release_label = Publizeren
+activity.published_tag_label = Mark
+activity.no_git_activity = In deeser Tied hett dat keen Kommitterens-Doon geven.
+activity.git_stats_exclude_merges = Sünner Tosamenföhrens
+activity.git_stats_author_1 = %d Author
+activity.git_stats_author_n = %d Authoren
+activity.git_stats_pushed_1 = hett
+activity.git_stats_pushed_n = hebben
+activity.git_stats_commit_1 = %d Kommittteren
+activity.git_stats_commit_n = %d Kommittterens
+activity.git_stats_push_to_branch = to %s un
+activity.git_stats_push_to_all_branches = to all Twiegen schuven.
+activity.git_stats_on_default_branch = Up %s
+activity.git_stats_files_changed_n = ännert worden
+activity.git_stats_addition_n = %d neje Riegen
+activity.git_stats_addition_1 = %d neje Rieg
+activity.git_stats_and_deletions = un
+activity.git_stats_deletion_1 = %d lösket Rieg geven
+activity.commit = Kommitterens-Doon
+contributors.contribution_type.filter_label = Bidrag-Aard:
+contributors.contribution_type.additions = Neje Riegen
+settings = Instellens
+settings.options = Repositorium
+settings.collaboration = Mitarbeiders
+settings.collaboration.admin = Chef
+settings.collaboration.write = Schrieven
+settings.collaboration.read = Lesen
+settings.collaboration.owner = Eegner
+settings.hooks = Internett-Hakens
+settings.collaboration.undefined = Nich sett
+settings.githooks = Git-Hakens
+settings.basic_settings = Grund-Instellens
+settings.federation_not_enabled = Verdeeltheid is in diener Instanz utknipst.
+settings.mirror_settings.docs.disabled_push_mirror.instructions = Sett dien Repositorium, dat Kommitterens, Markens un Twiegen automatisk vun eenem anner Repositorium haalt worden.
+settings.mirror_settings.docs.disabled_push_mirror.pull_mirror_warning = Jüüst nu kann dat blots in de Menü »Nejer Umtreck« maakt worden. För mehr Informatioonen, bekiek bidde:
+settings.mirror_settings.docs.disabled_push_mirror.info = Schuuv-Spegels sünd vun dienem Sied-Chef utknipst worden.
+settings.mirror_settings.docs.no_new_mirrors = Dien Repositorium spegelt Ännerns to of vun eenem anner Repositorium. Bidde wees wiss, dat du jüüst nu keene nejen Spegels maken kannst.
+settings.mirror_settings.docs.can_still_use = Ok wenn du keene Spegels bewarken of neje maken kannst, düürst du diene bestahn Spegels wiederhen bruken.
+settings.mirror_settings.docs.pull_mirror_instructions = Um eenen Haal-Spegel intorichten, bekiek bidde:
+settings.mirror_settings.docs.more_information_if_disabled = Hier lehrst du mehr över Schuuv- un Haal-Spegels:
+settings.mirror_settings.docs.doc_link_title = Wo spegel ick Repositoriums?
+settings.mirror_settings.mirrored_repository = Spegelt Repositorium
+settings.mirror_settings.direction = Richtung
+settings.mirror_settings.direction.pull = Halen
+settings.mirror_settings.direction.push = Schuven
+settings.mirror_settings.last_update = Tolest verneeit
+settings.mirror_settings.push_mirror.edit_sync_time = Spegelns-Tied-Ofstand bewarken
+settings.mirror_settings.push_mirror.none_ssh = Nix
+settings.units.overview = Översicht
+settings.mirror_settings.push_mirror.copy_public_key = Publiken Slötel koperen
+settings.pull_mirror_sync_in_progress = Haalt jüüst Ännerns vun de feernen Stee %s.
+settings.pull_mirror_sync_quota_exceeded = Quote överweggahn, haalt keene Ännerns.
+settings.site = Internett-Sied
+settings.update_settings = Instellens sekern
+settings.branches.update_default_branch = Höövd-Twieg vernejen
+settings.branches.add_new_rule = Neje Örder hentofögen
+settings.advanced_settings = Mehr Instellens
+settings.use_internal_wiki = Inbaut Wiki bruken
+settings.external_wiki_url = URL vum frömden Wiki
+settings.use_internal_issue_tracker = Inbaut Gefall-Verfolger bruken
+settings.external_tracker_url = URL vum frömden Gefall-Verfolger
+settings.tracker_url_format = URL-Formaat vum frömden Gefall-Verfolger
+settings.tracker_url_format_error = Dat URL-Formaat vum frömden Gefall-Verfolger is keene gültige URL.
+settings.tracker_issue_style.numeric = Numerisk
+settings.tracker_issue_style.regexp = Regel-Utdruck
+settings.tracker_issue_style.regexp_pattern = Regel-Utdruck-Muster
+settings.enable_timetracker = Tied-Erfaten anknipsen
+settings.allow_only_contributors_to_track_time = Blots Bidragers Tied erfaten laten
+settings.pulls_desc = Haalvörslagen im Repositorium anknipsen
+settings.pulls.ignore_whitespace = Leegtekens för Unverdragelkheidens minnachten
+settings.pulls.allow_rebase_update = Verlöven, Haalvörslag-Twieg dör Umbaseren to vernejen
+settings.pulls.default_delete_branch_after_merge = Haalvörslag-Twieg na de Tosamenföhren automatisk lösken
+settings.pulls.default_allow_edits_from_maintainers = Bewarkens vun Liddmaten normaal verlöven
+settings.releases_desc = Repositorium-Publizerens anknipsen
+settings.packages_desc = Repositorium-Paketlist anknipsen
+settings.projects_desc = Repositorium-Projekten anknipsen
+settings.admin_settings = Chef-Instellens
+settings.admin_code_indexer = Quelltext-Indizerer
+settings.admin_stats_indexer = Quelltext-Statistiken-Indizerer
+settings.admin_indexer_commit_sha = Tolest indizeert Kommitteren
+settings.admin_indexer_unindexed = Nich indizeert
+settings.reindex_requested = Nejes Indizeren vörmarkt
+settings.reindex_button = Tum Neeiindizeren vörmarken
+settings.danger_zone = Gefahren-Zoon
+settings.convert_succeed = De Spegel is in een normaales Repositorium umwannelt worden.
+settings.convert_fork = To normaalem Repositorium umwanneln
+settings.convert_fork_desc = Du kannst deese Gabel in een normaales Repositorium umwanneln. Dat kann nich torüggnohmen worden.
+settings.convert_fork_confirm = Repositorium umwanneln
+settings.convert_fork_succeed = De Gabel is in een normaales Repositorium umwannelt worden.
+settings.transfer.title = Eegnerskupp överdragen
+settings.transfer.button = Eegnerskupp överdragen
+settings.transfer.modal.title = Eegnerskupp överdragen
+settings.transfer.rejected = Repositoriums-Överdragen is oflehnt worden.
+settings.transfer.success = Repositoriums-Överdragen is ofsluten.
+settings.transfer_abort = Överdragen ofbreken
+settings.transfer_abort_invalid = Du kannst een Repositoriums-Överdragen, wat dat nich gifft, nich ofbreken.
+settings.confirmation_string = Utwiesens-Text
+settings.transfer_in_progress = Een Överdraag löppt al. Bidde breck dat eerst of, wenn du deeses Repositorium to een anner Bruker överdragen willst.
+settings.transfer_perform = Överdragen dörföhren
+settings.transfer_succeed = Dat Repositorium is överdragen worden.
+settings.transfer_quota_exceeded = De neje Eegner (%s) is över de Quote. Dat Repositorium is nich överdragen worden.
+milestones.filter_sort.earliest_due_data = Nahst Anstahns-Datum
+milestones.filter_sort.least_issues = Minnst Gefallens
+wiki.wiki_page_revisions = Sied-Versionen
+activity.period.yearly = 1 Jahr
+activity.title.issues_1 = %s Gefall
+activity.git_stats_files_changed_1 = ännert worden
+activity.git_stats_deletion_n = %d lösket Riegen geven
+contributors.contribution_type.deletions = Lösket Riegen
+settings.federation_following_repos = URLs vun Nagahns-Repositoriums. Trennt mit »;«, keene Leegtekens.
+settings.mirror_settings.docs = Sett dien Repositorium, dat Kommitterens, Markens un Twiegen automatisk mit eenem anner Repositorium spegelt worden.
+settings.mirror_settings.push_mirror.add = Schuuv-Spegel hentofögen
+settings.units.add_more = Mehr anknipsen
+settings.branches.switch_default_branch = Höövd-Twieg ännern
+settings.use_external_wiki = Frömdes Wiki bruken
+settings.external_tracker_url_error = De URL vum frömden Gefall-Verfolger is keene gültige URL.
+settings.actions_desc = Integreerte CI-/CD-Affolgens mit Forgejo-Aktioonen anknipsen
+settings.convert_notices_1 = Dat wannelt deesen Spegel in een normaales Repositorium um un kann nich torüggnohmen worden.
+settings.convert_confirm = Repositorium umwanneln
+signing.wont_sign.parentsigned = Deeses Kommitteren word nich unnerschrieven, denn dat Ollern-Kommitteren is nich unnerschreven.
+wiki.page_already_exists = Eene Wiki-Sied mit de sülven Naam gifft dat al.
+activity.period.weekly = 1 Week
+activity.period.monthly = 1 Maant
+activity.closed_issues_count_n = Dichtmaakt Gefallens
+settings.desc = Unner »Instellens« kannst du de Instellens för dat Repositorium verwalten
+settings.federation_apapiurl = Verdeeltheids-URL vun deesem Repositorium. Kopeer un föög dat in de Verdeeltheids-Instellens vun eenem anner Repositorium as eene URL vun eenem Nagahns-Repositorium in.
+settings.mirror_settings.docs.doc_link_pull_section = de Deel »Vun eenem feernen Repositorium halen« in de Dokumenteren.
+settings.mirror_settings.pushed_repository = Schuuvt Repositorium
+settings.units.units = Eenheiden
+settings.wiki_globally_editable = Elkeenwell verlöven, dat Wiki to bewarken
+settings.tracker_issue_style.regexp_pattern_desc = De eerste Fangens-Grupp word in Stee vun {index} bruukt.
+settings.convert = To normaalem Repositorium umwanneln
+settings.convert_desc = Du kannst deesen Spegel in een normaales Repositorium umwanneln. Dat kann nich torüggnohmen worden.
+settings.transfer_abort_success = Dat Repositoriums-Överdragen na %s is ofbroken worden.
+signing.wont_sign.error = Bi’m Nakieken, of dat Kommitteren unnerschrieven worden kann, hett dat eenen Fehler geven.
+signing.wont_sign.pubkey = Deeses Kommitteren word nich unnerschrieven, denn du hest in dienem Konto keenen publiken Slötel angeven.
+activity.active_prs_count_n = %d aktiiv Haalvörslagen
+activity.merged_prs_count_n = Tosamenföhrt Haalvörslagen
+activity.title.user_1 = %d Bruker
+activity.title.prs_1 = %d Haalvörslag
+activity.active_issues_count_n = %d aktiiv Gefallens
+activity.title.issues_n = %s Gefallens
+activity.title.unresolved_conv_n = %d nich lööst Snacks
+activity.title.releases_1 = %d Publizeren
+activity.git_stats_file_1 = is %d Datei
+contributors.contribution_type.commits = Kommitterens
+settings.mirror_settings = Spegel-Instellens
+settings.federation_settings = Verdeeltheid-Instellens
+settings.mirror_settings.docs.disabled_pull_mirror.instructions = Sett dien Repositorium, dat Kommitterens, Markens un Twiegen automatisk to eenem anner Repositorium schuuvt worden. Haal-Spegels sünd vun dienem Sied-Chef utknipst worden.
+settings.mirror_settings.docs.pulling_remote_title = Vun eenem feernen Repositorium halen
+settings.sync_mirror = Nu spegeln
+settings.update_mirror_settings = Spegel-Instellens vernejen
+activity.git_stats_additions = un dat hett
+settings.mirror_settings.push_mirror.none = Keene Schuuv-Spegels inricht
+settings.mirror_settings.push_mirror.remote_url = Feerne Git-Repositoriums-URL
+settings.wiki_desc = Repositoriums-Wiki anknipsen
+settings.external_wiki_url_error = De URL vum frömden Wiki is keene gültige URL.
+settings.use_external_issue_tracker = Frömden Gefall-Verfolger bruken
+wiki.welcome_desc = Dat Wiki lett di Dokumenterens mit Mitarbeiders schrieven un delen.
+wiki.page_name_desc = Giff eenen Naam för deese Wiki-Sied in. Eenige besünnere Namens sünd: »Home«, »_Sidebar« un »_Footer«.
+activity.period.quarterly = 3 Maanten
+activity.period.semiyearly = 6 Maanten
+activity.opened_prs_count_n = Neje Haalvörslagen
+settings.tracker_issue_style.alphanumeric = Alphanumerisk
+settings.transfer_owner = Nejer Eegner
+activity.title.releases_n = %d Publizerens
+activity.title.releases_published_by = %s vun %s publizeert
+activity.published_prerelease_label = Vör-Publizeren
+activity.git_stats_file_n = sünd %d Dateien
+settings.push_mirror_sync_in_progress = Schuuvt jüüst Ännerns to de feernen Stee %s.
+settings.pulls.enable_autodetect_manual_merge = Tosamenföhren vun Hand automatisk erkennen (Wahrschau: In eenigen besünneren Fallen kann dat falsk oordelen)
+settings.convert_fork_notices_1 = Dat wannelt deese Gabel in een normaales Repositorium um un kann nich torüggnohmen worden.
+settings.enter_repo_name = Giff de Eegner un Repositoriums-Naam jüüst so in, as se wiesen worden:
+settings.transfer_notices_2 = - Du hest wiederhen Togriep up dat Repositorium, wenn du dat to eener Verenigung överdraggst, waar du een Eegner büst.
+settings.transfer_started = Deeses Repositorium is tum Överdragen vörmarkt worden un wacht up Verlööv vun »%s«
+settings.external_wiki_url_desc = Besökers worden to de URL vum frömden Wiki umleit, wenn se up de Wiki-Karteikaart klicken.
+settings.issues_desc = Repositoriums-Gefall-Verfolger anknipsen
+settings.external_tracker_url_desc = Besökers worden to de URL vum frömden Gefall-Verfolger umleit, wenn se up de Gefallens-Karteikaart klicken.
+settings.tracker_issue_style = Tahlen-Formaat vum frömden Gefall-Verfolger
+settings.tracker_url_format_desc = Bruuk de Utdruckens {user}, {repo} un {index} för de Brukernaam, Repositoriums-Naam un Gefall-Tahl.
+settings.admin_enable_health_check = Repositorium-Gesundheids-Överprüfens anknipsen (git fsck)
+settings.admin_enable_close_issues_via_commit_in_any_branch = Een Gefall över een Kommitteren sluten, wat in eenem nich-Höövd-Twieg maakt worden is
+settings.new_owner_has_same_repo = De neje Eegner hett al een Repositorium mit de sülven Naam. Bidde köör een anner Naam ut.
+settings.new_owner_blocked_doer = De neje Eegner hett di blockeert.
+settings.transfer_desc = Överdraag deeses Repositorium to eenem Bruker of eener Verenigung, waar du Chef-Rechtens hest.
+settings.transfer_notices_1 = - Du hest keen Togriep mehr up dat Repositorium, wenn du dat to eenem enkelt Bruker överdraggst.
+settings.transfer_notices_3 = - Wenn dat Repositorium privaat is un to eenem enkelt Bruker överdragen word, passt deese Aktioon up, dat de Bruker tominnst Lesen-Togriep hett (un ännert de Rechtens as nödig).
\ No newline at end of file
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
index 354ad5074f..ab595813c1 100644
--- a/options/locale/locale_nl-NL.ini
+++ b/options/locale/locale_nl-NL.ini
@@ -1039,7 +1039,7 @@ additional_repo_units_hint = Stel voor om extra repositorie units in te schakele
 update_hints = Tips bijwerken
 update_hints_success = Tips zijn bijgewerkt.
 hints = Tips
-additional_repo_units_hint_description = Toon een "Voeg meer eenheden toe..." knop voor repositories die niet alle beschikbare eenheden hebben ingeschakeld.
+additional_repo_units_hint_description = Toon een “Meer activeren” hint voor repositories die niet alle beschikbare eenheden hebben ingeschakeld.
 pronouns = Persoonlijke voornaamwoord
 pronouns_custom = Aangepast
 pronouns_unspecified = Ongedefinieerd
@@ -2708,13 +2708,13 @@ settings.mirror_settings.docs.pull_mirror_instructions = Raadpleeg voor het inst
 settings.mirror_settings.docs.more_information_if_disabled = Hier vindt u meer informatie over duw- en pull mirrors:
 settings.mirror_settings.docs.pulling_remote_title = Pullen uit een externe repository
 settings.mirror_settings.pushed_repository = Gepusht repository
-settings.units.units = Repository-eenheden
+settings.units.units = Eenheden
 settings.mirror_settings.push_mirror.remote_url = Git externe repository URL
 settings.units.overview = Overzicht
 settings.mirror_settings.push_mirror.edit_sync_time = Synchronisatie-interval van mirror bewerken
 settings.push_mirror_sync_in_progress = Wijzigingen worden momenteel naar de externe %s gepusht.
 settings.pull_mirror_sync_in_progress = Haalt momenteel wijzigingen op van de externe %s.
-settings.units.add_more = Meer toevoegen...
+settings.units.add_more = Meer activeren
 settings.update_mirror_settings = Mirrorinstellingen bijwerken
 settings.branches.switch_default_branch = Wissel standaard branch
 settings.branches.add_new_rule = Voeg nieuwe regel toe
@@ -2822,6 +2822,9 @@ mirror_public_key = Publieke SSH-sleutel
 mirror_use_ssh.helper = Forgejo zal deze repository mirroren via Git over SSH en een sleutelpaar voor je aanmaken als je deze optie selecteert. Je moet ervoor zorgen dat de gegenereerde publieke sleutel geautoriseerd is om naar het doel-repository te pushen. Je kunt geen wachtwoord-gebaseerde autorisatie gebruiken als je dit selecteert.
 settings.mirror_settings.push_mirror.none_ssh = Geen
 mirror_use_ssh.not_available = SSH-authenticatie is niet beschikbaar.
+issues.new.assign_to_me = Aan mij toewijzen
+issues.all_title = Alles
+settings.discord_icon_url.exceeds_max_length = Icoon-URL moet 2048 tekens of minder zijn
 
 
 
@@ -3184,7 +3187,7 @@ auths.tip.github=Registreer een nieuwe OAuth toepassing op %s
 auths.tip.gitlab=Registreer een nieuwe applicatie op https://gitlab.com/profile/applicaties
 auths.tip.google_plus=Verkrijg OAuth2 client referenties van de Google API console op %s
 auths.tip.openid_connect=Gebruik de OpenID Connect Discovery URL (/.well-known/openid-configuration) om de eindpunten op te geven
-auths.tip.yandex=`Maak een nieuwe applicatie aan op %s. Selecteer de volgende machtigingen van de "Yandex". assport API sectie: "Toegang tot e-mailadres", "Toegang tot avatar" en "Toegang tot gebruikersnaam, voornaam en achternaam, geslacht"`
+auths.tip.yandex=Maak een nieuwe toepassing op %s. Selecteer de volgende rechten in het gedeelte “Yandex.Passport API”: “Toegang tot e-mailadres”, ‘Toegang tot gebruikersavatar’ en ‘Toegang tot gebruikersnaam, voor- en achternaam, geslacht’
 auths.edit=Authenticatiebron bewerken
 auths.activated=Deze authenticatiebron is geactiveerd
 auths.update_success=De authenticatie-bron is bijgewerkt.
@@ -3405,10 +3408,10 @@ auths.oauth2_required_claim_value_helper = Stel deze waarde in om het aanmelden
 users.remote = Externe
 users.list_status_filter.not_2fa_enabled = 2FA uitgeschakeld
 users.reserved = Gereserveerd
-defaulthooks.desc = Webhooks doen automatisch HTTP POST verzoeken naar een server wanneer bepaalde Forgejo gebeurtenissen zich voordoen. Webhooks die hier gedefinieerd zijn, zijn standaard en worden gekopieerd naar alle nieuwe repositories.. Lees meer in de webhooks gids.
+defaulthooks.desc = Webhooks doen automatisch HTTP POST verzoeken naar een server wanneer bepaalde Forgejo gebeurtenissen zich voordoen. Webhooks defined here are defaults and will be copied into all new repositories. Read more in the webhooks guide.
 auths.verify_group_membership = Controleer het groepslidmaatschap in LDAP (laat het filter leeg om over te slaan)
 dashboard.rebuild_issue_indexer = Herbouw issue indexer
-systemhooks.desc = Webhooks doen automatisch HTTP POST verzoeken naar een server wanneer bepaalde Forgejo gebeurtenissen zich voordoen. Webhooks die hier gedefinieerd zijn, werken op alle repositories op het systeem, dus houd rekening met mogelijke gevolgen voor de prestaties. Lees meer in de webhooks gids.
+systemhooks.desc = Webhooks doen automatisch HTTP POST verzoeken naar een server wanneer bepaalde Forgejo gebeurtenissen zich voordoen. Webhooks die hier gedefinieerd zijn, werken op alle repositories op het systeem, dus houd rekening met mogelijke gevolgen voor de prestaties. Lees meer in de webhooks guide.
 hooks = Webhooks
 integrations = Integraties
 dashboard.new_version_hint = Forgejo %s is nu beschikbaar, u gebruikt versie %s. Zie de blog voor meer details.
@@ -3456,7 +3459,7 @@ auths.oauth2_icon_url = Pictogram URL
 auths.pam_email_domain = PAM e-maildomein (optioneel)
 auths.tip.gitea = Registreer een nieuwe OAuth2-toepassing. De handleiding is te vinden op %s
 auths.tip.discord = Registreer een nieuwe toepassing op %s
-auths.tip.bitbucket = Registreer een nieuwe OAuth consumer op %s
+auths.tip.bitbucket = Registreer een nieuwe OAuth consumer op %s en voeg de rechten “Account” - “Read” toe
 auths.tips.oauth2.general.tip = Bij het registreren van een nieuwe OAuth2-authenticatie moet de callback/redirect URL zijn:
 config.ssh_domain = SSH-server domein
 auths.login_source_of_type_exist = Er bestaat al een authenticatiebron van dit type.
@@ -3863,7 +3866,7 @@ runs.actors_no_select = Alle acteurs
 runs.status_no_select = Alle statussen
 runs.no_results = Geen resultaten gevonden.
 runs.no_workflows = Er zijn nog geen workflows.
-unit.desc = Beheer geïntegreerde CI/CD-pijplijnen met Forgejo Actions
+unit.desc = Beheer geïntegreerde CI/CD-pijplijnen met Forgejo Actions.
 runs.no_workflows.documentation = Voor meer informatie over Forgejo acties, zie de documentatie.
 workflow.disable_success = Workflow "%s" is succesvol uitgeschakeld.
 variables.none = Er zijn nog geen variabelen.
@@ -3967,4 +3970,19 @@ test = Oké
 [repo.permissions]
 code.write = Schrijven: Push naar de repositorie, maak branches en tags.
 code.read = Lezen: Toegang en clone de code van de repository.
-issues.read = Lezen: Lees en maak issues en commentaren.
\ No newline at end of file
+issues.read = Lezen: Lees en maak issues en commentaren.
+pulls.read = Lezen: Lezen en pull requests maken.
+releases.read = Lezen: Bekijk en download releases.
+ext_issues = Toegang tot de link naar een externe issue tracker. De rechten worden extern beheerd.
+ext_wiki = Toegang tot de link naar een externe wiki. De rechten worden extern beheerd.
+actions.write = Write: Handmatig starten, herstarten, annuleren of goedkeuren van hangende CI/CD-pijplijnen.
+pulls.write = Schrijven: Sluit pull requests af en beheer metadata zoals labels, mijlpalen, verantwoordelijken, vervaldatums en afhankelijkheden.
+releases.write = Schrijven: Publiceren, bewerken en verwijderen van releases en hun assets.
+wiki.read = Lezen: Lees de geïntegreerde wiki en zijn geschiedenis.
+wiki.write = Schrijven: Pagina's maken, bijwerken en verwijderen in de geïntegreerde wiki.
+projects.read = Lezen: Toegang tot projectboards van repository's.
+projects.write = Schrijven: Projecten en kolommen maken en bewerken.
+packages.read = Lezen: Bekijk en download pakketten die aan de repository is toegewezen.
+packages.write = Schrijven: Publiceer en verwijder pakketten die aan de repository is toegewezen.
+actions.read = Lezen: Bekijk geïntegreerde CI/CD-pijplijnen en hun logboeken.
+issues.write = Schrijven: Sluit issues af en beheer metadata zoals labels, mijlpalen, verantwoordelijken, vervaldatums en afhankelijkheden.
\ No newline at end of file
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
index 1769447a3e..4f21d812da 100644
--- a/options/locale/locale_pt-BR.ini
+++ b/options/locale/locale_pt-BR.ini
@@ -1040,7 +1040,7 @@ pronouns_custom = Personalizado
 pronouns_unspecified = Não especificado
 language.title = Idioma padrão
 additional_repo_units_hint = Sugira habilitar unidades de repositório adicionais
-additional_repo_units_hint_description = Exiba um botão "Adicionar mais unidades..." para repositórios que não possuem todas as unidades disponíveis habilitadas.
+additional_repo_units_hint_description = Exibir uma sugestão para "Habilitar mais" em repositórios que não possuem todas as unidades disponíveis habilitadas.
 update_hints = Dicas de atualização
 update_hints_success = As dicas foram atualizadas.
 keep_activity_private.description = A sua atividade pública estará visível apenas para si e para os administradores do servidor.
@@ -1328,11 +1328,11 @@ editor.delete_this_file=Excluir arquivo
 editor.must_have_write_access=Você deve ter permissão de escrita para fazer ou propor alterações neste arquivo.
 editor.file_delete_success=O arquivo "%s" foi excluído.
 editor.name_your_file=Nomeie o seu arquivo…
-editor.filename_help=Adicione um diretório digitando seu nome seguido por uma barra ('/'). Remova um diretório digitando o backspace no início do campo de entrada.
+editor.filename_help=Adicione um diretório digitando o nome seguido por uma barra ("/"). Remova um diretório pressionando apagar no início do campo de entrada.
 editor.or=ou
 editor.cancel_lower=Cancelar
-editor.commit_signed_changes=Commit de alteradores assinadas
-editor.commit_changes=Aplicar commit das alterações
+editor.commit_signed_changes=Criar commit das modificações assinadas
+editor.commit_changes=Criar commit das modificações
 editor.add_tmpl=Adicionar ""
 editor.add=Adicionar %s
 editor.update=Atualizar %s
@@ -1340,7 +1340,7 @@ editor.delete=Excluir %s
 editor.patch=Aplicar correção
 editor.patching=Corrigindo:
 editor.fail_to_apply_patch=`Não foi possível aplicar a correção "%s"`
-editor.new_patch=Nova correção
+editor.new_patch=Novo patch
 editor.commit_message_desc=Adicione uma descrição detalhada (opcional)...
 editor.signoff_desc=Adicione um assinado-por-committer no final do log do commit.
 editor.commit_directly_to_this_branch=Commit diretamente no branch %s.
@@ -1359,7 +1359,7 @@ editor.file_is_a_symlink=`"%s" é um link simbólico. Links simbólicos não pod
 editor.filename_is_a_directory=O nome do arquivo "%s" já é usado como um nome de diretório neste repositório.
 editor.file_editing_no_longer_exists=O arquivo que está sendo editado, "%s", não existe mais neste repositório.
 editor.file_deleting_no_longer_exists=O arquivo a ser excluído, "%s", não existe mais neste repositório.
-editor.file_changed_while_editing=O conteúdo do arquivo mudou desde que você começou a editar. Clique aqui para ver o que foi editado ou clique em Aplicar commit das alterações novamemente para sobreescrever estas alterações.
+editor.file_changed_while_editing=O conteúdo do arquivo mudou desde que você começou a editar. Clique aqui para ver as diferenças ou clique em Aplicar commit das alterações novamente para sobrescrever as alterações com sua versão atual.
 editor.file_already_exists=Um arquivo com nome "%s" já existe neste repositório.
 editor.commit_empty_file_header=Fazer commit de um arquivo vazio
 editor.commit_empty_file_text=O arquivo que você está prestes fazer commit está vazio. Continuar?
@@ -1447,7 +1447,7 @@ projects.column.set_default_desc=Definir esta coluna como padrão para pull e is
 projects.column.unset_default=Desatribuir padrão
 projects.column.unset_default_desc=Desatribuir esta coluna como padrão
 projects.column.delete=Excluir coluna
-projects.column.deletion_desc=Excluir uma coluna do projeto move todas as issues relacionadas para 'Sem categoria'. Continuar?
+projects.column.deletion_desc=Excluir uma coluna do projeto move todos os issues relacionados para a coluna padrão. Continuar?
 projects.column.color=Cor
 projects.open=Abrir
 projects.close=Fechar
@@ -1462,7 +1462,7 @@ issues.filter_milestones=Filtrar Marco
 issues.filter_projects=Filtrar Projeto
 issues.filter_labels=Filtrar Rótulo
 issues.filter_reviewers=Filtrar Revisor
-issues.new=Nova issue
+issues.new=Novo issue
 issues.new.title_empty=Título não pode ser em branco
 issues.new.labels=Etiquetas
 issues.new.no_label=Nenhum rótulo
@@ -1480,7 +1480,7 @@ issues.new.open_milestone=Marcos abertos
 issues.new.closed_milestone=Marcos fechados
 issues.new.assignees=Responsáveis
 issues.new.clear_assignees=Limpar responsáveis
-issues.new.no_assignees=Sem responsável
+issues.new.no_assignees=Sem responsáveis
 issues.new.no_reviewers=Sem revisor
 issues.choose.get_started=Primeiros passos
 issues.choose.open_external_link=Abrir
@@ -1494,10 +1494,10 @@ issues.new_label=Novo rótulo
 issues.new_label_placeholder=Nome da etiqueta
 issues.new_label_desc_placeholder=Descrição
 issues.create_label=Criar rótulo
-issues.label_templates.title=Carregue um conjunto de etiquetas pré-definidas
-issues.label_templates.info=Ainda não existem etiquetas. Crie uma etiqueta em 'Nova etiqueta' ou use um conjunto de etiquetas predefinida:
-issues.label_templates.helper=Selecione um conjunto de etiquetas
-issues.label_templates.use=Use o conjunto de etiquetas
+issues.label_templates.title=Carregue um modelo de etiquetas
+issues.label_templates.info=Ainda não existem etiquetas. Crie uma etiqueta em "Nova etiqueta" ou use um modelo etiquetas:
+issues.label_templates.helper=Selecione uma predefinição de etiqueta
+issues.label_templates.use=Use predefinição de etiqueta
 issues.label_templates.fail_to_load_file=Falha ao carregar o modelo de etiquetas "%s": %v
 issues.add_label=adicionou o rótulo %s %s
 issues.add_labels=adicionou os rótulos %s %s
@@ -1601,8 +1601,8 @@ issues.reopened_at=`reabriu esta issue %[2]s`
 issues.commit_ref_at=`citou esta issue em um commit %[2]s`
 issues.ref_issue_from=`referenciado esta issue %[4]s %[2]s`
 issues.ref_pull_from=`referenciado este pull request %[4]s %[2]s`
-issues.ref_closing_from=`referenciado um pull request %[4]s que fechará esta issue %[2]s`
-issues.ref_reopening_from=`referenciado um pull request %[4]s que reabrirá esta issue %[2]s`
+issues.ref_closing_from=`referenciado esta issue de um pull request %[4]s que a fechará %[2]s`
+issues.ref_reopening_from=`referenciado esta issue de um pull request %[4]s que a reabrirá %[2]s`
 issues.ref_closed_from=`fechou esta issue %[4]s %[2]s`
 issues.ref_reopened_from=`reabriu esta issue %[4]s %[2]s`
 issues.ref_from=`de %[1]s`
@@ -1709,13 +1709,13 @@ issues.due_date_added=adicionou a data limite %s %s
 issues.due_date_modified=modificou a data limite de %[2]s para %[1]s %[3]s
 issues.due_date_remove=removeu a data limite %s %s
 issues.due_date_overdue=Em atraso
-issues.due_date_invalid=A data limite é inválida ou está fora do intervalo. Por favor, use o formato 'dd/mm/aaaa'.
+issues.due_date_invalid=A data limite é inválida ou está fora do intervalo permitido. Por favor, use o formato "yyyy-mm-dd".
 issues.dependency.title=Dependências
 issues.dependency.issue_no_dependencies=Não há dependências definidas.
 issues.dependency.pr_no_dependencies=Não há dependências definidas.
-issues.dependency.no_permission_1=Você não tem permissão para ler %d dependência
-issues.dependency.no_permission_n=Você não tem permissão para ler %d dependências
-issues.dependency.no_permission.can_remove=Você não tem permissão para ler esta dependência, mas pode remover esta dependência
+issues.dependency.no_permission_1=Você não tem permissão para ler a dependência %d
+issues.dependency.no_permission_n=Você não tem permissão para ler as dependências %d
+issues.dependency.no_permission.can_remove=Você não tem permissão para ler esta dependência, mas pode removê-la
 issues.dependency.add=Adicionar dependência…
 issues.dependency.cancel=Cancelar
 issues.dependency.remove=Remover
@@ -1727,7 +1727,7 @@ issues.dependency.issue_closing_blockedby=Fechamento desta issue está bloqueado
 issues.dependency.issue_close_blocks=Esta issue bloqueia o fechamento das seguintes issues
 issues.dependency.pr_close_blocks=Este pull request bloqueia o fechamento das seguintes issues
 issues.dependency.issue_close_blocked=Você precisa fechar todas as issues que bloqueiam esta issue antes de poder fechá-la.
-issues.dependency.issue_batch_close_blocked=Não é possível fechar as issues que você escolheu, porque a issue #%d ainda tem dependências abertas
+issues.dependency.issue_batch_close_blocked=Não é possível fechar as issues que você escolheu porque a issue #%d ainda tem dependências abertas
 issues.dependency.pr_close_blocked=Você precisa fechar todas issues que bloqueiam este pull request antes de poder fazer o merge.
 issues.dependency.blocks_short=Bloqueia
 issues.dependency.blocked_by_short=Depende de
@@ -1784,7 +1784,7 @@ compare.compare_head=comparar
 
 pulls.desc=Habilitar pull requests e revisões de código.
 pulls.new=Novo pull request
-pulls.view=Ver Pull Request
+pulls.view=Ver pull request
 pulls.compare_changes=Novo pull request
 pulls.allow_edits_from_maintainers=Permitir edições de mantenedores
 pulls.allow_edits_from_maintainers_desc=Usuários com acesso de gravação para o branch base também podem fazer push para este branch
@@ -1833,15 +1833,15 @@ pulls.add_prefix=Adicione o prefixo %s
 pulls.remove_prefix=Remover o prefixo %s
 pulls.data_broken=Este pull request está quebrado devido a falta de informação do fork.
 pulls.files_conflicted=Este pull request tem alterações conflitantes com o branch de destino.
-pulls.is_checking=Verificação de conflitos do merge está em andamento. Tente novamente em alguns momentos.
+pulls.is_checking=Verificação de conflitos de merge está em andamento. Tente novamente em alguns momentos.
 pulls.is_ancestor=Este branch já está incluído no branch de destino. Não há nada para mesclar.
-pulls.is_empty=As alterações neste branch já estão na branch de destino. Este será um commit vazio.
+pulls.is_empty=As alterações neste branch já estão no branch de destino. Este será um commit vazio.
 pulls.required_status_check_failed=Algumas verificações necessárias não foram bem sucedidas.
 pulls.required_status_check_missing=Estão faltando algumas verificações necessárias.
 pulls.required_status_check_administrator=Como administrador, você ainda pode aplicar o merge deste pull request.
 pulls.blocked_by_approvals=Este pull request ainda não tem aprovações suficientes. %d de %d aprovações concedidas.
 pulls.blocked_by_rejection=Este pull request tem alterações solicitadas por um revisor oficial.
-pulls.blocked_by_official_review_requests=Este pull request tem solicitações de revisão oficiais.
+pulls.blocked_by_official_review_requests=Este pull request está bloqueado porque falta aprovação de um ou mais revisores oficiais.
 pulls.blocked_by_outdated_branch=Este pull request está bloqueado porque está desatualizado.
 pulls.blocked_by_changed_protected_files_1=Este pull request está bloqueado porque altera um arquivo protegido:
 pulls.blocked_by_changed_protected_files_n=Este pull request está bloqueado porque altera arquivos protegidos:
@@ -1875,13 +1875,13 @@ pulls.invalid_merge_option=Você não pode usar esta opção de merge neste pull
 pulls.merge_conflict=O merge falhou: Houve um conflito ao fazer merge. Dica: Tente uma estratégia diferente
 pulls.merge_conflict_summary=Mensagem de erro
 pulls.rebase_conflict=O merge falhou: Houve um conflito durante o rebase do commit %[1]s. Dica: Tente uma estratégia diferente
-pulls.rebase_conflict_summary=Mensagem de Erro
-pulls.unrelated_histories=Merge falhou: O merge do principal e da base não compartilham uma história comum. Dica: Tente uma estratégia diferente
-pulls.merge_out_of_date=Merge falhou: durante a geração do merge, a base não foi atualizada. Dica: Tente novamente.
+pulls.rebase_conflict_summary=Mensagem de erro
+pulls.unrelated_histories=Merge falhou: A head do merge e da base não compartilham um histórico comum. Dica: Tente uma estratégia diferente
+pulls.merge_out_of_date=Merge falhou: Durante a geração do merge, a base foi atualizada. Dica: Tente novamente.
 pulls.head_out_of_date=O merge falhou: Enquanto gerava o merge, a head foi atualizada. Dica: Tente novamente.
-pulls.push_rejected=O merge falhou: O push foi rejeitado. Revise os Git Hooks para este repositório.
+pulls.push_rejected=O merge falhou: O push foi rejeitado. Revise os hooks do Git para este repositório.
 pulls.push_rejected_summary=Mensagem completa da rejeição
-pulls.push_rejected_no_message=O merge falhou: O push foi rejeitado mas não houve mensagem remota.
Revise os Git Hooks para este repositório
+pulls.push_rejected_no_message=O push falhou: O push foi rejeitado mas não houve mensagem remota. Revise os hooks do Git para este repositório
 pulls.open_unmerged_pull_exists=`Não é possível executar uma operação de reabertura pois há um pull request pendente (#%d) com propriedades idênticas.`
 pulls.status_checking=Algumas verificações estão pendentes
 pulls.status_checks_success=Todas as verificações foram bem sucedidas
@@ -1933,7 +1933,7 @@ milestones.title=Título
 milestones.desc=Descrição
 milestones.due_date=Data limite (opcional)
 milestones.clear=Limpar
-milestones.invalid_due_date_format=Formato da data limite deve ser 'dd/mm/aaaa'.
+milestones.invalid_due_date_format=Formato da data limite deve ser "aaaa-mm-dd".
 milestones.create_success=O marco "%s" foi criado.
 milestones.edit=Editar marco
 milestones.edit_subheader=Marcos organizam as issues e acompanham o progresso.
@@ -1952,7 +1952,7 @@ milestones.filter_sort.least_issues=Com menos issues
 
 signing.will_sign=Esse commit será assinado com a chave "%s".
 signing.wont_sign.error=Ocorreu um erro ao verificar se o commit poderia ser assinado.
-signing.wont_sign.nokey=Não há nenhuma chave disponível para assinar esse commit.
+signing.wont_sign.nokey=Esta instância não tem uma chave para assinar esse commit.
 signing.wont_sign.never=Commits nunca são assinados.
 signing.wont_sign.always=Commits são sempre assinados.
 signing.wont_sign.pubkey=O commit não será assinado porque você não tem uma chave pública associada à sua conta.
@@ -1963,7 +1963,7 @@ signing.wont_sign.commitssigned=O merge não será assinado, pois todos os commi
 signing.wont_sign.approved=O merge não será assinado porque o PR não foi aprovado.
 signing.wont_sign.not_signed_in=Você não está conectado.
 
-ext_wiki=Acesso a Wiki Externo
+ext_wiki=Wiki Externa
 ext_wiki.desc=Link para uma wiki externa.
 
 wiki=Wiki
@@ -1982,7 +1982,7 @@ wiki.last_commit_info=%s editou esta página %s
 wiki.edit_page_button=Editar
 wiki.new_page_button=Nova página
 wiki.file_revision=Revisão de página
-wiki.wiki_page_revisions=Revisões de página Wiki
+wiki.wiki_page_revisions=Revisões da página
 wiki.back_to_wiki=Voltar para página Wiki
 wiki.delete_page_button=Excluir página
 wiki.delete_page_notice_1=A exclusão da página de wiki "%s" não pode ser desfeita. Continuar?
@@ -1990,7 +1990,7 @@ wiki.page_already_exists=Uma página de wiki com o mesmo nome já existe.
 wiki.reserved_page=O nome da página da wiki "%s" está reservado.
 wiki.pages=Páginas
 wiki.last_updated=Última atualização %s
-wiki.page_name_desc=Digite um nome para esta página Wiki. Alguns nomes especiais são: 'Home', '_Sidebar' e '_Footer'.
+wiki.page_name_desc=Digite um nome para esta página Wiki. Alguns nomes especiais são: "Home", "_Sidebar" e "_Footer".
 wiki.original_git_entry_tooltip=Ver o arquivo Git original em vez de usar o link amigável.
 
 activity=Atividade
@@ -2003,26 +2003,26 @@ activity.period.quarterly=3 meses
 activity.period.semiyearly=6 meses
 activity.period.yearly=1 ano
 activity.overview=Visão geral
-activity.active_prs_count_1=%d Pull request ativo
-activity.active_prs_count_n=%d Pull requests ativos
-activity.merged_prs_count_1=Pull request com merge aplicado
-activity.merged_prs_count_n=Pull requests com merge aplicado
+activity.active_prs_count_1=%d pull request ativo
+activity.active_prs_count_n=%d pull requests ativos
+activity.merged_prs_count_1=Pull request com merge concluído
+activity.merged_prs_count_n=Pull requests com merge concluído
 activity.opened_prs_count_1=Pull request proposto
 activity.opened_prs_count_n=Pull requests propostos
 activity.title.user_1=%d usuário
 activity.title.user_n=%d usuários
-activity.title.prs_1=%d Pull request
-activity.title.prs_n=%d Pull requests
+activity.title.prs_1=%d pull request
+activity.title.prs_n=%d pull requests
 activity.title.prs_merged_by=%s com merge aplicado por %s
 activity.title.prs_opened_by=%s proposto(s) por %s
 activity.merged_prs_label=Merge aplicado
 activity.opened_prs_label=Proposto
-activity.active_issues_count_1=%d Issue ativa
-activity.active_issues_count_n=%d Issues ativas
+activity.active_issues_count_1=%d issue ativa
+activity.active_issues_count_n=%d issues ativas
 activity.closed_issues_count_1=Issue fechada
 activity.closed_issues_count_n=Issues fechadas
-activity.title.issues_1=+%d Issue
-activity.title.issues_n=+%d Issues
+activity.title.issues_1=%d issue
+activity.title.issues_n=%d issues
 activity.title.issues_closed_from=%s fechada por %s
 activity.title.issues_created_by=%s criada por %s
 activity.closed_issue_label=Fechado
@@ -2033,10 +2033,10 @@ activity.title.unresolved_conv_1=%d conversa não resolvida
 activity.title.unresolved_conv_n=%d conversas não resolvidas
 activity.unresolved_conv_desc=Estas issues foram recentemente alteradas e pull requests ainda não foram resolvidos.
 activity.unresolved_conv_label=Aberta
-activity.title.releases_1=%d Versão
-activity.title.releases_n=%d Versões
+activity.title.releases_1=%d release
+activity.title.releases_n=%d releases
 activity.title.releases_published_by=%s publicada(s) por %s
-activity.published_release_label=Publicado
+activity.published_release_label=Release
 activity.no_git_activity=Não houve nenhuma atividade de commit neste período.
 activity.git_stats_exclude_merges=Excluindo merges,
 activity.git_stats_author_1=%d autor
@@ -2095,22 +2095,22 @@ settings.mirror_settings.direction.pull=Pull
 settings.mirror_settings.direction.push=Push
 settings.mirror_settings.last_update=Última atualização
 settings.mirror_settings.push_mirror.none=Nenhum espelhamento de push configurado
-settings.mirror_settings.push_mirror.remote_url=URL do repositório do Git remoto
-settings.mirror_settings.push_mirror.add=Adicionar Espelho de Push
+settings.mirror_settings.push_mirror.remote_url=URL do repositório Git remoto
+settings.mirror_settings.push_mirror.add=Adicionar espelho de push
 settings.mirror_settings.push_mirror.edit_sync_time=Editar intervalo de sincronização de espelhos
 
 settings.sync_mirror=Sincronizar agora
 settings.site=Site
-settings.update_settings=Atualizar configurações
-settings.update_mirror_settings=Atualizar espelho
-settings.branches.switch_default_branch=Alterar
-settings.branches.update_default_branch=Atualizar Branch Padrão
-settings.branches.add_new_rule=Adicionar Nova Regra
+settings.update_settings=Salvar configurações
+settings.update_mirror_settings=Atualizar configurações do espelho
+settings.branches.switch_default_branch=Alterar branch padrão
+settings.branches.update_default_branch=Atualizar branch padrão
+settings.branches.add_new_rule=Adicionar nova regra
 settings.advanced_settings=Configurações avançadas
 settings.wiki_desc=Habilitar a wiki do repositório
 settings.use_internal_wiki=Usar a wiki nativa
 settings.use_external_wiki=Usar wiki externa
-settings.external_wiki_url=URL externa da wiki
+settings.external_wiki_url=URL da wiki externa
 settings.external_wiki_url_error=A URL da wiki externa não é válida.
 settings.external_wiki_url_desc=Visitantes são redirecionados para a URL da wiki externa ao clicar na aba da wiki.
 settings.issues_desc=Habilitar issue tracker para o repositório
@@ -2128,35 +2128,35 @@ settings.tracker_issue_style.regexp=Expressão Regular
 settings.tracker_issue_style.regexp_pattern=Padrão de expressão regular
 settings.tracker_issue_style.regexp_pattern_desc=O primeiro grupo capturado será usado no lugar de {index}.
 settings.tracker_url_format_desc=Use os espaços reservados {user}, {repo} e {index} para o nome de usuário, nome do repositório e o índice de problemas.
-settings.enable_timetracker=Habilitar Cronômetro
-settings.allow_only_contributors_to_track_time=Permitir que apenas os colaboradores acompanhem o contador de tempo
+settings.enable_timetracker=Habilitar estatísticas de tempo
+settings.allow_only_contributors_to_track_time=Permitir que apenas os colaboradores usem estatísticas de tempo
 settings.pulls_desc=Habilitar pull requests no repositório
 settings.pulls.ignore_whitespace=Ignorar espaço em branco em conflitos
 settings.pulls.enable_autodetect_manual_merge=Habilitar a detecção automática de merge manual (Nota: Em alguns casos especiais, podem ocorrer julgamentos errados)
 settings.pulls.allow_rebase_update=Ativar atualização do branch do pull request por rebase
 settings.pulls.default_delete_branch_after_merge=Excluir o branch de pull request após o merge por padrão
 settings.pulls.default_allow_edits_from_maintainers=Permitir edições de mantenedores por padrão
-settings.releases_desc=Habilitar versões do Repositório
-settings.packages_desc=Habilitar Registro de Pacotes de Repositório
-settings.projects_desc=Habilitar Projetos do Repositório
-settings.actions_desc=Habilitar ações do repositório
-settings.admin_settings=Configurações do administrador
+settings.releases_desc=Habilitar releases no repositório
+settings.packages_desc=Habilitar registro de pacotes do repositório
+settings.projects_desc=Habilitar projetos do repositório
+settings.actions_desc=Habilitar pipelines integradas de CI/CD com Forgejo Actions
+settings.admin_settings=Configurações de administrador
 settings.admin_enable_health_check=Habilitar verificações de integridade (git fsck) no repositório
 settings.admin_code_indexer=Indexador de código
-settings.admin_stats_indexer=Indexador de Estatísticas do Código
-settings.admin_indexer_commit_sha=Último SHA indexado
+settings.admin_stats_indexer=Indexador de estatísticas de código
+settings.admin_indexer_commit_sha=Último commit indexado
 settings.admin_indexer_unindexed=Não indexado
 settings.reindex_button=Adicionar à fila de reindexação
-settings.reindex_requested=Reindexação requisitada
+settings.reindex_requested=Reindexação solicitada
 settings.admin_enable_close_issues_via_commit_in_any_branch=Fechar issue via commit em um branch não padrão
 settings.danger_zone=Zona de perigo
 settings.new_owner_has_same_repo=O novo proprietário já tem um repositório com o mesmo nome. Por favor, escolha outro nome.
-settings.convert=Converter para repositório tradicional
+settings.convert=Converter para repositório comum
 settings.convert_desc=Você pode converter este espelhamento em um repositório tradicional. Esta ação não pode ser revertida.
 settings.convert_notices_1=Esta operação vai converter este espelhamento em um repositório tradicional. Esta ação não pode ser desfeita.
-settings.convert_confirm=Converter o repositório
+settings.convert_confirm=Converter repositório
 settings.convert_succeed=O espelhamento foi convertido em um repositório tradicional.
-settings.convert_fork=Converter Para Um Repositório Normal
+settings.convert_fork=Converter para um repositório comum
 settings.convert_fork_desc=Você pode converter este fork em um repositório normal. Esta ação não pode ser desfeita.
 settings.convert_fork_notices_1=Esta operação irá converter o fork em um repositório normal e não pode ser desfeita.
 settings.convert_fork_confirm=Converter repositório
@@ -2173,12 +2173,12 @@ settings.transfer_notices_1=- Você perderá o acesso ao repositório se transfe
 settings.transfer_notices_2=- Você manterá acesso ao repositório se transferi-lo para uma organização que você também é proprietário.
 settings.transfer_notices_3=- Se o repositório for privado e for transferido para um usuário individual, esta ação certifica que o usuário tem pelo menos permissão de leitura (e altera as permissões se necessário).
 settings.transfer_owner=Novo proprietário
-settings.transfer_perform=Executar Transferência
+settings.transfer_perform=Executar transferência
 settings.transfer_started=`Este repositório foi marcado para transferência e aguarda a confirmação de "%s"`
 settings.transfer_succeed=O repositório foi transferido.
-settings.signing_settings=Configurações de Verificação de Assinatura
-settings.trust_model=Modelo de Confiança na Assinatura
-settings.trust_model.default=Modelo Padrão de Confiança
+settings.signing_settings=Configurações de verificação de assinatura
+settings.trust_model=Modelo de confiança para assinaturas
+settings.trust_model.default=Modelo padrão de confiança
 settings.trust_model.default.desc=Use o modelo de confiança de repositório padrão para esta instalação.
 settings.trust_model.collaborator=Colaborador
 settings.trust_model.collaborator.long=Colaborador: Confiar em assinaturas feitas por colaboradores
@@ -2215,7 +2215,7 @@ settings.org_not_allowed_to_be_collaborator=Organizações não podem ser adicio
 settings.change_team_access_not_allowed=Alteração do acesso da equipe para o repositório está restrito ao proprietário da organização
 settings.team_not_in_organization=A equipe não está na mesma organização que o repositório
 settings.teams=Equipes
-settings.add_team=Adicionar Equipe
+settings.add_team=Adicionar equipe
 settings.add_team_duplicate=A equipe já tem o repositório
 settings.add_team_success=A equipe agora tem acesso ao repositório.
 settings.search_team=Pesquisar Equipe…
@@ -2239,10 +2239,10 @@ settings.webhook.replay.description=Executar novamente esse webhook.
 settings.webhook.delivery.success=Um evento foi adicionado à fila de envio. Pode levar alguns segundos até que ele apareça no histórico de envio.
 settings.githooks_desc=Hooks do Git são executados pelo próprio Git. Você pode editar arquivos de hook abaixo para configurar operações personalizadas.
 settings.githook_edit_desc=Se o hook não estiver ativo, o conteúdo de exemplo será apresentado. Deixar o conteúdo em branco irá desabilitar esse hook.
-settings.githook_name=Nome do Hook
-settings.githook_content=Conteúdo do Hook
-settings.update_githook=Atualizar Hook
-settings.add_webhook_desc=Forgejo enviará requisições POST com um tipo de conteúdo especificado para a URL de destino. Leia mais no guia de webhooks.
+settings.githook_name=Nome do hook
+settings.githook_content=Conteúdo do hook
+settings.update_githook=Atualizar hook
+settings.add_webhook_desc=Forgejo enviará requisições POST com um Content-Type especificado para a URL de destino. Leia mais no guia de webhooks.
 settings.payload_url=URL de destino
 settings.http_method=Método HTTP
 settings.content_type=Tipo de conteúdo POST
@@ -2252,11 +2252,11 @@ settings.slack_icon_url=URL do ícone
 settings.slack_color=Cor
 settings.discord_username=Nome de usuário
 settings.discord_icon_url=URL do ícone
-settings.event_desc=Acionado em:
+settings.event_desc=Acionar em:
 settings.event_push_only=Eventos de push
 settings.event_send_everything=Todos os eventos
-settings.event_choose=Eventos personalizados...
-settings.event_header_repository=Eventos do Repositório
+settings.event_choose=Eventos personalizados…
+settings.event_header_repository=Eventos do repositório
 settings.event_create=Criar
 settings.event_create_desc=Branch ou tag criado.
 settings.event_delete=Excluir
@@ -2271,37 +2271,37 @@ settings.event_push=Push
 settings.event_push_desc=Git push para o repositório.
 settings.event_repository=Repositório
 settings.event_repository_desc=Repositório criado ou excluído.
-settings.event_header_issue=Eventos da Issue
-settings.event_issues=Issues
+settings.event_header_issue=Eventos de issues
+settings.event_issues=Modificação
 settings.event_issues_desc=Issue aberta, fechada, reaberta ou editada.
-settings.event_issue_assign=Issue Atribuída
+settings.event_issue_assign=Atribuição
 settings.event_issue_assign_desc=Issue atribuída ou não atribuída.
-settings.event_issue_label=Issue Rotulada
-settings.event_issue_label_desc=Rótulos da issue atualizados ou removidos.
-settings.event_issue_milestone=Marco Atribuído à Issue
-settings.event_issue_milestone_desc=Marco atribuído ou desatribuído à Issue.
-settings.event_issue_comment=Comentário da issue
+settings.event_issue_label=Rótulos
+settings.event_issue_label_desc=Rótulos da issue adicionados ou removidos.
+settings.event_issue_milestone=Marcos
+settings.event_issue_milestone_desc=Marco adicionado, removido ou modificado.
+settings.event_issue_comment=Comentários
 settings.event_issue_comment_desc=Comentário da issue criado, editado ou excluído.
-settings.event_header_pull_request=Eventos de Pull Request
-settings.event_pull_request=Pull request
+settings.event_header_pull_request=Eventos de pull request
+settings.event_pull_request=Modificação
 settings.event_pull_request_desc=Pull request aberto, fechado, reaberto ou editado.
-settings.event_pull_request_assign=Pull Request Atribuído
+settings.event_pull_request_assign=Atribuição
 settings.event_pull_request_assign_desc=Pull request atribuído ou desatribuído.
-settings.event_pull_request_label=Pull Request Rotulado
-settings.event_pull_request_label_desc=Rótulos do pull request atualizados ou limpos.
-settings.event_pull_request_milestone=Marco Atribuído ao Pull Request
-settings.event_pull_request_milestone_desc=Marco atribuído ou desatribuído ao pull request.
-settings.event_pull_request_comment=Comentário no Pull Request
+settings.event_pull_request_label=Rótulos
+settings.event_pull_request_label_desc=Rótulos do pull request adicionados ou removidos.
+settings.event_pull_request_milestone=Marcos
+settings.event_pull_request_milestone_desc=Marco adicionado, removido ou modificado.
+settings.event_pull_request_comment=Comentários
 settings.event_pull_request_comment_desc=Comentário criado, editado ou excluído no pull request.
-settings.event_pull_request_review=Pull Request Revisado
-settings.event_pull_request_review_desc=Pull request aprovado, rejeitado ou revisão comentada.
-settings.event_pull_request_sync=Pull Request Sincronizado
-settings.event_pull_request_sync_desc=Pull request sincronizado.
+settings.event_pull_request_review=Revisões
+settings.event_pull_request_review_desc=Pull request aprovado, rejeitado ou comentários de revisão adicionados.
+settings.event_pull_request_sync=Sincronizado
+settings.event_pull_request_sync_desc=Branch atualizado automaticamente com o branch alvo.
 settings.event_package=Pacote
 settings.event_package_desc=Pacote criado ou excluído em um repositório.
 settings.branch_filter=Filtro de branch
 settings.branch_filter_desc=Lista dos branches a serem considerados nos eventos push, criação de branch e exclusão de branch, especificados como padrão glob. Se estiver vazio ou for *, eventos para todos os branches serão relatados. Veja %[2]s documentação da sintaxe. Exemplos: master, {master,release*}.
-settings.authorization_header=Header de Autorização
+settings.authorization_header=Cabeçalho de autorização
 settings.authorization_header_desc=Será incluído como header de autorização para solicitações quando estiver presente. Exemplos: %s.
 settings.active=Ativo
 settings.active_helper=Informações sobre eventos disparados serão enviadas para esta URL do webhook.
@@ -2309,8 +2309,8 @@ settings.add_hook_success=O webhook foi adicionado.
 settings.update_webhook=Atualizar webhook
 settings.update_hook_success=O webhook foi atualizado.
 settings.delete_webhook=Remover webhook
-settings.recent_deliveries=Entregas Recentes
-settings.hook_type=Tipo de Hook
+settings.recent_deliveries=Entregas recentes
+settings.hook_type=Tipo de hook
 settings.slack_token=Token
 settings.slack_domain=Domínio
 settings.slack_channel=Canal
@@ -2332,8 +2332,8 @@ settings.web_hook_name_packagist=Packagist
 settings.packagist_username=Nome de usuário no Packagist
 settings.packagist_api_token=Token de API
 settings.packagist_package_url=URL do pacote do Packagist
-settings.deploy_keys=Chaves de Deploy
-settings.add_deploy_key=Nova chave
+settings.deploy_keys=Chaves de deploy
+settings.add_deploy_key=Adicionar chave de deploy
 settings.deploy_key_desc=As chaves de deploy possuem somente acesso de leitura (pull) ao repositório.
 settings.is_writable=Habilitar acesso de escrita
 settings.is_writable_info=Permitir que esta chave de deploy faça push para o repositório.
@@ -2346,13 +2346,13 @@ settings.deploy_key_deletion=Remover chave de deploy
 settings.deploy_key_deletion_desc=A exclusão de uma chave de deploy irá revogar o seu acesso a este repositório. Continuar?
 settings.deploy_key_deletion_success=A chave de deploy foi removida.
 settings.branches=Branches
-settings.protected_branch=Proteção de Branch
-settings.protected_branch.save_rule=Salvar Regra
-settings.protected_branch.delete_rule=Excluir Regra
+settings.protected_branch=Proteção de branch
+settings.protected_branch.save_rule=Salvar regra
+settings.protected_branch.delete_rule=Excluir regra
 settings.protected_branch_can_push=Permitir push?
 settings.protected_branch_can_push_yes=Você pode fazer push
 settings.protected_branch_can_push_no=Você não pode fazer push
-settings.branch_protection=Proteção de Branch para '%s'
+settings.branch_protection=Regras de proteção do branch "%s"
 settings.protect_this_branch=Habilitar Proteção de Branch
 settings.protect_this_branch_desc=Previne a exclusão e restringe o merge e push para o branch.
 settings.protect_disable_push=Desabilitar push
@@ -2360,42 +2360,42 @@ settings.protect_disable_push_desc=Nenhum push será permitido neste branch.
 settings.protect_enable_push=Habilitar push
 settings.protect_enable_push_desc=Qualquer pessoa com acesso de escrita terá permissão para realizar push neste branch (mas não forçar o push).
 settings.protect_enable_merge=Permitir merge
-settings.protect_whitelist_committers=Lista permitida para push
+settings.protect_whitelist_committers=Push restrito à lista de permissão
 settings.protect_whitelist_committers_desc=Somente usuários ou equipes da lista permitida serão autorizados realizar push neste branch (mas não forçar o push).
 settings.protect_whitelist_deploy_keys=Dar permissão às chaves de deploy com acesso de gravação para push.
-settings.protect_whitelist_users=Usuários com permissão para realizar push:
+settings.protect_whitelist_users=Usuários com permissão para realizar push
 settings.protect_whitelist_search_users=Pesquisar usuários...
-settings.protect_whitelist_teams=Equipes com permissão para realizar push:
+settings.protect_whitelist_teams=Equipes com permissão para realizar push
 settings.protect_whitelist_search_teams=Pesquisar equipes...
-settings.protect_merge_whitelist_committers=Habilitar controle de permissão de merge
+settings.protect_merge_whitelist_committers=Habilitar lista de permissão de merge
 settings.protect_merge_whitelist_committers_desc=Permitir que determinados usuários ou equipes possam aplicar merge de pull requests neste branch.
-settings.protect_merge_whitelist_users=Usuários com permissão para aplicar merge:
-settings.protect_merge_whitelist_teams=Equipes com permissão para aplicar merge:
+settings.protect_merge_whitelist_users=Usuários com permissão para fazer merge
+settings.protect_merge_whitelist_teams=Equipes com permissão para fazer merge
 settings.protect_check_status_contexts=Habilitar verificação de status
 settings.protect_check_status_contexts_desc=Exigir que as verificações de status passem antes de fazer merge. Escolha quais verificações de status devem passar antes que os branches possam ter o merge aplicado em um branch que corresponda a esta regra. Quando habilitado, os commits devem primeiro ser enviados para outro branch, então faça merge ou push diretamente para um branch que corresponde a esta regra após a verificação de status ter passado. Se nenhum contexto for selecionado, o último commit deve ser bem sucedido, independentemente do contexto.
 settings.protect_check_status_contexts_list=Verificações de status encontradas na última semana para este repositório
-settings.protect_required_approvals=Aprovações necessárias:
+settings.protect_required_approvals=Aprovações necessárias
 settings.protect_required_approvals_desc=Permite apenas realizar merge do pull request com avaliações positivas suficientes.
 settings.protect_approvals_whitelist_enabled=Restringir aprovações a usuários ou equipes da lista permitida
 settings.protect_approvals_whitelist_enabled_desc=Somente as avaliações de usuários ou equipes da lista permitida serão contadas com as aprovações necessárias. Sem aprovação da lista permitida, as revisões de qualquer pessoa com acesso de escrita contam para as aprovações necessárias.
-settings.protect_approvals_whitelist_users=Usuários com permissão de revisão:
-settings.protect_approvals_whitelist_teams=Equipes com permissão de revisão:
+settings.protect_approvals_whitelist_users=Usuários com permissão de fazer revisões
+settings.protect_approvals_whitelist_teams=Equipes com permissão de fazer revisões
 settings.dismiss_stale_approvals=Descartar aprovações obsoletas
 settings.dismiss_stale_approvals_desc=Quando novos commits que mudam o conteúdo do pull request são enviados para o branch, as antigas aprovações serão descartadas.
-settings.require_signed_commits=Exibir commits assinados
+settings.require_signed_commits=Exigir commits assinados
 settings.require_signed_commits_desc=Rejeitar pushes para este branch se não estiverem assinados ou não forem validáveis.
-settings.protect_branch_name_pattern=Padrão de Nome de Branch Protegida
+settings.protect_branch_name_pattern=Padrão de nome de branch protegido
 settings.protect_patterns=Padrões
-settings.protect_protected_file_patterns=Padrões de arquivos protegidos (separados usando ponto e vírgula ';'):
+settings.protect_protected_file_patterns=Padrões de arquivo protegidos (separados usando ponto e vírgula ";")
 settings.protect_protected_file_patterns_desc=Arquivos protegidos não podem ser alterados diretamente, mesmo que o usuário tenha direitos para adicionar, editar ou excluir arquivos neste branch. Vários padrões podem ser separados usando ponto e vírgula (';'). Consulte a documentação %s para a sintaxe padrão. Exemplos: .drone.yml, /docs/**/*.txt.
-settings.protect_unprotected_file_patterns=Padrões de arquivos desprotegidos (separados usando ponto e vírgula ';'):
+settings.protect_unprotected_file_patterns=Padrões de arquivo desprotegidos (separados usando ponto e vírgula ";")
 settings.protect_unprotected_file_patterns_desc=Arquivos não protegidos que podem ser alterados diretamente se o usuário tiver acesso de gravação, ignorando as restrições de push. Vários padrões podem ser separados usando ponto e vírgula (\;'). Veja %[2]s documentação para sintaxe de padrões. Exemplos: .drone.yml, /docs/**/*.txt.
 settings.add_protected_branch=Habilitar proteção
 settings.delete_protected_branch=Desabilitar proteção
 settings.update_protect_branch_success=Proteção do branch "%s" foi atualizada.
 settings.remove_protected_branch_success=Proteção do branch "%s" foi desabilitada.
 settings.remove_protected_branch_failed=Removendo regra de proteção de branch "%s" falhou.
-settings.protected_branch_deletion=Desabilitar proteção de branch
+settings.protected_branch_deletion=Remover proteção de branch
 settings.protected_branch_deletion_desc=Desabilitar a proteção de branch permite que os usuários com permissão de escrita realizem push. Continuar?
 settings.block_rejected_reviews=Bloquear merge em revisões rejeitadas
 settings.block_rejected_reviews_desc=O merge não será possível quando são solicitadas alterações pelos revisores oficiais, mesmo que haja aprovação suficiente.
@@ -2404,28 +2404,28 @@ settings.block_on_official_review_requests_desc=O merge não será possível qua
 settings.block_outdated_branch=Bloquear o merge se o pull request estiver desatualizado
 settings.block_outdated_branch_desc=O merge não será possível quando o branch de topo estiver atrás do branch base.
 settings.default_branch_desc=Selecione um branch padrão para pull requests e commits de código:
-settings.merge_style_desc=Estilos de Merge
-settings.default_merge_style_desc=Estilo de merge padrão para pull requests:
+settings.merge_style_desc=Estilos de merge
+settings.default_merge_style_desc=Estilo de merge padrão
 settings.choose_branch=Escolha um branch...
 settings.no_protected_branch=Não há branches protegidos.
 settings.edit_protected_branch=Editar
 settings.protected_branch_required_rule_name=Nome da regra é obrigatório
-settings.protected_branch_duplicate_rule_name=Regra com nome duplicado
+settings.protected_branch_duplicate_rule_name=Já existe uma regra para este conjunto de branches
 settings.protected_branch_required_approvals_min=Aprovações necessárias não podem ser negativas.
 settings.tags=Tags
-settings.tags.protection=Proteção das Tags
-settings.tags.protection.pattern=Padrão de Tag
+settings.tags.protection=Proteção de tags
+settings.tags.protection.pattern=Padrão de tag
 settings.tags.protection.allowed=Permitido
 settings.tags.protection.allowed.users=Usuários permitidos
 settings.tags.protection.allowed.teams=Equipes permitidas
 settings.tags.protection.allowed.noone=Ninguém
-settings.tags.protection.create=Proteger tag
+settings.tags.protection.create=Adicionar regra
 settings.tags.protection.none=Não há tags protegidas.
-settings.bot_token=Token do Bot
+settings.bot_token=Token do bot
 settings.chat_id=ID do Chat
 settings.matrix.homeserver_url=URL do Homeserver
 settings.matrix.room_id=ID da Sala
-settings.matrix.message_type=Tipo de Mensagem
+settings.matrix.message_type=Tipo de mensagem
 settings.archive.button=Arquivar repositório
 settings.archive.header=Arquivar este repositório
 settings.archive.success=O repositório foi arquivado com sucesso.
@@ -2441,7 +2441,7 @@ settings.lfs_findcommits=Encontrar commits
 settings.lfs_lfs_file_no_commits=Nenhum commit encontrado para este arquivo LFS
 settings.lfs_noattribute=Este caminho não possui atributo bloqueável no branch padrão
 settings.lfs_delete=Excluir arquivo LFS com OID %s
-settings.lfs_delete_warning=A exclusão de um arquivo LFS pode causar erros do tipo 'o objeto não existe' no checkout. Você tem certeza?
+settings.lfs_delete_warning=A exclusão de um arquivo LFS pode causar erros do tipo "o objeto não existe" ao fazer checkout. Você tem certeza?
 settings.lfs_findpointerfiles=Encontre arquivos de ponteiro
 settings.lfs_locks=Bloqueios
 settings.lfs_invalid_locking_path=Caminho inválido: %s
@@ -2453,11 +2453,11 @@ settings.lfs_locks_no_locks=Sem bloqueios
 settings.lfs_lock_file_no_exist=Arquivo bloqueado não existe no branch padrão
 settings.lfs_force_unlock=Forçar desbloqueio
 settings.lfs_pointers.found=Encontrado %d ponteiro(s) de blob - %d associado, %d não associado (%d ausente na loja)
-settings.lfs_pointers.sha=SHA Blob
+settings.lfs_pointers.sha=Hash do blob
 settings.lfs_pointers.oid=OID
 settings.lfs_pointers.inRepo=No repositório
 settings.lfs_pointers.exists=Existe na loja
-settings.lfs_pointers.accessible=Acessível ao Usuário
+settings.lfs_pointers.accessible=Acessível ao usuário
 settings.lfs_pointers.associateAccessible=Associar %d OIDs acessíveis
 settings.rename_branch_failed_exist=Não é possível renomear o branch porque existe o branch %s.
 settings.rename_branch_failed_not_exist=Não é possível renomear o branch %s porque ele não existe.
@@ -2470,11 +2470,11 @@ diff.browse_source=Ver código fonte
 diff.parent=pai
 diff.commit=commit
 diff.git-notes=Notas
-diff.data_not_available=Conteúdo de diff não disponível
-diff.options_button=Opções de diferenças
+diff.data_not_available=O conteúdo do diff não está disponível
+diff.options_button=Opções de visualização de diferenças
 diff.show_diff_stats=Mostrar estatísticas
-diff.download_patch=Baixar arquivo de patch
-diff.download_diff=Baixar arquivo de diferenças
+diff.download_patch=Baixar arquivo patch
+diff.download_diff=Baixar arquivo diff
 diff.show_split_view=Visão dividida
 diff.show_unified_view=Visão unificada
 diff.whitespace_button=Espaço em branco
@@ -2505,7 +2505,7 @@ diff.comment.add_single_comment=Adicionar um único comentário
 diff.comment.add_review_comment=Adicionar comentário
 diff.comment.start_review=Iniciar revisão
 diff.comment.reply=Responder
-diff.review=Revisão
+diff.review=Finalizar revisão
 diff.review.header=Enviar revisão
 diff.review.placeholder=Comentário da revisão
 diff.review.comment=Comentar
@@ -2526,9 +2526,9 @@ releases.desc=Acompanhe as versões e downloads do projeto.
 release.releases=Versões
 release.detail=Detalhes da versão
 release.tags=Tags
-release.new_release=Nova versão
+release.new_release=Nova release
 release.draft=Rascunho
-release.prerelease=Versão prévia
+release.prerelease=Pré-release
 release.stable=Estável
 release.compare=Comparar
 release.edit=editar
@@ -2546,15 +2546,15 @@ release.tag_helper_existing=Tag existente.
 release.title=Título da versão
 release.title_empty=O título não pode estar em branco.
 release.message=Descreva esta versão
-release.prerelease_desc=Marcar como pré-lançamento
+release.prerelease_desc=Marcar como pré-release
 release.prerelease_helper=Marcar esta versão como inadequada para uso em produção.
 release.cancel=Cancelar
-release.publish=Publicar versão
+release.publish=Publicar release
 release.save_draft=Salvar rascunho
-release.edit_release=Atualizar versão
-release.delete_release=Excluir versão
-release.delete_tag=Apagar Tag
-release.deletion=Excluir versão
+release.edit_release=Atualizar release
+release.delete_release=Excluir release
+release.delete_tag=Excluir tag
+release.deletion=Excluir release
 release.deletion_success=A versão foi excluída.
 release.deletion_tag_desc=A tag será excluída do repositório. Conteúdo do repositório e histórico permanecerão inalterados. Continuar?
 release.deletion_tag_success=A tag foi excluída.
@@ -2565,15 +2565,15 @@ release.tag_already_exist=Este nome de tag já existe.
 release.downloads=Downloads
 release.download_count=Downloads: %s
 release.add_tag_msg=Use o título e o conteúdo do lançamento como mensagem da tag.
-release.add_tag=Criar apenas a tag
+release.add_tag=Criar tag
 release.releases_for=Versões para %s
 release.tags_for=Tags para %s
 
-branch.name=Nome do Branch
+branch.name=Nome do branch
 branch.already_exists=Um branch com o nome "%s" já existe.
 branch.delete_head=Excluir
-branch.delete=`Excluir branch "%s"`
-branch.delete_html=Excluir Branch
+branch.delete=Excluir branch "%s"
+branch.delete_html=Excluir branch
 branch.deletion_success=Branch "%s" excluído.
 branch.deletion_failed=Falha ao excluir o branch "%s".
 branch.delete_branch_has_new_commits=O branch "%s" não pode ser excluído porque novos commits foram feitos após o merge.
@@ -2586,9 +2586,9 @@ branch.restore_success=Branch "%s" restaurado.
 branch.restore_failed=Ocorreu um erro ao restaurar o branch "%s".
 branch.protected_deletion_failed=Branch "%s" é protegido. Ele não pode ser excluído.
 branch.default_deletion_failed=Branch "%s" é o branch padrão. Ele não pode ser excluído.
-branch.restore=`Restaurar branch "%s"`
-branch.download=`Baixar branch "%s"`
-branch.rename=`Renomear branch "%s"`
+branch.restore=Restaurar branch "%s"
+branch.download=Baixar branch "%s"
+branch.rename=Renomear branch "%s"
 branch.included_desc=Este branch faz parte do branch padrão
 branch.included=Incluído
 branch.create_new_branch=Criar branch a partir do branch:
@@ -2612,7 +2612,7 @@ topic.manage_topics=Gerenciar Tópicos
 topic.done=Feito
 topic.count_prompt=Você não pode selecionar mais de 25 tópicos
 
-find_file.go_to_file=Ir para arquivo
+find_file.go_to_file=Encontrar um arquivo
 find_file.no_matching=Nenhum arquivo correspondente encontrado
 
 error.csv.too_large=Não é possível renderizar este arquivo porque ele é muito grande.
@@ -2626,7 +2626,7 @@ issues.role.collaborator = Colaborador(a)
 issues.label_archived_filter = Mostrar etiquetas arquivadas
 pulls.status_checks_hide_all = Esconder todas as verificações
 pulls.status_checks_show_all = Mostrar todas as verificações
-pulls.cmd_instruction_hint = `Ver as instruções da linha de comando.`
+pulls.cmd_instruction_hint = Ver instruções de linha de comando
 wiki.cancel = Cancelar
 settings.unarchive.success = O repositório foi desarquivado.
 settings.unarchive.button = Desarquivar repositório
@@ -2642,7 +2642,7 @@ issues.role.contributor = Contribuidor(a)
 issues.role.member_helper = Este usuário é membro da organização proprietária deste repositório.
 issues.role.collaborator_helper = Este(a) usuário(a) foi convidado(a) para colaborar neste repositório.
 pulls.cmd_instruction_checkout_title = Checkout
-settings.wiki_globally_editable = Permitir que qualquer pessoa possa editar a wiki
+settings.wiki_globally_editable = Permitir que qualquer pessoa edite a wiki
 settings.transfer_abort_success = A transferência de repositório para %s foi cancelada.
 settings.enter_repo_name = Digite os nomes do dono e do repositório exatamente neste formato:
 issues.blocked_by_user = Você não pode criar uma questão neste repositório porque você foi bloqueado pelo dono do repositório.
@@ -2674,10 +2674,10 @@ activity.navbar.contributors = Contribuidores
 issues.label_archive_tooltip = Etiquetas arquivadas não serão exibidas nas sugestões de pesquisa de etiquetas.
 activity.navbar.pulse = Recente
 settings.units.overview = Geral
-settings.units.add_more = Adicionar mais...
+settings.units.add_more = Habilitar mais
 pulls.commit_ref_at = `referenciou este pedido de mesclagem no commit %[2]s`
 pulls.cmd_instruction_merge_title = Mesclar
-settings.units.units = Funcionalidades
+settings.units.units = Unidades
 vendored = Externo
 issues.num_participants_one = %d participante
 issues.archived_label_description = (arquivada) %s
@@ -2722,7 +2722,7 @@ settings.archive.mirrors_unavailable = As réplicas ficarão indisponíveis se o
 release.download_count_one = %s download
 settings.mirror_settings.docs.no_new_mirrors = O seu repositório está replicando alterações de ou para outro repositório. Observe que não é possível criar novas réplicas no momento.
 settings.mirror_settings.docs.pull_mirror_instructions = Para configurar uma réplica de outro repositório, consulte:
-settings.wiki_rename_branch_main_desc = Renomear o ramo usado internamente pela wiki para "%s". Esta ação é IRREVERSÍVEL.
+settings.wiki_rename_branch_main_desc = Renomear o branch usado internamente pela Wiki para "%s". Esta ação é permanente e não pode ser desfeita.
 settings.enforce_on_admins = Impor esta regra aos administradores de repositórios
 settings.enforce_on_admins_desc = Administradores de repositório não podem burlar esta regra.
 subscribe.issue.guest.tooltip = Faça login para receber notificações desta questão
@@ -2803,7 +2803,7 @@ settings.sourcehut_builds.secrets_helper = Dar a este job acesso aos segredos de
 settings.sourcehut_builds.access_token_helper = Token de acesso tem a permissão JOBS:RW. Gere um token builds.sr.ht ou um token builds.sr.ht com acesso a segredos em meta.sr.ht.
 settings.matrix.room_id_helper = O ID da sala pode ser obtido do cliente web Element > Configurações da Sala > Avançado > ID interno da sala. Exemplo: %s.
 settings.unarchive.error = Ocorreu um erro ao tentar desarquivar o repositório. Veja o log para mais detalhes.
-settings.event_pull_request_review_request = Revisão de pull request solicitada
+settings.event_pull_request_review_request = Pedidos de revisão
 settings.event_pull_request_review_request_desc = Revisão de pull request solicitada ou pedido de revisão removido.
 settings.event_pull_request_merge = Merge de pull request
 settings.matrix.access_token_helper = É recomendado configurar uma conta Matrix dedicada para isso. O token de acesso pode ser obtido do cliente web Element (em uma aba privada/anônima) > Menu do usuário (acima à esquerda) > Todas as configurações > Ajuda & Sobre > Avançado > Token de acesso (logo abaixo da URL do servidor). Feche a aba privada/anônima (sair da conta irá invalidar o token).
@@ -2823,6 +2823,9 @@ branch.delete_desc = Apagar um branch é permanente. Ainda que o branch apagado
 release.add_external_asset = Adicionar Recurso Externo
 release.invalid_external_url = URL Externa Inválida: "%s"
 release.deletion_desc = Eliminar um release apenas o remove do Forgejo. Isso não irá afetar a tag no Git, o conteúdo do seu repositório ou o histórico. Continuar?
+issues.all_title = Tudo
+issues.new.assign_to_me = Designar a mim
+settings.discord_icon_url.exceeds_max_length = A URL do ícone precisa ter 2048 caracteres ou menos
 
 [graphs]
 
@@ -2846,7 +2849,7 @@ team_name_helper=Nomes de equipe devem ser curtos e memoráveis.
 team_desc_helper=Descreva a finalidade ou o papel da equipe.
 team_access_desc=Acesso ao repositório
 team_permission_desc=Permissão
-team_unit_desc=Permitir o acesso a seções de repositório
+team_unit_desc=Permitir acesso a seções do repositório
 team_unit_disabled=(Desabilitado)
 
 form.name_reserved=O nome de organização "%s" está reservado.
@@ -2861,12 +2864,12 @@ settings.permission=Permissões
 settings.repoadminchangeteam=O administrador do repositório pode adicionar e remover o acesso para equipes
 settings.visibility=Visibilidade
 settings.visibility.public=Pública
-settings.visibility.limited=Limitado (Visível apenas para usuários autenticados)
+settings.visibility.limited=Limitado (visível apenas para usuários autenticados)
 settings.visibility.limited_shortname=Limitado
-settings.visibility.private=Privada (Visível apenas para membros da organização)
+settings.visibility.private=Privada (visível apenas para membros da organização)
 settings.visibility.private_shortname=Privado
 
-settings.update_settings=Atualizar Configurações
+settings.update_settings=Atualizar configurações
 settings.update_setting_success=Configurações da organização foram atualizadas.
 settings.change_orgname_redirect_prompt=O nome antigo irá redirecionar até que seja reivindicado.
 settings.update_avatar_success=O avatar da organização foi atualizado.
@@ -2880,29 +2883,29 @@ settings.hooks_desc=Adicionar Webhooks que serão acionados para todos o
 
 settings.labels_desc=Adicionar rótulos que possam ser usadas em issues para todos os repositórios desta organização.
 
-members.membership_visibility=Visibilidade da associação:
+members.membership_visibility=Visibilidade de membros:
 members.public=Público
-members.public_helper=tornar privado
+members.public_helper=Tornar privado
 members.private=Privado
-members.private_helper=tornar público
-members.member_role=Categoria de membro:
+members.private_helper=Tornar público
+members.member_role=Papel do membro:
 members.owner=Proprietário
 members.member=Membro
 members.remove=Remover
 members.remove.detail=Remover %[1]s de %[2]s?
 members.leave=Sair
-members.leave.detail=Sair de %s?
+members.leave.detail=Você tem certeza que quer sair da organização "%s"?
 members.invite_desc=Adicionar novo membro em %s:
 members.invite_now=Convidar agora
 
 teams.join=Juntar-se
 teams.leave=Deixar
-teams.leave.detail=Sair de %s?
+teams.leave.detail=Você tem certeza que quer sair da equipe "%s"?
 teams.can_create_org_repo=Criar repositórios
 teams.can_create_org_repo_helper=Membros podem criar novos repositórios na organização. O criador terá acesso administrativo ao novo repositório.
-teams.none_access=Sem Acesso
+teams.none_access=Sem acesso
 teams.none_access_helper=Os membros não podem ver ou fazer qualquer outra ação nesta unidade.
-teams.general_access=Acesso Geral
+teams.general_access=Acesso personalizado
 teams.general_access_helper=As permissões dos membros serão decididas pela tabela de permissões abaixo.
 teams.read_access=Leitura
 teams.read_access_helper=Os membros podem ver e clonar os repositórios da equipe.
@@ -2960,7 +2963,7 @@ repositories=Repositórios
 hooks=Webhooks
 integrations=Integrações
 authentication=Fontes de autenticação
-emails=E-mails do Usuário
+emails=E-mails do usuário
 config=Configuração
 notices=Avisos do sistema
 monitor=Monitoramento
@@ -2993,7 +2996,7 @@ dashboard.delete_repo_archives.started=A tarefa de remover todos os arquivos foi
 dashboard.delete_missing_repos=Excluir todos os repositórios que não possuem seus arquivos Git
 dashboard.delete_missing_repos.started=Foi iniciada a tarefa de excluir todos os repositórios que não têm arquivos Git.
 dashboard.delete_generated_repository_avatars=Excluir avatares gerados do repositório
-dashboard.update_mirrors=Atualizar espelhamentos
+dashboard.update_mirrors=Atualizar espelhos
 dashboard.repo_health_check=Verificar estado de saúde de todos os repositórios
 dashboard.check_repo_stats=Verificar estatísticas de todos os repositórios
 dashboard.archive_cleanup=Apagar arquivos antigos de repositório
@@ -3007,8 +3010,8 @@ dashboard.reinit_missing_repos=Reinicializar todos os repositórios Git perdidos
 dashboard.sync_external_users=Sincronizar dados de usuário externo
 dashboard.cleanup_hook_task_table=Limpar tabela hook_task
 dashboard.cleanup_packages=Limpar pacotes expirados
-dashboard.server_uptime=Tempo de atividade do Servidor
-dashboard.current_goroutine=Goroutines Atuais
+dashboard.server_uptime=Tempo de atividade do servidor
+dashboard.current_goroutine=Goroutines atuais
 dashboard.current_memory_usage=Uso de memória atual
 dashboard.total_memory_allocated=Total de memória alocada
 dashboard.memory_obtained=Memória obtida
@@ -3035,7 +3038,7 @@ dashboard.last_gc_time=Desde da ultima vez do GC
 dashboard.total_gc_time=Pausa total do GC
 dashboard.total_gc_pause=Pausa total do GC
 dashboard.last_gc_pause=Última pausa do GC
-dashboard.gc_times=Nº de execuções do GC
+dashboard.gc_times=Número de execuções do GC
 dashboard.delete_old_actions=Excluir todas as ações antigas do banco de dados
 dashboard.delete_old_actions.started=A exclusão de todas as ações antigas do banco de dados foi iniciada.
 dashboard.update_checker=Verificador de atualização
@@ -3048,7 +3051,7 @@ dashboard.cancel_abandoned_jobs=Cancelar trabalhos abandonados
 users.user_manage_panel=Gerenciamento de conta de usuário
 users.new_account=Criar conta de usuário
 users.name=Nome de usuário
-users.full_name=Nome Completo
+users.full_name=Nome completo
 users.activated=Ativado
 users.admin=Administrador
 users.restricted=Restrito
@@ -3061,7 +3064,7 @@ users.never_login=Nunca acessado
 users.send_register_notify=Enviar notificação de cadastro de usuário
 users.new_success=Usuário "%s" criado.
 users.edit=Editar
-users.auth_source=Fonte da autenticação
+users.auth_source=Fonte de autenticação
 users.local=Local
 users.auth_login_name=Nome de acesso da autenticação
 users.password_helper=Deixe a senha em branco para mantê-la inalterada.
@@ -3069,10 +3072,10 @@ users.update_profile_success=A conta de usuário foi atualizada.
 users.edit_account=Editar a conta de usuário
 users.max_repo_creation=Número máximo de repositórios
 users.max_repo_creation_desc=(Use -1 para usar o limite padrão global.)
-users.is_activated=Conta de usuário está ativada
-users.prohibit_login=Desabilitar acesso
-users.is_admin=É administrador
-users.is_restricted=Está restrito
+users.is_activated=Conta ativada
+users.prohibit_login=Conta suspensa
+users.is_admin=Conta de administrador
+users.is_restricted=Conta restrita
 users.allow_git_hook=Pode criar hooks Git
 users.allow_git_hook_tooltip=Hooks Git são executados como o usuário do SO que executa Forgejo e terá o mesmo nível de acesso ao servidor. Como resultado, os usuários com esse privilégio especial de Hook do Git podem acessar e modificar todos os repositórios do Forgejo, bem como o banco de dados usado pelo Forgejo. Por conseguinte, podem também obter privilégios de administrador do Forgejo.
 users.allow_import_local=Pode importar repositórios locais
@@ -3092,12 +3095,12 @@ users.list_status_filter.reset=Reset
 users.list_status_filter.is_active=Ativo
 users.list_status_filter.not_active=Inativo
 users.list_status_filter.is_admin=Administrador
-users.list_status_filter.not_admin=Não Administrador
+users.list_status_filter.not_admin=Não administrador
 users.list_status_filter.is_restricted=Restrito
 users.list_status_filter.not_restricted=Não restrito
 users.list_status_filter.is_prohibit_login=Proibir login
 users.list_status_filter.not_prohibit_login=Permitir login
-users.list_status_filter.is_2fa_enabled=2FA Ativado
+users.list_status_filter.is_2fa_enabled=Autenticação de dois fatores ativada
 users.list_status_filter.not_2fa_enabled=Autenticação em duas etapas desativada
 users.details=Detalhes do usuário
 
@@ -3120,7 +3123,7 @@ orgs.members=Membros
 orgs.new_orga=Nova organização
 
 repos.repo_manage_panel=Gerenciar repositórios
-repos.unadopted=Repositórios Não Adotados
+repos.unadopted=Repositórios não adotados
 repos.unadopted.no_more=Não foram encontrados mais repositórios não adotados
 repos.owner=Proprietário(a)
 repos.name=Nome
@@ -3145,11 +3148,11 @@ packages.repository=Repositório
 packages.size=Tamanho
 packages.published=Publicado
 
-defaulthooks=Webhooks Padrões
+defaulthooks=Webhooks padrão
 defaulthooks.add_webhook=Adicionar Webhook Padrão
 defaulthooks.update_webhook=Atualizar Webhook Padrão
 
-systemhooks=Webhooks do Sistema
+systemhooks=Webhooks do sistema
 systemhooks.add_webhook=Adicionar Webhook do Sistema
 systemhooks.update_webhook=Atualizar Webhook do Sistema
 
@@ -3176,7 +3179,7 @@ auths.attribute_name=Atributo primeiro nome
 auths.attribute_surname=Atributo sobrenome
 auths.attribute_mail=Atributo e-mail
 auths.attribute_ssh_public_key=Atributo de chave SSH pública
-auths.attribute_avatar=Atributo do avatar
+auths.attribute_avatar=Atributo avatar
 auths.attributes_in_bind=Buscar os atributos no contexto de Bind DN
 auths.allow_deactivate_all=Permitir que um resultado de pesquisa vazio para desativar todos os usuários
 auths.use_paged_search=Usar pesquisa paginada
@@ -3219,7 +3222,7 @@ auths.oauth2_emailURL=URL do e-mail
 auths.skip_local_two_fa=Ignorar autenticação em duas etapas local
 auths.skip_local_two_fa_helper=Deixar desligado significa que os usuários locais com 2FA ligada ainda terão que fazer login com 2FA
 auths.oauth2_tenant=Locatário
-auths.oauth2_scopes=Escopos Adicionais
+auths.oauth2_scopes=Escopos adicionais
 auths.oauth2_required_claim_name=Nome do Claim Obrigatorio
 auths.oauth2_required_claim_name_helper=Defina este nome para permitir o login desta fonte apenas para usuários que tenham um claim com este nome
 auths.oauth2_required_claim_value=Valor do Claim Obrigatorio
@@ -3274,7 +3277,7 @@ auths.invalid_openIdConnectAutoDiscoveryURL=URL do Auto Discovery inválida (dev
 config.server_config=Configuração do servidor
 config.app_name=Nome do servidor
 config.app_ver=Versão do Forgejo
-config.app_url=URL base do Forgejo
+config.app_url=URL base
 config.custom_conf=Caminho do Arquivo de Configuração
 config.custom_file_root_path=Caminho raiz para arquivo personalizado
 config.domain=Domínio do servidor
@@ -3285,7 +3288,7 @@ config.run_mode=Modo de execução
 config.git_version=Versão do Git
 config.repo_root_path=Caminho raiz do repositório
 config.lfs_root_path=Caminho raiz do LFS
-config.log_file_root_path=Caminho do log
+config.log_file_root_path=Localização do log
 config.script_type=Tipo de script
 config.reverse_auth_user=Usuário de autenticação reversa
 
@@ -3295,7 +3298,7 @@ config.ssh_start_builtin_server=Usar o servidor embutido
 config.ssh_domain=Domínio do servidor SSH
 config.ssh_port=Porta
 config.ssh_listen_port=Porta de escuta
-config.ssh_root_path=Caminho da raiz
+config.ssh_root_path=Caminho raiz
 config.ssh_key_test_path=Caminho da chave de teste
 config.ssh_keygen_path=Caminho do keygen ('ssh-keygen')
 config.ssh_minimum_key_size_check=Verificar tamanho mínimo da chave
@@ -3317,7 +3320,7 @@ config.db_path=Caminho
 
 config.service_config=Configuração do serviço
 config.register_email_confirm=Exigir confirmação de e-mail para se cadastrar
-config.disable_register=Desabilitar auto-cadastro
+config.disable_register=Desabilitar autocadastro
 config.allow_only_internal_registration=Permitir Registro Somente Através do Próprio Forgejo
 config.allow_only_external_registration=Permitir cadastro somente por meio de serviços externos
 config.enable_openid_signup=Habilitar o auto-cadastro via OpenID
@@ -3338,21 +3341,21 @@ config.no_reply_address=Ocultar domínio de e-mail
 config.default_visibility_organization=Visibilidade padrão para novas organizações
 config.default_enable_dependencies=Habilitar dependências de issue por padrão
 
-config.webhook_config=Configuração de Hook da Web
+config.webhook_config=Configuração de webhook
 config.queue_length=Tamanho da fila
-config.deliver_timeout=Intervalo de entrega
+config.deliver_timeout=Tempo limite de entrega
 config.skip_tls_verify=Ignorar verificação de TLS
 
-config.mailer_config=Configuração de Envio de E-mail
+config.mailer_config=Configuração de envio de e-mails
 config.mailer_enabled=Habilitado
 config.mailer_enable_helo=Ativar HELO
 config.mailer_name=Nome
 config.mailer_protocol=Protocolo
-config.mailer_smtp_addr=Addr SMTP
+config.mailer_smtp_addr=Host SMTP
 config.mailer_smtp_port=Porta SMTP
 config.mailer_user=Usuário
 config.mailer_use_sendmail=Usar o Sendmail
-config.mailer_sendmail_path=Caminho do Sendmail
+config.mailer_sendmail_path=Localização do Sendmail
 config.mailer_sendmail_args=Argumentos extras para o Sendmail
 config.mailer_sendmail_timeout=Tempo limite do Sendmail
 config.mailer_use_dummy=Dummy
@@ -3362,7 +3365,7 @@ config.send_test_mail_submit=Enviar
 config.test_mail_failed=Ocorreu um erro ao enviar um e-mail de teste para "%s": %v
 config.test_mail_sent=Um e-mail de teste foi enviado para "%s".
 
-config.oauth_config=Configuração do OAuth
+config.oauth_config=Configuração de OAuth
 config.oauth_enabled=Habilitado
 
 config.cache_config=Configuração de cache
@@ -3371,8 +3374,8 @@ config.cache_interval=Intervalo de cache
 config.cache_conn=Conexão de cache
 config.cache_item_ttl=Item de cache TTL
 
-config.session_config=Configuração da sessão
-config.session_provider=Provedor da sessão
+config.session_config=Configuração de sessão
+config.session_provider=Provedor de sessão
 config.provider_config=Configuração do provedor
 config.cookie_name=Nome do cookie
 config.gc_interval_time=Tempo de Intervalo do GC
@@ -3464,7 +3467,7 @@ users.bot = Robô
 dashboard.start_schedule_tasks = Iniciar tarefas programadas
 users.reserved = Reservado
 emails.change_email_text = Tem certeza de que deseja atualizar este endereço de e-mail?
-self_check = Autodiagnóstico
+self_check = Autoverificação
 auths.tip.gitea = Registre um novo aplicativo OAuth2. A documentação pode ser encontrada em %s/
 dashboard.sync_tag.started = Sincronização de etiquetas iniciada
 self_check.no_problem_found = Por enquanto não há algum problema.
@@ -3792,7 +3795,7 @@ actions=Ações
 unit.desc=Gerenciar ações
 
 status.unknown=Desconhecido
-status.waiting=Em espera
+status.waiting=Aguardando
 status.running=Rodando
 status.success=Sucesso
 status.failure=Falha
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
index c84ee554af..e268f2f042 100644
--- a/options/locale/locale_ru-RU.ini
+++ b/options/locale/locale_ru-RU.ini
@@ -1038,7 +1038,7 @@ hints = Подсказки
 additional_repo_units_hint = Предлагать включить больше разделов в репозиториях
 update_hints = Обновить подсказки
 update_hints_success = Подсказки обновлены.
-additional_repo_units_hint_description = Показывать кнопку "Добавить больше разделов" в репозиториях, в которых включены не все разделы.
+additional_repo_units_hint_description = Показывать подсказку "Включить больше разделов" в репозиториях, в которых включены не все разделы.
 pronouns_custom = Другие
 pronouns = Местоимения
 pronouns_unspecified = Не указаны
@@ -2284,31 +2284,31 @@ settings.event_push_desc=Отправка изменений в репозито
 settings.event_repository=Репозиторий
 settings.event_repository_desc=Создание и удаление репозиториев.
 settings.event_header_issue=События задач
-settings.event_issues=Задачи
+settings.event_issues=Изменение
 settings.event_issues_desc=Создание, закрытие, переоткрытие и изменение задач.
-settings.event_issue_assign=Назначение задач
+settings.event_issue_assign=Назначение
 settings.event_issue_assign_desc=Выдача и снятие назначения задачи.
-settings.event_issue_label=Метки задач
-settings.event_issue_label_desc=Изменение и очистка меток задач.
-settings.event_issue_milestone=Этапы задач
-settings.event_issue_milestone_desc=Добавление задач в этапы и удаление.
-settings.event_issue_comment=Комментарии задач
+settings.event_issue_label=Метки
+settings.event_issue_label_desc=Добавление и удаление меток задач.
+settings.event_issue_milestone=Этапы
+settings.event_issue_milestone_desc=Добавление задач в этапы, удаление и изменение.
+settings.event_issue_comment=Комментарии
 settings.event_issue_comment_desc=Добавление, изменение и удаление комментариев в задачах.
 settings.event_header_pull_request=События запросов слияний
-settings.event_pull_request=Запросы слияния
+settings.event_pull_request=Изменение
 settings.event_pull_request_desc=Создание, закрытие, переоткрытие и изменение запросов слияния.
-settings.event_pull_request_assign=Назначение запросов
+settings.event_pull_request_assign=Назначение
 settings.event_pull_request_assign_desc=Выдача и снятие назначения запроса на слияние.
-settings.event_pull_request_label=Метки запросов слияния
-settings.event_pull_request_label_desc=Изменение и очистка меток запроса слияния.
-settings.event_pull_request_milestone=Этапы запросов слияния
-settings.event_pull_request_milestone_desc=Добавление запроса слияния в этап и удаление.
-settings.event_pull_request_comment=Комментарии запросов на слияние
+settings.event_pull_request_label=Метки
+settings.event_pull_request_label_desc=Добавление и удаление меток запроса слияния.
+settings.event_pull_request_milestone=Этапы
+settings.event_pull_request_milestone_desc=Добавление запросов слияния в этапы, удаление и изменение.
+settings.event_pull_request_comment=Комментарии
 settings.event_pull_request_comment_desc=Добавление, изменение и удаление комментариев в запросах на слияние.
-settings.event_pull_request_review=Запрос на слияние рассмотрен
-settings.event_pull_request_review_desc=Запрос на слияние утвержден, отклонён или оставлен комментарий.
-settings.event_pull_request_sync=Запрос на слияние синхронизирован
-settings.event_pull_request_sync_desc=Запрос на слияние синхронизирован.
+settings.event_pull_request_review=Рецензии
+settings.event_pull_request_review_desc=Изменения в запросе слияния одобрены, отклонены прокомментированы.
+settings.event_pull_request_sync=Синхронизация
+settings.event_pull_request_sync_desc=Ветвь синхронизирована с целевой ветвью автоматически.
 settings.event_pull_request_review_request=Запросы рецензий
 settings.event_pull_request_review_request_desc=Создание и отмена запросов рецензий в запросах слияний.
 settings.event_pull_request_approvals=Одобрения запросов слияний
@@ -2718,10 +2718,10 @@ settings.wiki_globally_editable = Разрешить редактировани
 settings.webhook.test_delivery_desc_disabled = Активируйте этот веб-хук для проверки тестовым событием.
 commits.browse_further = Смотреть далее
 vendored = Сторонний
-settings.units.add_more = Доб. больше...
+settings.units.add_more = Вкл. больше
 pulls.fast_forward_only_merge_pull_request = Только fast-forward
 settings.units.overview = Обзор
-settings.units.units = Разделы репозитория
+settings.units.units = Разделы
 pulls.reopen_failed.head_branch = Этот запрос на слияние не может быть открыт повторно, так как исходная ветвь больше не существует.
 pulls.reopen_failed.base_branch = Этот запрос на слияние не может быть открыт заново, потому что базовая ветвь больше не существует.
 settings.ignore_stale_approvals = Игнорировать устаревшие одобрения
diff --git a/options/locale/locale_sl.ini b/options/locale/locale_sl.ini
index ffa1e38af6..56ef337d83 100644
--- a/options/locale/locale_sl.ini
+++ b/options/locale/locale_sl.ini
@@ -555,7 +555,7 @@ repo.collaborator.added.subject = %s vas je dodal v %s
 team_invite.subject = %[1]s vas je povabil, da se pridružite organizaciji %[2]s
 issue.action.new = @%[1]s ustvaril #%[2]d.
 team_invite.text_1 = %[1]s vas je povabil, da se pridružite ekipi %[2]s v organizaciji %[3]s.
-team_invite.text_3 = Opomba: To vabilo je bilo namenjeno %[1]. Če tega vabila niste pričakovali, ga lahko ignorirate.
+team_invite.text_3 = Opomba: To vabilo je bilo namenjeno %[1]s. Če tega vabila niste pričakovali, ga lahko ignorirate.
 reply = ali neposredno odgovorite na to e-poštno sporočilo
 activate_email = Preverite svoj e-poštni naslov
 activate_email.title = %s, preverite svoj e-poštni naslov
diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini
index 71eddbd550..2aec3d1a64 100644
--- a/options/locale/locale_sv-SE.ini
+++ b/options/locale/locale_sv-SE.ini
@@ -16,7 +16,7 @@ template=Mall
 language=Språk
 notifications=Notiser
 create_new=Skapa…
-user_profile_and_more=Profil och Inställningar…
+user_profile_and_more=Profil och inställningar…
 signed_in_as=Inloggad som
 toc=Innehållsförteckning
 licenses=Licenser
@@ -38,7 +38,7 @@ organization=Organisation
 mirror=Spegel
 new_repo=Ny utvecklingskatalog
 new_migrate=Ny migrering
-new_mirror=Ny Spegling
+new_mirror=Ny spegling
 new_fork=Ny förgrening av utvecklingskatalog
 new_org=Ny organisation
 new_project=Nytt projekt
@@ -94,16 +94,73 @@ name=Namn
 logo = Logotyp
 sign_in_with_provider = Logga in med %s
 enable_javascript = Denna webbplats kräver JavaScript.
+ok = OK
+more_items = Fler saker
+webauthn_sign_in = Tryck på knappen på din säkerhetsnyckel. Om din säkerhetsnycket inte har en knapp, dra ut den och sätt in den igen.
+new_project_column = Ny kolumn
+copy_type_unsupported = Den här filtypen kan inte kopieras
+error = Fel
+retry = Försök igen
+rerun_all = Kör om alla jobb
+copy_success = Kopierad!
+locked = Låst
+copy = Kopiera
+copy_url = Kopiera URL
+copy_error = Kopiering misslyckades
+copy_content = Kopiera innehåll
+webauthn_insert_key = Skriv in din säkerhetsnyckel
+webauthn_press_button = Var god tryck på knappen på din säkerhetsnyckel…
+webauthn_error = Kunde inte läsa din säkerhetsnyckel.
+webauthn_unsupported_browser = Din webbläsare har inte ännu stöd för WebAuthn.
+webauthn_error_unknown = Ett okänt fel har inträffat. Var god försök igen.
+webauthn_error_empty = Du måste ange ett namn för den här nyckeln.
+new_org.title = Ny organisation
+new_org.link = Ny organisation
+test = Test
+concept_system_global = Global
+concept_user_individual = Individuell
+rss_feed = RSS-flöde
+never = Aldrig
+unknown = Okänd
+confirm_delete_artifact = Är du säker på att du vill ta bort artefakten "%s"?
+artifacts = Artefakter
+show_timestamps = Visa tidsstämpel
+show_full_screen = Visa i fullskärm
+download_logs = Ladda ner loggar
+go_back = Gå tillbaka
+show_log_seconds = Visa sekunder
 
 [aria]
+footer.software = Om den här mjukvaran
+footer.links = Länkar
 
 [heatmap]
+contributions_one = bidrag
+contributions_zero = Inga bidrag
+contributions_format = {contributions} på {day} {month}, {year}
+contributions_few = bidrag
+less = Mindre
+more = Mer
+number_of_contributions_in_the_last_12_months = %s bidrag under de senaste 12 månaderna
 
 [editor]
+buttons.quote.tooltip = Citera text
+buttons.code.tooltip = Lägg till kod
+buttons.link.tooltip = Lägg till en länk
+buttons.heading.tooltip = Lägg till rubrik
+buttons.bold.tooltip = Lägg till fetstilt text
+buttons.italic.tooltip = Lägg till kursiv text
+buttons.list.unordered.tooltip = Lägg till en punktlista
+buttons.list.ordered.tooltip = Lägg till en numrerad lista
+buttons.list.task.tooltip = Lägg till en lista med sysslor
+buttons.mention.tooltip = Nämn en användare eller ett team
 
 [filter]
 
 [error]
+occurred = Ett fel har inträffat
+server_internal = Internt serverfel
+network_error = Nätverksfel
 
 [startpage]
 app_desc=En smidig, självhostad Git-tjänst
@@ -140,48 +197,48 @@ err_admin_name_is_invalid=Administratörsanvändarnamnet är ogiltigt
 
 general_title=Allmänna inställningar
 app_name=Sajtens namn
-app_name_helper=Du kan ange ditt företagsnamn här.
+app_name_helper=Skriv in din instans namn här. Det kommer att visas på varje sida.
 repo_path=Rotsökväg för utvecklingskatalog
 repo_path_helper=Fjärrutvecklingskataloger kommer att sparas i denna katalog.
-lfs_path=LFS Rotsökväg
+lfs_path=LFS rotsökväg
 lfs_path_helper=Filer hanterade av Git LFS kommer att sparas i denna mapp. Lämna tom för att avaktivera.
-run_user=Kör som användarnamn
+run_user=Användare att köra som
 ssh_port=SSH-serverport
 ssh_port_helper=Portnumret som din SSH-server lyssnar på. Lämna tom för att inaktivera.
-http_port=Forgejo HTTP-lyssningsport
-http_port_helper=Portnumret som Forgejos webbserver kommer lyssna på.
-app_url=Forgejo URL
+http_port=HTTP-lyssningsport
+http_port_helper=Portnumret som kommer att användas av Forgejos webbserver.
+app_url=Bas-URL
 app_url_helper=Basadressen för HTTP(S)-kloningslänkar och mejlnotifikationer.
 log_root_path=Loggsökväg
 log_root_path_helper=Loggfiler kommer skrivas till denna katalog.
 
 optional_title=Övriga inställningar
-email_title=Mejlinställningar
+email_title=E-postinställningar
 smtp_addr=SMTP-server
 smtp_port=SMTP-port
-smtp_from=Skicka Mejl Som
+smtp_from=Skicka E-post som
 smtp_from_helper=Mejladress som Forgejo kommer att använda. Anges i simpelt ('email@example.com') eller fullständigt ('Name ') format.
-mailer_user=SMTP-Användarnamn
-mailer_password=SMTP-Lösenord
-register_confirm=Kräv Bekräftelse Via Mejl För Att Registrera
-mail_notify=Aktivera Mejlnotifikationer
-server_service_title=Inställningar för Server- och Tredjepartstjänster
-offline_mode=Aktivera Lokalt Läge
+mailer_user=SMTP-användarnamn
+mailer_password=SMTP-lösenord
+register_confirm=Kräv bekräftelse via E-post för att registrera
+mail_notify=Aktivera E-postnotifikationer
+server_service_title=Inställningar för server- och tredjepartstjänster
+offline_mode=Aktivera lokalt läge
 offline_mode.description=Inaktivera CDN från tredjepart och distribuera samtliga resurser lokalt istället.
 disable_gravatar=Inaktivera Gravatar
 disable_gravatar.description=Inaktivera Gravatar- och avatarskällor från tredjepart. Om användaren inte laddar upp en avatar så kommer en standardavatar att användas.
-federated_avatar_lookup=Aktivera Federerade Avatarer
+federated_avatar_lookup=Aktivera federerade avatarer
 federated_avatar_lookup.description=Använd libravatar vid förenad uppslagning av avatarer.
-disable_registration=Inaktivera Självregistrering
+disable_registration=Inaktivera självregistrering
 disable_registration.description=Inaktivera självregistrering av användare. Endast administratörer kommer kunna skapa nya konton.
-allow_only_external_registration.description=Tillåt registrering endast via externa tjänster
+allow_only_external_registration.description=Användare kommer endast kunna skapa nya konton genom att använda konfigurerade externa tjänster.
 openid_signin=Aktivera OpenID-inloggning
-openid_signin.description=Aktivera användarinloggning via OpenID.
+openid_signin.description=Tillåt användare att logga in via OpenID.
 openid_signup=Aktivera självregistrering genom OpenID
-openid_signup.description=Aktivera OpenID-baserad självregistrering av användare.
+openid_signup.description=Tillåt användare att skapa konton via OpenID om självregistrering är aktiverad.
 enable_captcha=Aktivera CAPTCHA registrering
 enable_captcha.description=Kräv captcha för användarregistrering.
-require_sign_in_view=Kräv Inloggning För Att Visa Sidor
+require_sign_in_view=Kräv inloggning för att visa instanssidor
 admin_setting.description=Skapandet av administratörskonto är frivilligt. Den första användaren som registreras blir automatiskt administratör.
 admin_title=Inställningar för Administratörskonto
 admin_name=Användarnamn för Administratör
@@ -205,6 +262,13 @@ default_enable_timetracking=Aktivera tidredovisning som Standard
 default_enable_timetracking.description=Aktivera tidsredovisning för nya utvecklingskataloger som standard.
 no_reply_address=Dold mejldomän
 no_reply_address_helper=Domännamn för användare med en dold mailadress. Exempelvis kommer användarnamnet 'joe' att loggas i Git som 'joe@noreply.example.org' om dold maildomän är satt till 'noreply.example.org'.
+require_db_desc = Forgejo kräver MySQL, PostgreSQL, SQLite3 eller TiDB (MySQL-protokoll).
+allow_only_external_registration = Tillåt registrering endast via externa tjänster
+app_slogan = Instansslogan
+app_slogan_helper = Skriv in din slogan här. Lämna tom för att stänga av.
+domain = Serverdomän
+domain_helper = Domän eller värdadress för servern.
+reinstall_error = Du försöker att installera i en existerande Forgejo-databas
 
 [home]
 uname_holder=Användarnamn eller Mejladress
@@ -2076,3 +2140,7 @@ runs.commit=Commit
 ; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", …
 symbolic_link=Symbolisk länk
 
+
+
+[search]
+milestone_kind = Sök milstolpar...
\ No newline at end of file
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
index ef7903eb31..0224e6e5f0 100644
--- a/options/locale/locale_tr-TR.ini
+++ b/options/locale/locale_tr-TR.ini
@@ -1041,9 +1041,9 @@ blame.ignore_revs=.git-blame-ignore-revs dosyasındaki sürüml
 blame.ignore_revs.failed=.git-blame-ignore-revs dosyasındaki sürümler yok sayılamadı.
 author_search_tooltip=En fazla 30 kullanıcı görüntüler
 
-tree_path_not_found_commit=%[1] yolu, %[2]s işlemesinde mevcut değil
-tree_path_not_found_branch=%[1] yolu, %[2]s dalında mevcut değil
-tree_path_not_found_tag=%[1] yolu, %[2]s etiketinde mevcut değil
+tree_path_not_found_commit=%[1]s yolu, %[2]s işlemesinde mevcut değil
+tree_path_not_found_branch=%[1]s yolu, %[2]s dalında mevcut değil
+tree_path_not_found_tag=%[1]s yolu, %[2]s etiketinde mevcut değil
 
 transfer.accept=Aktarımı Kabul Et
 transfer.accept_desc=`"%s" tarafına aktar`
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
index 80cfaf1184..531daf2126 100644
--- a/options/locale/locale_uk-UA.ini
+++ b/options/locale/locale_uk-UA.ini
@@ -27,7 +27,7 @@ username=Ім'я кристувача
 email=Адреса електронної пошти
 password=Пароль
 access_token=Токен доступу
-re_type=Підтвердження паролю
+re_type=Підтвердження пароля
 captcha=CAPTCHA
 twofa=Двофакторна авторизація
 twofa_scratch=Двофакторний одноразовий пароль
@@ -104,7 +104,7 @@ name=Назва
 logo = Логотип
 sign_in_with_provider = Увійти через %s
 tracked_time_summary = Підсумок відстеженого часу з урахуванням фільтрів списку задач
-enable_javascript = Сайту треба JavaScript.
+enable_javascript = Цей вебсайт потребує JavaScript.
 webauthn_press_button = Натисніть кнопку на ключі безпеки…
 webauthn_use_twofa = Введіть код підтвердження з телефону
 webauthn_error = Не вдалося розпізнати ключ безпеки.
@@ -143,28 +143,28 @@ filter.clear = Очистити фільтри
 filter.is_archived = Архівовано
 filter = Фільтри
 toggle_menu = Перемкнути видимість меню
-confirm_delete_artifact = Ви впевнені, що хочете видалити цей артефакт "%s"?
+confirm_delete_artifact = Ви впевнені, що хочете видалити артефакт "%s"?
 artifacts = Артефакти
 filter.not_archived = Не архівовано
 filter.public = Загальнодоступні
 filter.private = Приватні
 more_items = Більше пунктів
-remove_label_str = Видалити предмет "%s"
-new_repo.title = Новий репозитор
+remove_label_str = Видалити об'єкт "%s"
+new_repo.title = Новий репозиторій
 new_migrate.title = Нова міграція
 new_org.title = Нова організація
-new_repo.link = Новий репозитор
+new_repo.link = Новий репозиторій
 new_migrate.link = Нова міграція
 new_org.link = Нова організація
-copy_generic = Скопіювати до буферу обміну
+copy_generic = Скопіювати до буфера обміну
 show_log_seconds = Показувати секунди
-show_full_screen = Показувати у повно-екранному режимі
+show_full_screen = Показувати у повноекранному режимі
 filter.is_fork = Розвилки
 filter.not_fork = Не розвилки
 filter.is_mirror = Дзеркала
 filter.not_mirror = Не дзеркала
 filter.not_template = Не шаблони
-error413 = Ви вичерпали ваш quota.
+error413 = Ви вичерпали свою частку.
 invalid_data = Недійсні дані: %v
 
 [aria]
@@ -193,12 +193,12 @@ buttons.list.ordered.tooltip = Додати нумерований список
 buttons.list.task.tooltip = Додати список завдань
 buttons.heading.tooltip = Додати заголовок
 buttons.switch_to_legacy.tooltip = Використовувати застарілий редактор замість поточного
-buttons.disable_monospace_font = Вимкнути моноширний шрифт
+buttons.disable_monospace_font = Вимкнути моноширинний шрифт
 buttons.indent.tooltip = Вкласти предмет на один рівень
-buttons.unindent.tooltip = Викласти предмет на один рівень
+buttons.unindent.tooltip = Викласти об'єкт на один рівень
 buttons.mention.tooltip = Згадати користувача чи команду
 buttons.ref.tooltip = Посилатись на недолік чи на запит на злиття
-buttons.enable_monospace_font = Увімкнути моноширний шрифт
+buttons.enable_monospace_font = Увімкнути моноширинний шрифт
 
 [filter]
 string.asc = А - Я
@@ -208,15 +208,15 @@ string.desc = Я - А
 occurred=Сталася помилка
 missing_csrf=Некоректний запит: токен CSRF не задано
 network_error=Помилка мережі
-server_internal = Помилка внутрішнього серверу
-report_message = Якщо ви думаєте, що це вада Forgejo, будь-ласка пошукайте її у списку недоліків на Codeberg чи повідомте про новий недолік, якщо необхідно.
+server_internal = Внутрішня помилка сервера
+report_message = Якщо ви думаєте, що це вада Forgejo, будь ласка, пошукайте її у списку задач на Codeberg чи створіть нову задачу, якщо необхідно.
 not_found = Ціль не була знайдена.
 
 [startpage]
 app_desc=Зручний власний сервіс хостингу репозиторіїв Git
 install=Легко встановити
 platform=Платформонезалежність
-platform_desc=Forgejo підтверджено працює на вільних операційних системах, як от Linux і FreeBSD, так само й на різних архітектурах ЦП. Оберіть, яка вам до вподоби!
+platform_desc=Forgejo підтверджено працює на вільних операційних системах, як-от Linux і FreeBSD, так само й на різних архітектурах ЦП. Оберіть, яка вам до вподоби!
 lightweight=Невибагливість
 lightweight_desc=Forgejo має низькі вимоги до ресурсів та може працювати на недорогому Raspberry Pi. Заощадьте енергію свого комп'ютера!
 license=Відкритий вихідний код
@@ -252,19 +252,19 @@ err_admin_name_pattern_not_allowed=Ім'я адміністратора неді
 err_admin_name_is_invalid=Неправильне ім'я користувача-адміністратора
 
 general_title=Загальні налаштування
-app_name=Назва сайту
-app_name_helper=Тут ви можете ввести назву своєї компанії.
+app_name=Назва екземпляру
+app_name_helper=Тут ви можете ввести назву свого екземпляру.
 repo_path=Коренева тека репозиторію
 repo_path_helper=Всі вилучені Git репозиторії будуть збережені в цей каталог.
 lfs_path=Кореневий шлях Git LFS
 lfs_path_helper=У цій папці будуть зберігатися файли Git LFS. Залиште порожнім, щоб вимкнути LFS.
-run_user=Користувач від якого запустити
+run_user=Користувач, від якого запустити
 domain=Домен сервера
 domain_helper=Домен або адреса хоста сервера.
-ssh_port=Порт SSH серверу
+ssh_port=Порт SSH-сервера
 ssh_port_helper=Номер порту, що використовує SSH сервер. Залиште порожнім, аби вимкнути SSH.
-http_port=HTTP порт для прослуховування
-http_port_helper=Номер порту, що буде прослуховуватися Forgejo вебсервером.
+http_port=HTTP-порт для прослуховування
+http_port_helper=Номер порту, що буде прослуховуватися вебсервером Forgejo.
 app_url=Базова URL-адреса
 app_url_helper=Базова адреса для HTTP(S) клонування через URL та повідомлень електронної пошти.
 log_root_path=Шлях до файлу журналу
@@ -272,8 +272,8 @@ log_root_path_helper=Файли журналу будуть записані в
 
 optional_title=Додаткові налаштування
 email_title=Налаштування email
-smtp_addr=SMTP хост
-smtp_port=SMTP порт
+smtp_addr=Адреса SMTP
+smtp_port=Порт SMTP
 smtp_from=Відправляти email від імені
 smtp_from_helper=Електронна пошта для використання в Gіtea. Введіть звичайну електронну адресу або використовуйте формат: "Ім'я" .
 mailer_user=SMTP Ім'я користувача
@@ -284,49 +284,49 @@ server_service_title=Сервер і налаштування зовнішніх
 offline_mode=Увімкнути локальний режим
 offline_mode.description=Відключити постачання контенту зі сторонніх мереж й обслуговувати всі ресурси локально.
 disable_gravatar=Вимкнути Gravatar
-disable_gravatar.description=Відключити Gravatar і сторонні джерела аватарів. Якщо користувач не завантажить аватар локально то за замовчуванням буде використовуватися стандартний аватар.
-federated_avatar_lookup=Увімкнути федеративні аватари
+disable_gravatar.description=Вимкнути Gravatar або інші сторонні джерела аватарів. Якщо користувач не завантажить власний аватар локально, то буде використовуватися зображення за замовчуванням.
+federated_avatar_lookup=Увімкнути федеровані аватари
 federated_avatar_lookup.description=Увімкнути зовнішні аватари за допомогою Libravatar.
 disable_registration=Вимкнути самостійну реєстрацію
-disable_registration.description=Вимкнути самостійну реєстрацію користувачів, тільки адміністратор може створювати нові облікові записи.
+disable_registration.description=Тільки адміністратор може створювати нові облікові записи. Наполегливо рекомендуємо залишити реєстрацію вимкненою, якщо ви не збираєтеся розміщувати загальнодоступний екземпляр та сприяти появі величезної кількості спам-акаунтів.
 allow_only_external_registration.description=Користувачам буде дозволено реєструватись лише через налаштовані сторонні сервіси.
 openid_signin=Увімкнути реєстрацію за допомогою OpenID
 openid_signin.description=Увімкнути вхід за допомогою OpenID.
 openid_signup=Увімкнути самостійну реєстрацію за допомогою OpenID
-openid_signup.description=Увімкнути самореєстрацію користувачів на основі OpenID.
+openid_signup.description=Увімкнути самореєстрацію користувачів тільки через OpenID.
 enable_captcha=Увімкнути CAPTCHA при реєстрації
-enable_captcha.description=Вимагати перевірку CAPTCHA при самостійній реєстрації користувача.
-require_sign_in_view=Вимагати авторизації для перегляду сторінок
-admin_setting.description=Створення облікового запису адміністратора необов'язково. Перший зареєстрований користувач автоматично стає адміністратором.
+enable_captcha.description=Вимагати перевірку CAPTCHA для створення облікових записів.
+require_sign_in_view=Вимагати авторизації для перегляду вмісту екземпляра
+admin_setting.description=Створювати обліковий запис адміністратора необов'язково. Перший зареєстрований користувач автоматично стає адміністратором.
 admin_title=Налаштування облікового запису адміністратора
-admin_name=Ім'я кристувача Адміністратора
+admin_name=Ім'я користувача адміністратора
 admin_password=Пароль
 confirm_password=Підтвердження пароля
 admin_email=Адреса електронної пошти
 install_btn_confirm=Встановлення Forgejo
-test_git_failed=Не в змозі перевірити 'git' команду: %v
-sqlite3_not_available=Ця версія Forgejo не підтримує SQLite3. Будь ласка, завантажте офіційну бінарну версію з %s (не версію gobuild).
+test_git_failed=Не вдалося перевірити команду «git»: %v
+sqlite3_not_available=Ця версія Forgejo не підтримує SQLite3. Будь ласка, завантажте офіційну бінарну версію з %s (не версію «gobuild»).
 invalid_db_setting=Налаштування бази даних є некоректними: %v
 invalid_repo_path=Помилковий шлях до кореня репозиторію: %v
 invalid_app_data_path=Некоректний шлях до даних програми: %v
-run_user_not_match=Ім'я користувача 'run as' не є поточним ім'ям користувача: %s -> %s
+run_user_not_match=Ім'я в «Користувач, від якого запустити» не є ім'ям поточного користувача: %s -> %s
 internal_token_failed=Не вдалося згенерувати внутрішній токен: %v
 secret_key_failed=Не вдалося згенерувати секретний ключ: %v
 save_config_failed=Не в змозі зберегти конфігурацію: %v
 invalid_admin_setting=Неприпустимі налаштування облікового запису адміністратора: %v
 invalid_log_root_path=Неприпустимий шлях для логів: %v
-default_keep_email_private=Приховати адресу електронної пошти за замовчуванням
-default_keep_email_private.description=Приховати адресу електронної пошти нових облікових записів за замовчуванням.
+default_keep_email_private=Приховати адреси електронної пошти за замовчуванням
+default_keep_email_private.description=За замовчуванням приховати адреси електронної пошти нових облікових записів, щоб ця інформація не «витікала» одразу після реєстрації.
 default_allow_create_organization=Дозволити створення організацій за замовчуванням
-default_allow_create_organization.description=Дозволити новим обліковим записам користувачів створювати організації за замовчуванням.
+default_allow_create_organization.description=Дозволити новим користувачам створювати організації за замовчуванням. Якщо цю опцію вимкнено, дозвіл на створення організацій новим користувачам надає адміністратор.
 default_enable_timetracking=Увімкнути відстеження часу за замовчуванням
-default_enable_timetracking.description=Включити відстеження часу для нових репозиторіїв за замовчуванням.
+default_enable_timetracking.description=Дозволити використання функції відстеження часу для нових репозиторіїв за замовчуванням.
 no_reply_address=Прихований поштовий домен
-no_reply_address_helper=Доменне ім'я для користувачів із прихованою електронною адресою. Наприклад, ім'я користувача 'joe' буде входити в Git як 'joe@noreply.example.org', якщо для прихованого домену електронної пошти встановлено 'noreply.example.org'.
+no_reply_address_helper=Доменне ім'я для користувачів із прихованою електронною адресою. Наприклад, користувач «joe» буде входити в Git як «joe@noreply.example.org», якщо для прихованого домену електронної пошти встановлено «noreply.example.org».
 password_algorithm=Алгоритм хешування пароля
 config_location_hint = Ці опції налаштувань будуть збережені в:
 env_config_keys = Конфігурація середовища
-env_config_keys_prompt = Наступні змінні середовища будуть також застосовані до вашого файлу конфігурації:
+env_config_keys_prompt = Ці змінні середовища будуть також застосовані до вашого файлу конфігурації:
 invalid_db_table = База даних "%s" недійсна: %v
 enable_update_checker = Увімкнути перевірку оновлень
 require_db_desc = Forgejo вимагає MySQL, PostgreSQL, SQLite3 чи TiDB (протокол MySQL).
@@ -334,21 +334,21 @@ allow_only_external_registration = Дозволити реєстрацію ті
 require_sign_in_view.description = Обмежити доступ до контенту лише користувачам, що увійшли. Гості зможуть лише відвідувати сторінки автентифікації.
 password_algorithm_helper = Встановити алгоритм хешування паролів. Алгоритми мають різні вимоги та силу. Алгоритм argon2 є досить безпечним, проте споживає багато памʼяті та є недоречним для малих систем.
 app_slogan = Гасло екземпляру
-app_slogan_helper = Уведіть ваше гасло екземпляру тут. Залиште пустим, аби вимкнути.
-run_user_helper = Імʼя користувача операційної системи, від якого запущено Forgejo. Помітьте, що цей користувач повинен мати доступ до корінної теки репозиторія.
-smtp_from_invalid = Адреса з "Відіслати письмо від" не існує
+app_slogan_helper = Уведіть гасло вашого екземпляру тут. Залиште порожнім, аби вимкнути.
+run_user_helper = Імʼя користувача операційної системи, від якого запущено Forgejo. Зауважте, що цей користувач повинен мати доступ до кореневої теки репозиторію.
+smtp_from_invalid = Адреса з «Відправляти email від імені» недійсна
 allow_dots_in_usernames = Дозволити користувачам використовувати крапки у своїх іменах. Не впливає на облікові записи, що вже існують.
 invalid_password_algorithm = Недійсний варіант алгоритму хешування паролів
-enable_update_checker_helper_forgejo = Воно буде періодично перевіряти нові версії Forgejo через перевірку TXT DNS запису на release.forgejo.org.
+enable_update_checker_helper_forgejo = Наявність нових версій Forgejo періодично перевірятиметься через перевірку запису TXT DNS на release.forgejo.org.
 
 [home]
-uname_holder=Ім'я користувача або Ел. пошта
+uname_holder=Ім'я користувача або ел. пошта
 password_holder=Пароль
 switch_dashboard_context=Переключити контекст панелі управління
 my_repos=Репозиторії
 show_more_repos=Показати більше репозиторіїв…
 collaborative_repos=Спільні репозиторії
-my_orgs=Мої організації
+my_orgs=Організації
 my_mirrors=Мої дзеркала
 view_home=Переглянути %s
 search_repos=Шукати репозиторій…
@@ -395,7 +395,7 @@ register_helper_msg=Вже зареєстровані? Увійдіть зара
 social_register_helper_msg=Вже є аккаунт? Зв'яжіть його зараз!
 disable_register_prompt=Вибачте, можливість реєстрації відключена. Будь ласка, зв'яжіться з адміністратором сайту.
 disable_register_mail=Підтвердження реєстрації електронною поштою вимкнено.
-remember_me=Запам’ятати цей пристрій
+remember_me=Запам'ятати цей пристрій
 forgot_password_title=Забув пароль
 forgot_password=Забули пароль?
 sign_up_now=Потрібен обліковий запис? Зареєструйтеся зараз.
@@ -428,7 +428,7 @@ oauth_signup_tab=Зареєструвати обліковий запис
 oauth_signup_title=Повний новий обліковий запис
 oauth_signup_submit=Повний обліковий запис
 oauth_signin_tab=Посилання на існуючий обліковий запис
-oauth_signin_title=Увійдіть щоб авторизувати пов'язаний обліковий запис
+oauth_signin_title=Увійдіть, щоб авторизувати пов'язаний обліковий запис
 oauth_signin_submit=Прив'язати обліковий запис
 openid_connect_submit=Під’єднатися
 openid_connect_title=Підключитися до існуючого облікового запису
@@ -447,27 +447,27 @@ authorization_failed=Помилка авторизації
 sspi_auth_failed=Помилка SSPI-автентифікації
 password_pwned_err=Не вдалося виконати запит до HaveIBeenPwed
 change_unconfirmed_email_summary = Змінити адресу електронної пошти, на яку надходять активаційні листи.
-oauth.signin.error.temporarily_unavailable = Авторизація невдала, через тимчасову не наявність серверу авторизації. Будь-ласка, спробуйте пізніше.
-change_unconfirmed_email = Якщо ви ввели невірну електронну адресу впродовж реєстрації, ви можете змінити її нижче, та підтвердження буде надіслано на нову адресу.
-last_admin = Ви не можете видалити останнього адміністратора. Має бути хоча-б один адміністратор.
+oauth.signin.error.temporarily_unavailable = Авторизація не вдалася, оскільки сервер автентифікації тимчасово недоступний. Будь ласка, спробуйте пізніше.
+change_unconfirmed_email = Якщо ви вказали неправильну електронну адресу впродовж реєстрації, ви можете змінити її нижче. Підтвердження буде надіслано на нову адресу.
+last_admin = Ви не можете видалити останнього адміністратора. Має бути хоча б один адміністратор.
 oauth.signin.error.access_denied = Запит на авторизацію було відхилено.
-change_unconfirmed_email_error = Не вдалося змінити електронну адресу: %w
+change_unconfirmed_email_error = Не вдалося змінити електронну адресу: %v
 manual_activation_only = Зв'яжіться з адміністратором сайту, аби завершити активацію.
 prohibit_login_desc = Ваш обліковий запис було відізвано від взаємодії з екземпляром. Звʼяжіться з адміністратором екземпляру, щоб отримати доступ знову.
-invalid_code_forgot_password = Ваш код підтвердження недійсний. Натисніть тут , аби почати нову сесію.
+invalid_code_forgot_password = Ваш код підтвердження недійсний. Натисніть тут, аби почати нову сесію.
 reset_password_wrong_user = Ви ввійшли як %s, але посилання на відновлення було передбачене для %s
 back_to_sign_in = Назад до входу
 sign_in_openid = Продовжити з OpenID
-openid_signin_desc = Введіть ваше посилання OpenID. Наприклад: alice.openid.example.org, чи https://openid.example.org/alice.
+openid_signin_desc = Введіть ваше посилання OpenID. Наприклад: alice.openid.example.org чи https://openid.example.org/alice.
 invalid_password = Ваш пароль не відповідає тому, що був заданий при створенні облікового запису.
 hint_login = Вже маєте обліковий запис? Увійдіть зараз!
-hint_register = Потрібен обліковий запис? Зереєструватись зараз.
+hint_register = Потрібен обліковий запис? Зареєструйтеся зараз.
 sign_up_button = Зареєструватись зараз.
 sign_up_successful = Обліковий запис успішно створений. Вітаємо!
 
 [mail]
 view_it_on=Переглянути на %s
-link_not_working_do_paste=Не працює? Спробуйте скопіювати та вставити його в свій браузер.
+link_not_working_do_paste=Посилання не працює? Спробуйте його скопіювати та вставити у свій браузер.
 hi_user_x=Привіт %s,
 
 activate_account=Будь ласка, активуйте ваш обліковий запис
@@ -478,10 +478,10 @@ activate_account.text_2=Перейдіть за цим посиланням, щ
 activate_email=Підтвердить вашу адресу електронної пошти
 activate_email.text=Перейдіть за цим посиланням, щоб підтвердити вашу електронну адресу в %s:
 
-register_notify=Ласкаво просимо у %s
+register_notify=Вітаємо у %s
 register_notify.title=%[1]s, ласкаво просимо до %[2]s
 register_notify.text_1=це ваша е-пошта для підтвердження реєстрації для %s!
-register_notify.text_2=Тепер ви можете увійти як: %s.
+register_notify.text_2=Ви можете ввійти до свого облікового запису, використовуючи ім'я: %s
 register_notify.text_3=Якщо цей обліковий запис було створено для вас, будь ласка, спочатку встановіть свій пароль.
 
 reset_password=Відновлення вашого облікового запису
@@ -516,21 +516,21 @@ release.downloads=Звантаження:
 release.download.zip=Вихідний код (ZIP)
 release.download.targz=Вихідний код (TAR.GZ)
 
-repo.transfer.subject_to=%s бажає передати"%s" в %s
-repo.transfer.subject_to_you=%s бажає передати"%s" вам
+repo.transfer.subject_to=%s бажає передати репозиторій «%s» в %s
+repo.transfer.subject_to_you=%s бажає передати вам репозиторій «%s»
 repo.transfer.to_you=вам
 repo.transfer.body=Щоб прийняти або відхилити перейдіть до %s або просто ігноруйте.
 
 repo.collaborator.added.subject=%s додав вас до %s
 repo.collaborator.added.text=Ви були додані в якості співавтора репозиторію:
 primary_mail_change.subject = Ваша основна пошта була змінена
-totp_disabled.subject = TOTP було відімкнено
-totp_disabled.text_1 = Тимчасовий одноразовий пароль (TOTP) на вашому обліковому записи було відімкнено.
+totp_disabled.subject = TOTP було вимкнено
+totp_disabled.text_1 = Тимчасовий одноразовий пароль (TOTP) на вашому обліковому записі було вимкнено.
 password_change.subject = Ваш пароль було успішно змінено
 password_change.text_1 = Пароль до вашого облікового запису щойно був змінений.
 reply = чи відповісти напряму з електронної адреси
 admin.new_user.user_info = Інформація користувача
-admin.new_user.text = Будь-ласка, натисніть тут, щоб керувати цим користувачем із панелі адміністрації.
+admin.new_user.text = Будь ласка, натисніть тут, щоб керувати цим користувачем із панелі адміністрації.
 admin.new_user.subject = Новий користувач %s щойно ввійшов
 
 
@@ -604,7 +604,7 @@ enterred_invalid_owner_name=Ім'я нового власника не є дій
 enterred_invalid_password=Введений вами пароль некоректний.
 user_not_exist=Даний користувач не існує.
 team_not_exist=Команда не існує.
-last_org_owner=Ви не можете видалити останнього користувача з команди 'власники'. У кожній команді має бути принаймні один власник.
+last_org_owner=Ви не можете видалити останнього користувача з команди «Власники». В організації має бути принаймні один власник.
 cannot_add_org_to_team=Організацію неможливо додати як учасника команди.
 
 invalid_ssh_key=Неможливо перевірити ваш SSH ключ: %s
@@ -623,7 +623,7 @@ change_avatar=Змінити свій аватар…
 repositories=Репозиторії
 activity=Публічна активність
 followers_few=%d читачі
-starred=Обрані Репозиторії
+starred=Обрані репозиторії
 watched=Відстежувані репозиторії
 projects=Проєкт
 overview=Огляд
@@ -645,13 +645,13 @@ appearance=Зовнішній вигляд
 password=Пароль
 security=Безпека
 avatar=Аватар
-ssh_gpg_keys=SSH / GPG ключі
+ssh_gpg_keys=Ключі SSH / GPG
 social=Соціальні облікові записи
 applications=Додатки
-orgs=Керування організаціями
+orgs=Організації
 repos=Репозиторії
 delete=Видалити обліковий запис
-twofa=Двофакторна авторизація
+twofa=Двофакторна авторизація (TOTP)
 account_link=Прив'язані облікові записи
 organization=Організації
 
@@ -660,9 +660,9 @@ password_username_disabled=Нелокальним користувачам за
 full_name=Повне ім'я
 website=Веб-сайт
 location=Місцезнаходження
-update_theme=Оновити тему
+update_theme=Змінити тему
 update_profile=Оновити профіль
-update_language=Оновити мову
+update_language=Змінити мову
 update_language_success=Мову оновлено.
 update_profile_success=Профіль успішно оновлено.
 change_username=Ваше Ім'я кристувача було змінено.
@@ -679,7 +679,7 @@ comment_type_group_project=Проєкт
 privacy=Приватність
 keep_activity_private_popup=Показувати вашу активність лише Вам та адміністраторам
 
-lookup_avatar_by_mail=Знайти Аватар за адресою електронної пошти
+lookup_avatar_by_mail=Знайти аватар за адресою електронної пошти
 federated_avatar_lookup=Знайти зовнішній аватар
 enable_custom_avatar=Увімкнути користувацькі аватари
 choose_new_avatar=Оберіть новий аватар
@@ -698,8 +698,8 @@ password_change_disabled=Нелокальні акаунти не можуть 
 
 emails=Адреса електронної пошти
 manage_emails=Керування адресами ел. пошти
-manage_themes=Виберіть тему за замовчуванням
-manage_openid=Керування OpenID
+manage_themes=Тема за замовчуванням
+manage_openid=Адреси OpenID
 theme_desc=Ця тема буде типовою для всього сайту.
 primary=Основний
 activated=Активовано
@@ -716,8 +716,8 @@ theme_update_error=Вибрана тема не існує.
 openid_deletion=Видалити адресу OpenID
 openid_deletion_desc=Видалення цієї OpenID-адреси з вашого облікового запису забороняє вам входити з ним. Продовжити?
 openid_deletion_success=Адреса OpenID була видалена.
-add_new_email=Додати нову адресу електронної пошти
-add_new_openid=Додати новий OpenID URI
+add_new_email=Додати адресу електронної пошти
+add_new_openid=Додати новий URI OpenID
 add_email=Додати адресу електронної пошти
 add_openid=Додати OpenID URI
 add_email_success=Додано нову адресу електронної пошти.
@@ -726,9 +726,9 @@ add_openid_success=Нова адреса OpenID була додана.
 keep_email_private=Приховати адресу електронної пошти
 openid_desc=OpenID дозволяє делегувати аутентифікацію зовнішньому постачальнику послуг.
 
-manage_ssh_keys=Керувати SSH ключами
+manage_ssh_keys=Керувати ключами SSH
 manage_ssh_principals=Управління SSH сертифікатами користувачів
-manage_gpg_keys=Керувати GPG ключами
+manage_gpg_keys=Керувати ключами GPG
 add_key=Додати ключ
 ssh_desc=Ці відкриті SSH-ключі пов'язані з вашим обліковим записом. Відповідні приватні ключі дозволяють отримати повний доступ до ваших репозиторіїв.
 principal_desc=Ці настройки SSH сертифікатів вказані у вашому обліковому записі та надають повний доступ до ваших репозиторіїв.
@@ -737,7 +737,7 @@ ssh_helper=Потрібна допомога? Дивіться
 gpg_helper= Потрібна допомога?  Перегляньте посібник GitHub  про GPG .
 add_new_key=Додати SSH ключ
 add_new_gpg_key=Додати GPG ключ
-key_content_ssh_placeholder=Починається з 'ssh-ed25519', 'ssh-rsa', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', 'ecdsa-sha2-nistp521', 'sk-ecdsa-sha2-nistp256@openssh.com', або 'sk-ssh-ed25519@openssh.com'
+key_content_ssh_placeholder=Починається з «ssh-ed25519», «ssh-rsa», «ecdsa-sha2-nistp256», «ecdsa-sha2-nistp384», «ecdsa-sha2-nistp521», «sk-ecdsa-sha2-nistp256@openssh.com» або «sk-ssh-ed25519@openssh.com»
 key_content_gpg_placeholder=Починається з '-----BEGIN PGP PUBLIC KEY BLOCK-----'
 add_new_principal=Додати користувача
 ssh_key_been_used=Цей SSH ключ вже був додано до сервера.
@@ -768,8 +768,8 @@ key_name=Ім'я ключа
 key_content=Зміст
 principal_content=Зміст
 delete_key=Видалити
-ssh_key_deletion=Видалити SSH ключ
-gpg_key_deletion=Видалити GPG ключ
+ssh_key_deletion=Видалити ключ SSH
+gpg_key_deletion=Видалити ключ GPG
 ssh_principal_deletion=Видалити SSH сертифікат користувача
 ssh_key_deletion_desc=Видалення ключа SSH скасовує доступ до вашого облікового запису. Продовжити?
 gpg_key_deletion_desc=Видалення GPG ключа скасовує перевірку підписаних ним комітів. Продовжити?
@@ -792,7 +792,7 @@ ssh_externally_managed=Цей ключ SSH має зовнішнє управл
 manage_social=Керувати зв'язаними обліковими записами соціальних мереж
 unbind=Від'єднати
 
-manage_access_token=Керування токенами доступу
+manage_access_token=Токени доступу
 generate_new_token=Згенерувати новий токен
 tokens_desc=Ці токени надають доступ до вашого облікового запису за допомогою Forgejo API.
 token_name=Ім'я токену
@@ -818,7 +818,7 @@ oauth2_application_name=Назва програми
 save_application=Зберегти
 oauth2_client_id=ID Клієнта
 oauth2_client_secret=Ключ клієнта
-oauth2_regenerate_secret=Відновити ключ
+oauth2_regenerate_secret=Згенерувати новий ключ
 oauth2_regenerate_secret_hint=Ви втратили свій ключ?
 oauth2_application_edit=Редагувати
 oauth2_application_create_description=Програми OAuth2 надають вашим стороннім програмам доступ до облікових записів користувачів у цьому екземплярі.
@@ -846,22 +846,22 @@ twofa_enrolled=Для вашого облікового запису було в
 twofa_failed_get_secret=Не вдалося отримати секрет.
 
 
-manage_account_links=Керування обліковими записами
+manage_account_links=Пов'язані облікові записи
 manage_account_links_desc=Ці зовнішні акаунти прив'язані до вашого аккаунту Forgejo.
 account_links_not_available=Наразі немає зовнішніх облікових записів, пов'язаних із вашим обліковим записом Forgejo.
 link_account=Прив'язати обліковий запис
-remove_account_link=Видалити облікові записи
+remove_account_link=Видалити пов'язаний обліковий запис
 remove_account_link_desc=Видалення пов'язаного облікового запису відкликає його доступ до вашого облікового запису Forgejo. Продовжити?
 remove_account_link_success=Зв'язаний обліковий запис видалено.
 
 
 orgs_none=Ви не є учасником будь-якої організації.
 
-delete_account=Видалити ваш обліковий запис
+delete_account=Видалити свій обліковий запис
 delete_prompt=Ця операція остаточно видалить обліковий запис користувача. Це НЕ МОЖЛИВО відмінити.
 delete_with_all_comments=Ваш обліковий запис молодший за %s днів. Щоб уникнути коментарів-привидів, всі запити/PR коментрарі будуть видалені з ним.
-confirm_delete_account=Підтвердження видалення
-delete_account_title=Видалити цей обліковий запис
+confirm_delete_account=Підтвердити видалення
+delete_account_title=Видалити обліковий запис
 delete_account_desc=Ви впевнені, що хочете остаточно видалити цей обліковий запис?
 
 email_notifications.enable=Увімкнути сповіщення email
@@ -878,24 +878,25 @@ comment_type_group_time_tracking = Облік часу
 location_placeholder = Поділіться з іншими, де приблизно ви знаходитесь
 biography_placeholder = Розкажіть трохи про себе! (Можете використати Markdown)
 hidden_comment_types = Приховані типи коментарів
-keep_activity_private = Приховати Активність зі сторінки профілю
+keep_activity_private = Приховати активність зі сторінки профілю
 blocked_users = Заблоковані користувачі
-blocked_users_none = Ви не заблокували жодного користувача.
+blocked_users_none = Немає заблокованих користувачів.
 profile_desc = Керуйте тим, як ваш профіль відображається іншим користувачам. Ваша основна адреса електронної пошти буде використовуватися для сповіщень, відновлення пароля та операцій з Git через веб-інтерфейс.
 retype_new_password = Підтвердіть новий пароль
 email_desc = Ваша основна адреса електронної пошти буде використовуватися для сповіщень, відновлення пароля і, за умови, що вона не прихована, для операцій з Git через веб-інтерфейс.
 visibility.limited_tooltip = Видимий(а) тільки для авторизованих користувачів
 visibility.private_tooltip = Видимий(а) тільки для учасників організацій, до яких ви приєдналися
 twofa_scratch_token_regenerated = Ваш одноразовий код відновлення наразі %s. Збережіть його у безпечному місці, бо він не буде показаний знову.
-authorized_oauth2_applications_description = Ви надали доступ до вашого власного облікового запису Forgejo до цих застосунків від третіх лиць. Будь-ласка відкличте доступ із застосунків, що більше не використовуються.
+authorized_oauth2_applications_description = Ви надали цим стороннім застосункам доступ до вашого облікового запису Forgejo. Будь ласка, відкличте доступ із застосунків, що більше не використовуються.
 webauthn_delete_key = Видалити ключ безпеки
 webauthn_key_loss_warning = Якщо ви втратите ключ безпеки, то втратите доступ до вашого облікового запису.
 webauthn_register_key = Додати ключ безпеки
 webauthn_nickname = Псевдонім
 webauthn_desc = Ключі безпеки це апаратні пристрої, що містять криптографічні ключі. Вони можуть використовуватись для двократної автентифікації. Ключі безпеки мають підтримувати стандарт WebAuthn Authenticator.
 revoke_oauth2_grant_success = Доступ відкликано успішно.
-twofa_recovery_tip = Якщо ви втратите ваш пристрій, ви зможете використати одноразовий код відновлення щоб знову отримати доступ до вашого облікового запису.
-webauthn_delete_key_desc = Якщо ви видалите ключ безпеки ви більше не зможете з ним зайти. Продовжити?
+twofa_recovery_tip = Якщо ви втратите ваш пристрій, ви зможете використати одноразовий код відновлення, щоб знову отримати доступ до свого облікового запису.
+webauthn_delete_key_desc = Якщо ви видалите ключ безпеки, ви більше не зможете з ним зайти. Продовжити?
+change_password = Зміна пароля
 
 [repo]
 owner=Власник
@@ -904,7 +905,7 @@ repo_name=Назва репозиторію
 repo_name_helper=Хороші назви репозиторіїв використовують короткі, унікальні ключові слова що легко запам'ятати.
 repo_size=Розмір репозиторію
 template=Шаблон
-template_select=Оберіть шаблон.
+template_select=Оберіть шаблон
 template_helper=Зробити репозиторій шаблоном
 template_description=Шаблонні репозиторії дозволяють користувачам генерувати нові репозиторії із такою ж структурою директорій, файлами та додатковими налаштуваннями.
 visibility=Видимість
@@ -925,17 +926,17 @@ generate_from=Генерувати з
 repo_desc=Опис
 repo_desc_helper=Введіть короткий опис (опціонально)
 repo_lang=Мова
-repo_gitignore_helper=Виберіть шаблон .gitignore.
+repo_gitignore_helper=Виберіть шаблони .gitignore
 repo_gitignore_helper_desc=Оберіть з списку мовних шаблонів файли, які не будуть відстежуватись. Типові артефакти, які генеруються за допомогою інструментів побудови кожної мови, за замовчуванням включені до .gitignor.
-issue_labels=Мітки задачі
-issue_labels_helper=Вибрати мітку для задачі.
+issue_labels=Мітки
+issue_labels_helper=Виберіть набір міток
 license=Ліцензія
-license_helper=Виберіть ліцензійний файл.
+license_helper=Виберіть файл ліцензії
 license_helper_desc=Ліцензія регулює те, що інші можуть і не можуть робити з вашим кодом. Не впевнені, що саме підходить для вашого проєкту? Дивіться Виберіть ліцензію.
 readme=README
-readme_helper=Виберіть шаблон README.
+readme_helper=Виберіть шаблон README
 readme_helper_desc=Це місце, де ви можете написати повний опис вашого проєкту.
-auto_init=Ініціалізувати репозиторій (Додає .gitignore, LICENSE та README)
+auto_init=Ініціалізувати репозиторій (Додає .gitignore, License та README)
 trust_model_helper=Виберіть модель довіри для підтвердження підпису. Можливі варіанти:
 trust_model_helper_collaborator=Співавтор: підписи довіри від співавторів
 trust_model_helper_committer=Учасник: довірені підписи участників
@@ -992,7 +993,7 @@ template.git_hooks=Перехоплювачі Git
 template.webhooks=Webhook'и
 template.topics=Теми
 template.avatar=Аватар
-template.issue_labels=Мітки задачі
+template.issue_labels=Мітки задач
 template.one_item=Слід обрати хоча б один елемент шаблону
 template.invalid=Слід обрати шаблонний репозиторій
 
@@ -1118,7 +1119,7 @@ lines=рядки
 
 editor.new_file=Новий файл
 editor.upload_file=Завантажити файл
-editor.edit_file=Редагування файлу
+editor.edit_file=Редагувати файл
 editor.preview_changes=Попередній перегляд змін
 editor.cannot_edit_lfs_files=Файли LFS не можна редагувати в веб-інтерфейсі.
 editor.cannot_edit_non_text_files=Бінарні файли не можливо редагувати у веб-інтерфейсі.
@@ -1134,7 +1135,7 @@ editor.or=або
 editor.cancel_lower=Скасувати
 editor.commit_signed_changes=Внести підписані зміни
 editor.commit_changes=Закомітити зміни
-editor.add_tmpl=Додати ''
+editor.add_tmpl=Додати «»
 editor.commit_message_desc=Додати необов'язковий розширений опис…
 editor.signoff_desc=Додати повідомленню в журналі комітів рядок Signed-off-by від свого імені.
 editor.commit_directly_to_this_branch=Зробіть коміт прямо в гілку %s.
@@ -1169,13 +1170,13 @@ commits.newer=Новіше
 commits.signed_by=Підписано
 commits.signed_by_untrusted_user=Підписаний недовіреним користувачем
 commits.signed_by_untrusted_user_unmatched=Підписаний недовіреним користувачем, який не відповідає комітеру
-commits.gpg_key_id=Ідентифікатор GPG ключа
+commits.gpg_key_id=Ідентифікатор ключа GPG
 
 
 commitstatus.error=Помилка
 commitstatus.pending=Очікування
 
-ext_issues=Доступ до зовнішніх задач
+ext_issues=Зовнішні задачі
 ext_issues.desc=Посилання на зовнішню систему відстеження задач.
 
 projects=Проєкти
@@ -1189,13 +1190,13 @@ projects.new_subheader=Координуйте, відстежуйте та он
 projects.deletion=Видалити проєкт
 projects.deletion_desc=Видалення проєкту видаляє його з усіх пов'язаних задач. Продовжити?
 projects.deletion_success=Проєкт видалено.
-projects.edit=Редагувати проєкти
+projects.edit=Редагувати проєкт
 projects.edit_subheader=Проєкти організовують задачі та відстежують прогрес.
 projects.modify=Оновити проєкт
-projects.type.none=Відсутній
+projects.type.none=Немає
 projects.type.basic_kanban=Спрощений канбан
 projects.type.bug_triage=Сортування помилок
-projects.template.desc=Шаблон проєкту
+projects.template.desc=Шаблон
 projects.template.desc_helper=Оберіть шаблон проєкту, аби почати
 projects.type.uncategorized=Без категорії
 projects.column.edit_title=Назва
@@ -1213,7 +1214,7 @@ issues.filter_reviewers=Фільтр рецензентів
 issues.new=Нова задача
 issues.new.title_empty=Заголовок не може бути пустим
 issues.new.labels=Мітки
-issues.new.no_label=Без мітки
+issues.new.no_label=Без міток
 issues.new.clear_labels=Очистити мітки
 issues.new.projects=Проєкти
 issues.new.clear_projects=Скинути проєкти
@@ -1228,7 +1229,7 @@ issues.new.open_milestone=Активні етапи
 issues.new.closed_milestone=Закриті етапи
 issues.new.assignees=Виконавці
 issues.new.clear_assignees=Прибрати виконавців
-issues.new.no_assignees=Немає виконавця
+issues.new.no_assignees=Немає виконавців
 issues.new.no_reviewers=Немає рецензентів
 issues.choose.get_started=Початок роботи
 issues.choose.open_external_link=Відкрити
@@ -1241,7 +1242,7 @@ issues.new_label_placeholder=Назва мітки
 issues.new_label_desc_placeholder=Опис
 issues.create_label=Створити мітку
 issues.label_templates.title=Завантажити визначений набір міток
-issues.label_templates.info=Ще немає міток. Натисніть 'Нова мітка' або використовуйте попередньо визначений набір міток:
+issues.label_templates.info=Ще немає міток. Натисніть «Нова мітка» або використовуйте попередньо визначений набір міток:
 issues.label_templates.helper=Оберіть набір міток
 issues.label_templates.use=Використовувати набір міток
 issues.add_label=додано %s з міткою %s
@@ -1414,11 +1415,11 @@ issues.due_date_form=рррр-мм-дд
 issues.due_date_form_add=Додати дату завершення
 issues.due_date_form_edit=Редагувати
 issues.due_date_form_remove=Видалити
-issues.due_date_not_set=Термін виконання не встановлений.
+issues.due_date_not_set=Термін виконання не встановлено.
 issues.due_date_added=додав(ла) дату завершення %s %s
 issues.due_date_remove=видалив(ла) дату завершення %s %s
 issues.due_date_overdue=Прострочено
-issues.due_date_invalid=Термін дії не дійсний або знаходиться за межами допустимого діапазону. Будь ласка використовуйте формат 'yyyy-mm-dd'.
+issues.due_date_invalid=Термін дії недійсний або знаходиться за межами допустимого діапазону. Будь ласка, використовуйте формат «рррр-мм-дд».
 issues.dependency.title=Залежності
 issues.dependency.add=Додати залежність…
 issues.dependency.cancel=Відмінити
@@ -1512,7 +1513,7 @@ pulls.add_prefix=Додати префікс %s
 pulls.remove_prefix=Видалити префікс %s
 pulls.data_broken=Зміст цього запиту було порушено внаслідок видалення інформації Форком. Цей запит тягнеться через відсутність інформації про вилучення.
 pulls.files_conflicted=Цей запит має зміни, що конфліктують з цільовою гілкою.
-pulls.is_checking=Триває перевірка конфліктів, будь ласка обновіть сторінку дещо пізніше.
+pulls.is_checking=Триває перевірка конфліктів. Оновіть сторінку дещо пізніше.
 pulls.required_status_check_failed=Деякі необхідні перевірки виконані з помилками.
 pulls.required_status_check_missing=Декілька з необхідних перевірок відсутні.
 pulls.required_status_check_administrator=Як адміністратор ви все одно можете об'єднати цей запит на злиття.
@@ -1544,9 +1545,9 @@ pulls.require_signed_wont_sign=Гілка вимагає підписаних к
 
 pulls.invalid_merge_option=Цей параметр злиття не можна використовувати для цього Pull Request'а.
 pulls.merge_conflict=Злиття не вдалося: Був конфлікт при злиття. Підказка: спробуйте іншу стратегію
-pulls.merge_conflict_summary=Помилка
+pulls.merge_conflict_summary=Повідомлення про помилку
 pulls.rebase_conflict=Злиття не вдалося: відбувся конфлікт під час злиття: %[1]s. Підказка: спробуйте іншу стратегію
-pulls.rebase_conflict_summary=Помилка
+pulls.rebase_conflict_summary=Повідомлення про помилку
 pulls.unrelated_histories=Помилка злиття: head та base злиття не мають спільної історії. Підказка: спробуйте іншу стратегію
 pulls.merge_out_of_date=Помилка злиття: base було оновлено, поки відбувалося злиття. Підказка: спробуйте знову.
 pulls.push_rejected_summary=Повне повідомлення про відмову
@@ -1583,7 +1584,7 @@ milestones.title=Заголовок
 milestones.desc=Опис
 milestones.due_date=Дата завершення (опціонально)
 milestones.clear=Очистити
-milestones.invalid_due_date_format=Дата завершення має бути в форматі 'рррр-мм-дд'.
+milestones.invalid_due_date_format=Термін виконання має бути у форматі «рррр-мм-дд».
 milestones.edit=Редагувати етап
 milestones.edit_subheader=Створюйте етапи для організації ваших задач.
 milestones.cancel=Відмінити
@@ -1631,31 +1632,31 @@ activity.period.quarterly=3 місяці
 activity.period.semiyearly=6 місяців
 activity.period.yearly=1 рік
 activity.overview=Огляд
-activity.active_prs_count_1=%d Активний запити на злиття
-activity.active_prs_count_n=%d Активні запити на злиття
+activity.active_prs_count_1=%d активний запит на злиття
+activity.active_prs_count_n=%d активних запитів на злиття
 activity.merged_prs_count_1=Злитий запит на злиття
 activity.merged_prs_count_n=Злиті запити на злиття
 activity.opened_prs_count_1=Запропонований запит на злиття
 activity.opened_prs_count_n=Запропонованих запитів на злиття
 activity.title.user_1=%d користувачем
 activity.title.user_n=%d користувачами
-activity.title.prs_1=%d Запит на злиття
-activity.title.prs_n=%d Запитів на злиття
+activity.title.prs_1=%d запит на злиття
+activity.title.prs_n=%d запитів на злиття
 activity.title.prs_merged_by=%s злито %s
 activity.title.prs_opened_by=%s запропоновано %s
 activity.merged_prs_label=Злито
 activity.opened_prs_label=Запропоновано
-activity.active_issues_count_1=%d Активна задача
-activity.active_issues_count_n=%d Активні задачі
+activity.active_issues_count_1=%d активна задача
+activity.active_issues_count_n=%d активних задач
 activity.closed_issues_count_1=Закрита задача
 activity.closed_issues_count_n=Закриті задачі
-activity.title.issues_1=%d Задач
-activity.title.issues_n=%d Задач
+activity.title.issues_1=%d задача
+activity.title.issues_n=%d задач
 activity.title.issues_closed_from=%s закрито %s
 activity.title.issues_created_by=%s створена(і) %s
 activity.closed_issue_label=Закрито
 activity.new_issues_count_1=Нова задача
-activity.new_issues_count_n=Нові Задачі
+activity.new_issues_count_n=Нові задачі
 activity.new_issue_label=Відкриті
 activity.title.unresolved_conv_1=%d Незавершене обговорення
 activity.title.unresolved_conv_n=%d Незавершених обговорень
@@ -1687,7 +1688,7 @@ activity.git_stats_and_deletions=та
 activity.git_stats_deletion_1=%d видалений
 activity.git_stats_deletion_n=%d видалені
 
-contributors.contribution_type.commits=Коментарі
+contributors.contribution_type.commits=Коміти
 
 search=Пошук
 search.search_repo=Пошук репозиторію
@@ -1715,12 +1716,12 @@ settings.mirror_settings.direction.pull=Pull
 settings.mirror_settings.direction.push=Push
 settings.mirror_settings.last_update=Останнє оновлення
 settings.mirror_settings.push_mirror.none=Не налаштовано дзеркало push
-settings.mirror_settings.push_mirror.remote_url=URL віддаленого репозитарія git
+settings.mirror_settings.push_mirror.remote_url=URL віддаленого репозиторію Git
 settings.mirror_settings.push_mirror.add=Додати Push дзеркало
 
 settings.sync_mirror=Синхронізувати зараз
 settings.site=Веб-сайт
-settings.update_settings=Оновити налаштування
+settings.update_settings=Зберегти налаштування
 settings.branches.update_default_branch=Оновити гілку за замовчуванням
 settings.advanced_settings=Додаткові налаштування
 settings.wiki_desc=Увімкнути репозиторії Вікі
@@ -1816,7 +1817,7 @@ settings.org_not_allowed_to_be_collaborator=Організації не можу
 settings.change_team_access_not_allowed=Зміна доступу команди до репозитарію обмежена власником організації
 settings.team_not_in_organization=Команда та репозитарій мають привязки до різних організацій
 settings.teams=Команди
-settings.add_team=Додати Команду
+settings.add_team=Додати команду
 settings.add_team_duplicate=Команда вже має привязку до репозитарію
 settings.add_team_success=Команда отримала доступ до репозиторію.
 settings.search_team=Знайти команду…
@@ -1843,7 +1844,7 @@ settings.update_githook=Оновити хук
 settings.add_webhook_desc=Forgejo буде відправляти POST запити на вказану URL адресу, з інформацією про події, що відбуваються. Подробиці на сторінці  інструкції по використанню web-хуків .
 settings.payload_url=Цільова URL-адреса
 settings.http_method=Метод HTTP
-settings.content_type=Тип змісту
+settings.content_type=Тип вмісту POST
 settings.secret=Секрет
 settings.slack_username=Ім'я кристувача
 settings.slack_icon_url=URL іконки
@@ -1852,7 +1853,7 @@ settings.discord_username=Ім'я кристувача
 settings.discord_icon_url=URL іконки
 settings.event_desc=Тригер:
 settings.event_push_only=Push події
-settings.event_send_everything=Всі події
+settings.event_send_everything=Усі події
 settings.event_choose=Власні події…
 settings.event_header_repository=Події репозиторію
 settings.event_create=Створити
@@ -1871,28 +1872,28 @@ settings.event_repository_desc=Репозиторій створений або
 settings.event_header_issue=Події задачі
 settings.event_issues=Задачі
 settings.event_issues_desc=Задача відкрита, закрита, повторно відкрита або відредагована.
-settings.event_issue_assign=Задача прив'язана
+settings.event_issue_assign=Призначення
 settings.event_issue_assign_desc=Задачу призначено або скасовано.
-settings.event_issue_label=Задача з міткою
-settings.event_issue_label_desc=Мітки задачі оновлено або видалено.
+settings.event_issue_label=Мітки
+settings.event_issue_label_desc=Додавання або видалення міток задач.
 settings.event_issue_milestone=Задача з етапом
 settings.event_issue_milestone_desc=Задача призначена на етап або видалена з етапу.
-settings.event_issue_comment=Коментар задачі
+settings.event_issue_comment=Коментарі
 settings.event_issue_comment_desc=Коментар задачі створено, видалено чи відредаговано.
-settings.event_header_pull_request=Події запиту злиття
+settings.event_header_pull_request=Події запиту на злиття
 settings.event_pull_request=Запити до злиття
 settings.event_pull_request_desc=Запит до злиття відкрито, закрито, перевідкрито або відредаговано.
-settings.event_pull_request_assign=Запит на злиття призначено
+settings.event_pull_request_assign=Призначення
 settings.event_pull_request_assign_desc=Запит про злиття призначено або скасовано.
-settings.event_pull_request_label=Запиту на злиття призначена мітка
+settings.event_pull_request_label=Мітки
 settings.event_pull_request_label_desc=Мітка запиту на злиття оновлена або очищена.
 settings.event_pull_request_milestone=Запит на злиття призначений на етап
 settings.event_pull_request_milestone_desc=Запит на злиття призначений на етап або видалений з етапу.
-settings.event_pull_request_comment=Запит на злиття прокоментований
+settings.event_pull_request_comment=Коментарі
 settings.event_pull_request_comment_desc=Коментар запиту на злиття створено, відредаговано чи видалено.
 settings.event_pull_request_review=Запит на злиття рецензовано
 settings.event_pull_request_review_desc=Коментар запиту до злиття підтверджений, відхилений або рецензований.
-settings.event_pull_request_sync=Запит на злиття синхронізується
+settings.event_pull_request_sync=Синхронізовано
 settings.event_pull_request_sync_desc=Запит до злиття синхронізовано.
 settings.branch_filter=Фільтр гілок
 settings.branch_filter_desc=Білий список повідомлень для push, створення гілок та видалення гілок, визначається як glob шаблон. Якщо він пустий або містить *, повідомлення для вісіх гілок ввімкнені. Дівіться %[2]s документацію на синтаксис. Наприклад: master, {master,release*}.
@@ -1925,7 +1926,7 @@ settings.protected_branch=Захист гілки
 settings.protected_branch_can_push=Дозволити push?
 settings.protected_branch_can_push_yes=Ви можете виконувати push
 settings.protected_branch_can_push_no=Ви не можете виконувати push
-settings.branch_protection=Захист гілки %s
+settings.branch_protection=Правила захисту для гілки «%s»
 settings.protect_this_branch=Захистити цю гілку
 settings.protect_this_branch_desc=Запобігає видаленню гілки та обмежує виконання в ній push та злиття.
 settings.protect_disable_push=Заборонити Push
@@ -1935,30 +1936,30 @@ settings.protect_enable_push_desc=Будь-хто із правом запису
 settings.protect_whitelist_committers=Білий список обмеження Push
 settings.protect_whitelist_committers_desc=Лише користувачі та команди з білого списку зможуть виконувати push в цій гілці (за виключеням force push).
 settings.protect_whitelist_deploy_keys=Білий список ключів розгортання з правом на запис.
-settings.protect_whitelist_users=Користувачі, які можуть робити push в цю гілку:
+settings.protect_whitelist_users=Користувачі, які можуть робити push в цю гілку
 settings.protect_whitelist_search_users=Пошук користувачів…
-settings.protect_whitelist_teams=Команди, учасники яких можуть робити push в цю гілку:
+settings.protect_whitelist_teams=Команди, учасники яких можуть робити push в цю гілку
 settings.protect_whitelist_search_teams=Пошук команд…
 settings.protect_merge_whitelist_committers=Обмежити право на прийняття Pull Request'ів в цю гілку списком
 settings.protect_merge_whitelist_committers_desc=Ви можете додавати користувачів або цілі команди в 'білий' список цієї гілки. Тільки присутні в списку зможуть приймати запити на злиття. В іншому випадку будь-хто з правами запису до головного репозиторію буде володіти такою можливістю.
 settings.protect_merge_whitelist_users=Користувачі з правом на прийняття Pull Request'ів в цю гілку:
-settings.protect_merge_whitelist_teams=Команди, яким дозволено злиття:
+settings.protect_merge_whitelist_teams=Команди, яким дозволено злиття
 settings.protect_check_status_contexts=Увімкнути перевірку стану
 settings.protect_check_status_contexts_desc=Вимагати успішного проходження перевірок стану перед злиттям. Оберіть перевірки стану, які слід провести для гілок, перед їх об'єднанням з гілкою, що відповідає цьому правилу. Коли цей пункт увімкнено, коміти спершу надсилаються до іншої гілки, а потім зливаються або надсилаються безпосередньо до гілки, яка відповідає цьому правилу після успішного проходження перевірок стану. Якщо не вибрано контекст, останній коміт має успішно проходити перевірки, незалежно від контексту.
 settings.protect_check_status_contexts_list=Перевірки статусу знайдено для репозитарію за минулий тиждень
-settings.protect_required_approvals=Необхідно схвалення:
+settings.protect_required_approvals=Необхідно схвалення
 settings.protect_required_approvals_desc=Дозволити об'єднання запитів на злиття лише із достатньою кількістю позитивних рецензій.
 settings.protect_approvals_whitelist_enabled=Обмежити схвалення користувачами та командами з білого списку
 settings.protect_approvals_whitelist_enabled_desc=Лише рецензії користувачів та команд в білому списку впливають на число отриманих затверджень. Без білого списку будуть враховані рецензії будь-кого із доступом на запис.
-settings.protect_approvals_whitelist_users=Білий список рецензентів:
-settings.protect_approvals_whitelist_teams=Білий список команд рецензентів:
+settings.protect_approvals_whitelist_users=Білий список рецензентів
+settings.protect_approvals_whitelist_teams=Білий список команд рецензентів
 settings.dismiss_stale_approvals=Відхилити застарілі погодження
 settings.dismiss_stale_approvals_desc=Коли нові коміти що змінюють вміст пулл-запиту відправляються в гілку, старі погодження будуть відхилені.
-settings.require_signed_commits=Потрібно підписані коміти
+settings.require_signed_commits=Вимагати підпис комітів
 settings.require_signed_commits_desc=Відхиляти push до цієї гілки, якщо вони не підписані або підпис неможливо перевірити.
 settings.add_protected_branch=Увімкнути захист
 settings.delete_protected_branch=Вимкнути захист
-settings.protected_branch_deletion=Відключити захист гілки
+settings.protected_branch_deletion=Вимкнути захист гілки
 settings.protected_branch_deletion_desc=Будь-який користувач з дозволами на запис зможе виконувати push в цю гілку. Ви впевнені?
 settings.block_rejected_reviews=Блокувати злиття при відкидаючих рецензіях
 settings.block_rejected_reviews_desc=Злиття буде недоступним, якщо є запит змін від офіційних рецензентів, навіть за наявності достатньої кількості схвалень.
@@ -1967,7 +1968,7 @@ settings.block_on_official_review_requests_desc=Об’єднання немож
 settings.block_outdated_branch=Блокувати злиття, якщо запит на злиття застарів
 settings.block_outdated_branch_desc=Злиття буде неможливим, коли головна гілка позаду основної.
 settings.default_branch_desc=Головна гілка є 'базовою' для вашого репозиторія, на яку за замовчуванням спрямовані всі запити на злиття і яка є обличчям вашого репозиторія. Перше, що побачить відвідувач - це зміст головної гілки. Виберіть її з уже існуючих:
-settings.default_merge_style_desc=Стиль злиття за замовчуванням:
+settings.default_merge_style_desc=Стиль злиття за замовчуванням
 settings.choose_branch=Оберіть гілку…
 settings.no_protected_branch=Немає захищених гілок.
 settings.edit_protected_branch=Редагувати
@@ -1979,15 +1980,15 @@ settings.tags.protection.allowed=Дозволено
 settings.tags.protection.allowed.users=Дозволені користувачі
 settings.tags.protection.allowed.teams=Дозволені команди
 settings.tags.protection.allowed.noone=Ніхто
-settings.tags.protection.create=Захистна мітка
+settings.tags.protection.create=Додати правило
 settings.tags.protection.none=Там не немає захищених міток.
 settings.bot_token=Токен для бота
 settings.chat_id=Чат ID
 settings.matrix.homeserver_url=URL домашньої сторінки
 settings.matrix.room_id=Номер кімнати
 settings.matrix.message_type=Тип повідомлення
-settings.archive.button=Архівний репозиторій
-settings.archive.header=Відправити репозиторій в архів
+settings.archive.button=Архівувати репозиторій
+settings.archive.header=Архівувати цей репозиторій
 settings.archive.success=Репозиторію успішно присвоєно статус архівного.
 settings.archive.error=Сталася помилка при спробі архівувати репозиторій. Докладнішу інформацію див. у журналі.
 settings.archive.error_ismirror=Неможливо архівувати дзеркальний репозиротрій.
@@ -2015,7 +2016,7 @@ settings.lfs_force_unlock=Примусове розблокування
 settings.lfs_pointers.found=Знайдено %d посилань на blob - %d пов'язаних, %d непов'язаних (%d відсутні у сховищі)
 settings.lfs_pointers.sha=Blob SHA
 settings.lfs_pointers.oid=OID
-settings.lfs_pointers.inRepo=В репозиторії
+settings.lfs_pointers.inRepo=У репозиторії
 settings.lfs_pointers.exists=Наявний у сховищі
 settings.lfs_pointers.accessible=Доступний для користувача
 settings.lfs_pointers.associateAccessible=Пов'язати доступні %d OID
@@ -2116,7 +2117,7 @@ release.download_count=Завантаження: %s
 release.add_tag_msg=Використовуйте заголовок і зміст релізу як повідомлення як тег повідомлення.
 release.add_tag=Створити тільки мітку
 
-branch.name=Ім'я гілки
+branch.name=Назва гілки
 branch.delete_head=Видалити
 branch.delete_html=Видалити гілку
 branch.create_branch=Створити гілку %s
@@ -2149,9 +2150,9 @@ issues.filter_milestone_open = Відкриті етапи
 issues.filter_milestone_closed = Закриті етапи
 issues.filter_milestone_all = Усі етапи
 issues.filter_milestone_none = Без етапу
-issues.filter_poster_no_select = Всі автори
+issues.filter_poster_no_select = Усі автори
 pulls.merged_info_text = Гілку %s тепер можна видалити.
-find_file.go_to_file = Перейти до файлу
+find_file.go_to_file = Знайти файл
 visibility_helper = Зробити репозиторій приватним
 projects.card_type.desc = Попередній вигляд карток
 projects.card_type.text_only = Лише текст
@@ -2179,12 +2180,14 @@ commit.cherry-pick-header = Висмикнути: %s
 commit.cherry-pick-content = Оберіть гілку, на яку висмикнути:
 pulls.expand_files = Розгорнути всі файли
 pulls.collapse_files = Згорнути всі файли
-settings.packages_desc = Увімкнути реєстр пакунків репозиторія
-issues.role.contributor_helper = Цей користувач коментував у цьому репозиторії.
+settings.packages_desc = Увімкнути реєстр пакунків репозиторію
+issues.role.contributor_helper = У цьому репозиторії є коміти цього користувача.
 contributors.contribution_type.deletions = Видалення
 contributors.contribution_type.filter_label = Вид внеску:
 issues.role.contributor = Дописувач
 activity.navbar.contributors = Дописувачі
+settings.protected_branch.save_rule = Зберегти правило
+release.tags_for = Теги %s
 
 [graphs]
 contributors.what = внески
@@ -2242,9 +2245,9 @@ settings.labels_desc=Додати мітки, які можуть бути ви
 
 members.membership_visibility=Видимість учасника:
 members.public=Показувати
-members.public_helper=зробити прихованим
+members.public_helper=Зробити прихованим
 members.private=Прихований
-members.private_helper=зробити видимим
+members.private_helper=Зробити видимим
 members.member_role=Роль учасника:
 members.owner=Власник
 members.member=Учасник
@@ -2303,7 +2306,7 @@ organizations=Організації
 repositories=Репозиторії
 hooks=Веб-хуки
 authentication=Джерела автентифікації
-emails=Електронні адреси Користувача
+emails=Електронні адреси
 config=Конфігурація
 notices=Сповіщення системи
 monitor=Моніторинг
@@ -2330,7 +2333,7 @@ dashboard.cron.error=Помилка в Cron: %s: %[3]s
 dashboard.cron.finished=Cron: %[1]s завершено
 dashboard.delete_inactive_accounts=Видалити всі неактивовані облікові записи
 dashboard.delete_inactive_accounts.started=Запущено завдання видалення всі неактивованих облікових записів.
-dashboard.delete_repo_archives=Видалити всі архіви репозиторіїв (ZIP, TAR.GZ, і т. д..)
+dashboard.delete_repo_archives=Видалити всі архіви репозиторіїв (ZIP, TAR.GZ тощо)
 dashboard.delete_repo_archives.started=Запущено завдання видалення всіх архівів репозиторіїв.
 dashboard.delete_missing_repos=Видалити всі записи про репозиторії з відсутніми файлами Git
 dashboard.delete_missing_repos.started=Запущено завдання видалення всіх репозиторіїв, в яких відсутні файли Git.
@@ -2344,11 +2347,11 @@ dashboard.update_migration_poster_id=Оновити мігровані ID авт
 dashboard.git_gc_repos=Виконати очистку сміття для всіх репозиторіїв
 dashboard.resync_all_sshkeys=Оновити файл '.ssh/authorized_keys' з SSH ключами Forgejo.
 dashboard.resync_all_sshprincipals=Оновіть файл '.ssh/authorized_princтipals' з SSH даними користувача Forgejo.
-dashboard.resync_all_hooks=Пересинхронізувати перед-прийнятні, оновлюючі та пост-прийнятні хуки в усіх репозиторіях.
+dashboard.resync_all_hooks=Пересинхронізувати перед-прийнятні, оновлюючі та пост-прийнятні хуки в усіх репозиторіях
 dashboard.reinit_missing_repos=Переініціалізувати усі репозитрії git-файли яких втрачено
 dashboard.sync_external_users=Синхронізувати дані зовнішніх користувачів
 dashboard.cleanup_hook_task_table=Очистити hook_task таблицю
-dashboard.server_uptime=Uptime серверу
+dashboard.server_uptime=Час роботи сервера
 dashboard.current_goroutine=Поточна кількість Goroutines
 dashboard.current_memory_usage=Поточне використання пам'яті
 dashboard.total_memory_allocated=Виділено пам'яті загалом
@@ -2409,7 +2412,7 @@ users.is_restricted=Обмежений
 users.allow_git_hook=Може створювати Git хуки
 users.allow_git_hook_tooltip=Git хуки виконуються від імені користувача OS сервісу Forgejo і мають однаковий рівень доступу до хоста. Як результат, користувачі з доступом до Git-хуків можуть отримати доступ і змінювати всі репозиторії Forgejo, а також базу даних, що використовуються в Forgejo. Отже, вони також здатні отримати права адміністратора Forgejo.
 users.allow_import_local=Може імпортувати локальні репозиторії
-users.allow_create_organization=Може створювати організацій
+users.allow_create_organization=Може створювати організації
 users.update_profile=Оновити обліковий запис
 users.delete_account=Видалити цей обліковий запис
 users.still_own_repo=Ваш обліковий запис все ще володіє одним або кількома репозиторіями, спочатку вам потрібно видалити або передати їх.
@@ -2449,7 +2452,7 @@ orgs.new_orga=Нова організація
 
 repos.repo_manage_panel=Керування репозиторіями
 repos.unadopted=Неприйняті репозиторії
-repos.unadopted.no_more=Не знайдено більше неприйнятих репозиторіїв
+repos.unadopted.no_more=Не знайдено неприйнятих репозиторіїв.
 repos.owner=Власник
 repos.name=Назва
 repos.private=Приватний
@@ -2574,7 +2577,7 @@ auths.login_source_of_type_exist=Джерело автентифікації т
 config.server_config=Конфігурація сервера
 config.app_name=Назва сайту
 config.app_ver=Версія Forgejo
-config.app_url=Базова URL-адреса Forgejo
+config.app_url=Базова URL-адреса
 config.custom_conf=Шлях до файлу конфігурації
 config.custom_file_root_path=Шлях до файлу користувача
 config.domain=Домен сервера
@@ -2594,8 +2597,8 @@ config.ssh_enabled=Увімкнено
 config.ssh_start_builtin_server=Використовувати вбудований сервер
 config.ssh_domain=Домен SSH сервера
 config.ssh_port=Порт
-config.ssh_listen_port=Порт що прослуховується
-config.ssh_root_path=Шлях до кореню
+config.ssh_listen_port=Порт, що прослуховується
+config.ssh_root_path=Шлях до кореня
 config.ssh_key_test_path=Шлях до тестового ключа
 config.ssh_keygen_path=Шлях до генератора ключів ('ssh-keygen')
 config.ssh_minimum_key_size_check=Мінімальний розмір ключа перевірки
@@ -2604,7 +2607,7 @@ config.ssh_minimum_key_sizes=Мінімальні розміри ключів
 config.lfs_config=Конфігурація LFS
 config.lfs_enabled=Увімкнено
 config.lfs_content_path=Шлях до контенту LFS
-config.lfs_http_auth_expiry=Застаріла LFS HTTP аунтифікація
+config.lfs_http_auth_expiry=Термін дії LFS HTTP-автентифікації
 
 config.db_config=Конфігурація бази даних
 config.db_type=Тип
@@ -2730,7 +2733,7 @@ notices.select_all=Вибрати все
 notices.deselect_all=Скасувати виділення
 notices.inverse_selection=Інвертувати виділене
 notices.delete_selected=Видалити обране
-notices.delete_all=Видалити усі cповіщення
+notices.delete_all=Видалити всі cповіщення
 notices.type=Тип
 notices.type_1=Репозиторій
 notices.type_2=Завдання
@@ -2748,9 +2751,11 @@ packages.published = Опубліковано
 notices.operations = Дії
 packages.cleanup = Очистити недійсні дані
 packages.cleanup.success = Успішно очищено недійсні дані
-users.still_own_packages = Цей користувач досі володіє одним чи більше пакетами, спочатку видаліть ці пакети.
-users.purge_help = Примусово видалити користувача та будь-які репозиторії, організації та пакунки, якими він володіє. Усі коментарі та недоліки написані цим користувачем також будуть видалені.
+users.still_own_packages = Цей користувач досі володіє одним чи більше пакунками, спочатку видаліть ці пакунки.
+users.purge_help = Примусово видалити користувача і будь-які репозиторії, організації та пакунки, якими він володіє. Всі коментарі та недоліки, написані цим користувачем, також будуть видалені.
 dashboard.cleanup_packages = Очистити непридатні пакунки
+monitor.last_execution_result = Результат
+repos.lfs_size = Розмір LFS
 
 
 [action]
@@ -2830,11 +2835,11 @@ default_key=Підписано типовим ключем
 error.extract_sign=Не вдалося витягти підпис
 error.generate_hash=Не вдалося згенерувати хеш коміту
 error.no_committer_account=Аккаунт користувача з таким Email не знайдено
-error.no_gpg_keys_found=Не вдалося знайти GPG ключ що відповідає даному підпису
+error.no_gpg_keys_found=Не вдалося знайти GPG-ключ, що відповідає даному підпису
 error.not_signed_commit=Непідписаний коміт
-error.failed_retrieval_gpg_keys=Не вдалося отримати відповідний GPG ключ користувача
-error.probable_bad_signature=УВАГА! Хоча ключ з таким ID і є в базі, коміт не може бути ним перевірено! Цей коміт ПІДОЗРІЛИЙ.
-error.probable_bad_default_signature=УВАГА! Хоча типовий ключ має цей ID, коміт не може бути ним перевірено! Цей коміт ПІДОЗРІЛИЙ.
+error.failed_retrieval_gpg_keys=Не вдалося отримати відповідний GPG-ключ користувача
+error.probable_bad_signature=УВАГА! Хоча ключ із таким ID і є в базі, коміт неможливо ним перевірити! Цей коміт ПІДОЗРІЛИЙ.
+error.probable_bad_default_signature=УВАГА! Хоча типовий ключ має цей ID, коміт неможливо ним перевірити! Цей коміт ПІДОЗРІЛИЙ.
 
 [units]
 error.no_unit_allowed_repo=У вас немає доступу до жодного розділу цього репозитория.
@@ -2850,7 +2855,7 @@ about = Про цей пакунок
 empty = Поки що тут немає пакунків.
 empty.documentation = Для отримання додаткової інформації щодо реєстру пакунків, перегляньте документацію.
 registry.documentation = Для отримання додаткової інформації щодо реєстру %s, перегляньте документацію.
-settings.delete.notice = Ви збираєтеся видалити %s (%s). Цю операцію не можна відмінити, ви впевнені?
+settings.delete.notice = Ви збираєтеся видалити %s (%s). Цю операцію не можна скасувати, ви впевнені?
 details.author = Автор
 title = Пакунки
 arch.version.backup = Резервне копіювання
@@ -2858,30 +2863,30 @@ arch.version.conflicts = Суперечки
 arch.version.replaces = Заміни
 arch.version.provides = Надає
 arch.version.groups = Група
-conda.install = Даби встановити пакунок, використовуючи Conda, запустіть наступну команду:
-cargo.install = Даби встановити пакунок використовуючи cargo, запустіть наступну команду:
+conda.install = Аби встановити пакунок, використовуючи Conda, запустіть команду:
+cargo.install = Аби встановити пакунок, використовуючи Cargo, запустіть команду:
 versions.view_all = Переглянути всі
-generic.download = Завантажте пакунок з командного рядку:
+generic.download = Завантажте пакунок з командного рядка:
 details = Подробиці
 arch.version.optdepends = Необовʼязково залежить
 installation = Установлення
 details.license = Ліцензія
 filter.type.all = Усі
-conan.install = Даби встановити пакунок, використовуючи Conan, запустіть наступну команду:
-container.layers = Шари Світлини
+conan.install = Аби встановити пакунок, використовуючи Conan, запустіть команду:
+container.layers = Шари світлини
 details.project_site = Вебсторінка проєкту
 details.documentation_site = Вебсторінка документації
 desc = Керувати пакунками репозиторію.
 requirements = Вимоги
 dependencies = Залежності
-empty.repo = Ви опублікували пакунок, але він не показаний тут? Перейдіть до налаштувань пакунків та привʼяжіть їх до цього репозиторію.
+empty.repo = Ви опублікували пакунок, але він не показаний тут? Перейдіть до налаштувань пакунків та привʼяжіть його до цього репозиторію.
 alpine.repository = Інформація репозиторію
-alpine.install = Аби встановити цей пакунок, запустіть наступну команду:
-cran.install = Даби встановити пакунок, запустіть наступну команду:
-composer.dependencies.development = Залежності Розробки
-container.labels.key = Ключі
+alpine.install = Аби встановити цей пакунок, запустіть команду:
+cran.install = Аби встановити пакунок, запустіть команду:
+composer.dependencies.development = Залежності розробки
+container.labels.key = Ключ
 container.labels.value = Значення
-composer.install = Даби встановити пакунок, використовуючи Composer, запустіть наступну команду:
+composer.install = Аби встановити пакунок, використовуючи Composer, запустіть команду:
 debian.repository.components = Складові
 filter.container.tagged = Відмічений
 filter.container.untagged = Невідмічений
@@ -2889,28 +2894,29 @@ container.multi_arch = ОС / Архітектура
 arch.pacman.helper.gpg = Додайте сертифікат довіреності до pacman:
 arch.pacman.sync = Синхронізуйте пакунок з pacman:
 arch.pacman.conf = Додайте сервер з повʼязаним дострибутивом та архітектурою до /etc/pacman.conf :
-arch.version.properties = Властивості Версії
+arch.version.properties = Властивості версії
 arch.version.description = Опис
-chef.install = Даби встановити пакунок, запустіть наступну команду:
+chef.install = Аби встановити пакунок, запустіть команду:
 container.details.platform = Платформа
-container.details.type = Вид Світлини
-container.pull = Завантажити світлину з командного рядку:
+container.details.type = Вид світлини
+container.pull = Завантажити світлину з командного рядка:
 details.repository_site = Вебсторінка репозиторію
 composer.dependencies = Залежності
-debian.install = Даби встановити пакунок, запустіть наступну команду:
+debian.install = Аби встановити пакунок, запустіть команду:
 debian.repository = Інформація репозиторію
 debian.repository.distributions = Дистрибутиви
 alpine.repository.architectures = Архітектури
 arch.version.depends = Залежить
-go.install = Встановити пакунок з командного рядку:
+go.install = Встановити пакунок з командного рядка:
 debian.repository.architectures = Архітектури
-helm.install = Даби встановити пакунок, запустіть наступну команду:
+helm.install = Аби встановити пакунок, запустіть команду:
 keywords = Ключові слова
 assets = Ресурси
 versions = Версії
 dependency.version = Версія
 container.labels = Мітки
 filter.no_result = Ваш фільтр не видав жодних результатів.
+dependency.id = ID
 
 [secrets]
 
@@ -2929,6 +2935,10 @@ runners.status.active=Активний
 runs.commit=Коміт
 variables.update.failed = Не вдалося змінити змінну.
 variables.update.success = Змінна була змінена.
+variables.creation = Додати змінну
+variables.none = Змінних ще немає.
+variables.deletion = Видалити змінну
+variables = Змінні
 
 
 
@@ -2937,7 +2947,7 @@ variables.update.success = Змінна була змінена.
 type-3.display_name = Проєкт організації
 type-2.display_name = Проєкт репозиторію
 type-1.display_name = Особистий проєкт
-deleted.display_name = Видалений Проєкт
+deleted.display_name = Видалений проєкт
 
 [git.filemode]
 ; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", …
@@ -2946,22 +2956,23 @@ directory = Тека
 submodule = Підмодуль
 normal_file = Звичайний файл
 executable_file = Виконуваний файл
+changed_filemode = %[1]s → %[2]s
 
 
 
 [search]
 code_kind = Шукати код...
-code_search_unavailable = Пошук коду наразі недоступний. Будь-ласка звʼяжіться з адміністратором сайту.
+code_search_unavailable = Пошук коду наразі недоступний. Будь ласка, звʼяжіться з адміністратором сайту.
 user_kind = Шукати користувачів...
 repo_kind = Шукати репозиторії...
 search = Пошук...
 type_tooltip = Вид пошуку
 fuzzy = Нечіткий
 fuzzy_tooltip = Включати результати, що подібні пошуковому запиту
-union_tooltip = Включати результати, що відповідають будь-якому з ключових слів розділеними пробілами
+union_tooltip = Включати результати, що відповідають будь-якому з ключових слів, розділених пробілами
 union = Ключові слова
 exact = Точний
-exact_tooltip = Включати усі результати, що чітко відповідають запиту
+exact_tooltip = Включати лише результати, що чітко відповідають запиту
 regexp = Регулярні вирази
 regexp_tooltip = Опрацьовувати пошуковий запит як регулярний вираз
 org_kind = Шукати організації...
@@ -2969,21 +2980,32 @@ team_kind = Шукати команди...
 milestone_kind = Шукати віхи...
 commit_kind = Шукати коментарі...
 no_results = Не знайдено відповідних результатів.
-keyword_search_unavailable = Пошук по ключовим словам наразі недоступний. Будь-ласка звʼяжіться з адміністратором сайту.
+keyword_search_unavailable = Пошук за ключовими словами наразі недоступний. Будь ласка, зв'яжіться з адміністратором сайту.
 code_search_by_git_grep = Поточні результати пошуку коду надаються з "git grep". Тут можуть бути кращі результати, якщо адміністратор сайту ввімкнув індексацію коду.
 package_kind = Шукати пакунки...
 project_kind = Шукати проєкти...
 branch_kind = Шукати гілки...
 issue_kind = Шукати недоліки...
 pull_kind = Шукати запити на злиття...
-runner_kind = Пошук рушіїв...
+runner_kind = Пошук раннерів...
 
 [markup]
 filepreview.truncated = Перегляд було урізано
+filepreview.line = Рядок %[1]d в %[2]s
+filepreview.lines = Рядки з %[1]d по %[2]d в %[3]s
 
 [translation_meta]
-test = Це текстовий текст. Він не відображається у інтерфейсі користувача Forgejo, але використовується за тестових причин. Вільно натисніть "ок" щоб зберегти час (або цікавий факт на ваш вибір), щоб досягти бажаної позначки 100% завершення :)
+test = Це тестовий текст. Він не відображається в інтерфейсі користувача Forgejo, а використовується з метою тестування
 
 [repo.permissions]
 packages.read = Читати: Дивитись та завантажити пакунки призначені до репозиторію.
-packages.write = Писати: Публікувати та видаляти пакунки призначені до репозиторію.
\ No newline at end of file
+packages.write = Писати: Публікувати та видаляти пакунки призначені до репозиторію.
+
+[munits.data]
+pib = ПіБ
+eib = ЕіБ
+kib = КіБ
+mib = МіБ
+gib = ГіБ
+tib = ТіБ
+b = Б
\ No newline at end of file
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 60af4d92c3..8ba40a51f2 100644
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -17,10 +17,10 @@ page=页面
 template=模板
 language=语言选项
 notifications=通知
-active_stopwatch=活动时间跟踪器
+active_stopwatch=活跃时间跟踪器
 tracked_time_summary=基于工单列表过滤器的跟踪时间概要
 create_new=创建…
-user_profile_and_more=个人信息和设置…
+user_profile_and_more=个人信息与设置…
 signed_in_as=已登录用户
 enable_javascript=此网站需要 JavaScript。
 toc=目录
@@ -30,11 +30,11 @@ return_to_forgejo=返回 Forgejo
 username=用户名
 email=电子邮件地址
 password=密码
-access_token=访问令牌（Access Token）
+access_token=访问令牌
 re_type=确认密码
 captcha=验证码
 twofa=两步验证
-twofa_scratch=两步验证口令
+twofa_scratch=两步验证备用验证码
 passcode=验证码
 
 webauthn_insert_key=插入安全密钥
@@ -56,17 +56,17 @@ organization=组织
 mirror=镜像
 new_repo=创建仓库
 new_migrate=迁移外部仓库
-new_mirror=创建新的镜像
-new_fork=创建新的派生仓库
+new_mirror=创建镜像
+new_fork=创建派生仓库
 new_org=创建组织
 new_project=创建项目
 new_project_column=创建列
 manage_org=管理我的组织
-admin_panel=管理后台
+admin_panel=网站管理
 account_settings=帐户设置
 settings=设置
 your_profile=个人信息
-your_starred=已点赞
+your_starred=点赞
 your_settings=设置
 
 all=所有
@@ -120,7 +120,7 @@ unknown=未知
 
 rss_feed=RSS 订阅源
 
-pin=固定
+pin=置顶
 unpin=取消置顶
 
 artifacts=制品
@@ -146,12 +146,12 @@ filter = 筛选
 filter.clear = 清除筛选条件
 filter.is_archived = 已归档
 filter.not_archived = 未归档
-filter.is_fork = 已派生
-filter.not_fork = 未派生
-filter.is_mirror = 已镜像
-filter.not_mirror = 未镜像
-filter.is_template = 模板
-filter.not_template = 非模板
+filter.is_fork = 是派生
+filter.not_fork = 不是派生
+filter.is_mirror = 是镜像
+filter.not_mirror = 不是镜像
+filter.is_template = 是模板
+filter.not_template = 不是模板
 filter.public = 公开
 filter.private = 私有
 toggle_menu = 切换菜单
@@ -160,12 +160,12 @@ more_items = 显示更多
 copy_generic = 复制到剪贴板
 test = 测试
 error413 = 您已用尽您的配额。
-new_repo.title = 新仓库
-new_migrate.title = 新迁移
-new_org.title = 新组织
-new_repo.link = 新仓库
-new_migrate.link = 新迁移
-new_org.link = 新组织
+new_repo.title = 创建仓库
+new_migrate.title = 开始迁移
+new_org.title = 创建组织
+new_repo.link = 创建仓库
+new_migrate.link = 开始迁移
+new_org.link = 创建组织
 
 [aria]
 navbar=导航栏
@@ -176,8 +176,8 @@ footer.links=链接
 [heatmap]
 number_of_contributions_in_the_last_12_months=一年内 %s 次贡献
 contributions_zero=目前还没有贡献
-less=更少的
-more=更多的
+less=显示更少
+more=显示更多
 contributions_format = {year}{month}{day} 当日有 {contributions}
 contributions_few = 贡献
 contributions_one = 贡献
@@ -206,7 +206,7 @@ string.desc=Z - A
 
 [error]
 occurred=发生了一个错误
-report_message=如果您确定这是一个 Forgejo bug，请在 Codeberg 上搜索问题，或在必要时创建一个新工单。
+report_message=如果您确定这是一个 Forgejo 的 bug，请在 Codeberg 上搜索相关问题或在必要时创建一个新工单。
 missing_csrf=错误的请求：没有 CSRF 令牌
 invalid_csrf=错误的请求：无效的 CSRF 令牌
 not_found=找不到目标。
@@ -216,7 +216,7 @@ server_internal = 服务器内部错误
 [startpage]
 app_desc=一款极易搭建的自助 Git 服务
 install=易安装
-install_desc=通过 二进制 来运行；或者通过 docker 来运行；或者通过 安装包 来运行。
+install_desc=通过二进制来运行；或者通过Docker 来运行；或者通过安装包 来运行。
 platform=跨平台
 platform_desc=已证实可以在 Linux 和 FreeBSD 等自由操作系统以及不同的 CPU 架构上运行 Forgejo。挑一个您喜欢的就行！
 lightweight=轻量级
@@ -246,7 +246,7 @@ reinstall_confirm_check_1=使用 app.ini 中 SECRET KEY 加密的数据可能会
 reinstall_confirm_check_2=代码仓库和设置可能需要重新同步。勾选此框，表示您确认将手动重新同步仓库和 SSH authorized_keys 的钩子。您确认您将确保代码仓库和镜像设置是正确的。
 reinstall_confirm_check_3=你确认你绝对肯定这个 Forgejo 在正确的 app.ini 位置上运行，而且你确定你必须重新安装。你确认你知晓上述风险。
 err_empty_db_path=SQLite 数据库文件路径不能为空。
-no_admin_and_disable_registration=您不能够在未创建管理员用户的情况下禁止注册。
+no_admin_and_disable_registration=您不能够在未创建管理员账号的情况下禁止注册。
 err_empty_admin_password=管理员密码不能为空。
 err_empty_admin_email=管理员电子邮件不能为空。
 err_admin_name_is_reserved=管理员用户名无效，用户名是保留的
@@ -291,14 +291,14 @@ disable_gravatar.description=禁用 Gravatar 和第三方头像源。除非用
 federated_avatar_lookup=启用联邦头像
 federated_avatar_lookup.description=使用 Libravatar 查找头像。
 disable_registration=禁止用户自助注册
-disable_registration.description=只有实例管理员才能创建新的用户帐户。强烈建议保持注册禁用，除非您打算为所有人托管一个公共实例并准备好处理大量垃圾帐户。
+disable_registration.description=只有实例管理员才能创建新的帐户。强烈建议保持注册禁用，除非您打算为所有人托管一个公共实例并准备好处理大量垃圾帐户。
 allow_only_external_registration.description=仅允许使用已配置的外部服务来创建新帐户。
 openid_signin=启用 OpenID 登录
 openid_signin.description=允许用户通过 OpenID 登录。
 openid_signup=启用 OpenID 自助注册
 openid_signup.description=如果启用了自助注册，则允许用户通过 OpenID 创建帐户。
 enable_captcha=启用注册验证码
-enable_captcha.description=要求用户通过 CAPTCHA 验证才能创建帐户。
+enable_captcha.description=要求用户通过验证码才能创建帐户。
 require_sign_in_view=启用页面访问限制
 require_sign_in_view.description=仅允许已登录用户访问页面。访客只能看到注册和登录页。
 admin_setting.description=创建管理员帐户是可选的。第一个注册用户将自动成为管理员。
@@ -325,7 +325,7 @@ default_keep_email_private.description=默认为新用户启用电子邮件地
 default_allow_create_organization=默认情况下允许创建组织
 default_allow_create_organization.description=默认允许新用户创建组织。禁用此选项时，管理员必须向新用户授予创建组织的权限。
 default_enable_timetracking=默认情况下启用时间跟踪
-default_enable_timetracking.description=默认允许新存储库使用时间跟踪功能。
+default_enable_timetracking.description=默认允许新仓库使用时间跟踪功能。
 no_reply_address=隐藏电子邮件
 no_reply_address_helper=用于设置隐藏电子邮件地址的用户使用的电子邮件域名。例如，如果用于隐藏电子邮件地址的域名设为“noreply.example.org”，则用户名 “joe” 在 Git 中将以 “joe@noreply.example.org” 表示。
 password_algorithm=密码哈希算法
@@ -388,7 +388,7 @@ org_no_results=未找到匹配的组织。
 code_no_results=未找到与搜索字词匹配的源代码。
 code_search_results=“%s” 的搜索结果是
 code_last_indexed_at=最后索引于 %s
-relevant_repositories_tooltip=派生的仓库，以及缺少主题、图标和描述的仓库将被隐藏。
+relevant_repositories_tooltip=派生的、缺少主题、图标和描述的仓库已被隐藏。
 relevant_repositories=只显示相关的仓库， 显示未过滤结果。
 stars_one = %d 点赞
 stars_few = %d 点赞
@@ -457,7 +457,7 @@ disable_forgot_password_mail_admin=帐户恢复仅在设置电子邮件后可用
 email_domain_blacklisted=您不能使用您的电子邮件地址注册。
 authorize_application=应用授权
 authorize_redirect_notice=如果您授权此应用，您将会被重定向到 %s。
-authorize_application_created_by=此应用由%s创建。
+authorize_application_created_by=此应用由 %s 创建。
 authorize_application_description=如果您允许，它将能够读取和修改您的所有帐户信息，包括私人仓库和组织。
 authorize_title=授权 %s 访问您的帐户？
 authorization_failed=授权失败
@@ -471,7 +471,7 @@ change_unconfirmed_email_summary = 修改用来接收激活邮件的邮箱地址
 change_unconfirmed_email_error = 无法修改邮箱地址： %v
 tab_signin = 登录
 tab_signup = 注册
-hint_login = 已创建账户？立即登录
+hint_login = 已经有账户了吗？立即登录！
 back_to_sign_in = 返回登录
 sign_in_openid = 继续使用 OpenID
 sign_up_button = 立即注册。
@@ -518,8 +518,8 @@ issue.action.merge=@%[1]s 将 #%[2]d 合并到 #%[3]s。
 issue.action.approve=@%[1]s 批准了此合并请求。
 issue.action.reject=@%[1]s 请求更改此合并请求。
 issue.action.review=@%[1]s 评论了这个合并请求。
-issue.action.review_dismissed=@%[1]s 拒绝了 %[2]s 对此合并请求的上个审核。
-issue.action.ready_for_review=@%[1]s 标记此合并请求已评审通过。
+issue.action.review_dismissed=@%[1]s 取消了 %[2]s 对此合并请求的上一个评审。
+issue.action.ready_for_review=@%[1]s 标记了此合并请求为已准备好接受评审。
 issue.action.new=@%[1]s 创建了 #%[2]d.
 issue.in_tree_path=在 %s 中：
 
@@ -772,7 +772,7 @@ comment_type_group_time_tracking=时间跟踪
 comment_type_group_deadline=截止日期
 comment_type_group_dependency=依赖项
 comment_type_group_lock=锁定状态
-comment_type_group_review_request=审核请求
+comment_type_group_review_request=评审请求
 comment_type_group_pull_request_push=添加的提交
 comment_type_group_project=项目
 comment_type_group_issue_ref=工单引用
@@ -851,7 +851,7 @@ add_new_principal=添加规则
 ssh_key_been_used=此 SSH 密钥已添加到服务器。
 ssh_key_name_used=使用相同名称的SSH公钥已存在。
 ssh_principal_been_used=此规则已经加入到了服务器。
-gpg_key_id_used=使用相同ID的GPG公钥已经存在！
+gpg_key_id_used=具有相同 ID 的 GPG 公钥已存在。
 gpg_no_key_email_found=此 GPG 密钥与您帐户关联的任何已激活电子邮件地址均不匹配。如果您在提供的令牌上签名，它仍然可以被添加。
 gpg_key_matched_identities=匹配的身份：
 gpg_key_matched_identities_long=此密钥中包含的身份信息与下面这个该用户已激活电子邮件地址是相匹配的。因此，能与这些电子邮件地址相匹配的提交可以通过此密钥进行验证。
@@ -1038,7 +1038,7 @@ change_password = 更改密码
 additional_repo_units_hint = 建议仓库启用更多功能
 hints = 提示
 update_hints = 更新提示
-additional_repo_units_hint_description = 在所有存在未启用的功能的仓库内显示一个“选择更多功能…”按钮。
+additional_repo_units_hint_description = 在所有存在未启用的功能的仓库内显示“启用更多”提示。
 update_hints_success = 提示更改成功。
 pronouns_custom = 自定义
 pronouns = 代词
@@ -1239,7 +1239,7 @@ migrate.cancel_migrating_confirm=您想要取消此次迁移吗？
 mirror_from=镜像自地址
 forked_from=派生自
 generated_from=生成自
-fork_from_self=无法派生已经拥有的仓库！
+fork_from_self=无法派生您拥有的仓库。
 fork_guest_user=登录并 派生 这个仓库。
 watch_guest_user=请登录后再关注此仓库
 star_guest_user=请登录后再点赞此仓库
@@ -1465,7 +1465,7 @@ projects.column.unset_default_desc=取消此列为默认值
 projects.column.delete=删除列
 projects.column.deletion_desc=删除项目列会将所有相关工单移到默认的列。是否继续？
 projects.column.color=颜色
-projects.open=开启
+projects.open=开放中
 projects.close=关闭
 projects.column.assigned_to=指派给
 projects.card_type.desc=卡片预览
@@ -1477,7 +1477,7 @@ issues.filter_assignees=筛选指派人
 issues.filter_milestones=筛选里程碑
 issues.filter_projects=筛选项目
 issues.filter_labels=筛选标签
-issues.filter_reviewers=筛选审核者
+issues.filter_reviewers=筛选评审员
 issues.new=创建工单
 issues.new.title_empty=标题不能为空
 issues.new.labels=标签
@@ -1486,18 +1486,18 @@ issues.new.clear_labels=清除选中标签
 issues.new.projects=项目
 issues.new.clear_projects=清除项目
 issues.new.no_projects=暂无项目
-issues.new.open_projects=开启的项目
+issues.new.open_projects=开放中的项目
 issues.new.closed_projects=已关闭的项目
 issues.new.no_items=无可选项
 issues.new.milestone=里程碑
 issues.new.no_milestone=未选择里程碑
 issues.new.clear_milestone=取消选中里程碑
-issues.new.open_milestone=开启的里程碑
+issues.new.open_milestone=开放中的里程碑
 issues.new.closed_milestone=已关闭的里程碑
 issues.new.assignees=指派成员
 issues.new.clear_assignees=取消指派成员
 issues.new.no_assignees=未指派成员
-issues.new.no_reviewers=无审核者
+issues.new.no_reviewers=无评审员
 issues.choose.get_started=开始
 issues.choose.open_external_link=开启
 issues.choose.blank=默认模板
@@ -1576,7 +1576,7 @@ issues.filter_sort.feweststars=点赞由少到多
 issues.filter_sort.mostforks=派生由多到少
 issues.filter_sort.fewestforks=派生由少到多
 issues.keyword_search_unavailable=关键词搜索目前不可用。请联系网站管理员。
-issues.action_open=开启
+issues.action_open=开放
 issues.action_close=关闭
 issues.action_label=标签
 issues.action_milestone=里程碑
@@ -1593,7 +1593,7 @@ issues.opened_by_fake=由 %[2]s 于 %[1]s 打开
 issues.closed_by_fake=由 %[2]s 创建，被关闭于 %[1]s
 issues.previous=上一页
 issues.next=下一页
-issues.open_title=开启
+issues.open_title=开放中
 issues.closed_title=已关闭
 issues.draft_title=草稿
 issues.num_comments_1=%d 评论
@@ -1610,7 +1610,7 @@ issues.close=关闭工单
 issues.comment_pull_merged_at=已合并提交 %[1]s 到 %[2]s %[3]s
 issues.comment_manually_pull_merged_at=手动合并提交 %[1]s 到 %[2]s %[3]s
 issues.close_comment_issue=关闭评论
-issues.reopen_issue=重新开启
+issues.reopen_issue=重新开放
 issues.reopen_comment_issue=重新打开评论
 issues.create_comment=评论
 issues.closed_at=`于 %[2]s 关闭此工单`
@@ -1635,10 +1635,10 @@ issues.role.first_time_contributor=首次贡献者
 issues.role.first_time_contributor_helper=这是该用户对仓库的第一次贡献。
 issues.role.contributor=贡献者
 issues.role.contributor_helper=该用户之前已提交至该仓库。
-issues.re_request_review=再次请求审核
+issues.re_request_review=再次请求评审
 issues.is_stale=此评审之后代码有更新
-issues.remove_request_review=移除审核请求
-issues.remove_request_review_block=无法移除审核请求
+issues.remove_request_review=移除评审请求
+issues.remove_request_review_block=无法移除评审请求
 issues.dismiss_review=取消评审
 issues.dismiss_review_warning=您确定要取消此评审吗？
 issues.sign_in_require_desc=登录 并参与到对话中。
@@ -1655,7 +1655,7 @@ issues.label_archive_tooltip=在标签搜索时，默认情况下存档标签将
 issues.label_exclusive_desc=命名标签为 scope/item 以使其与其他以 scope/ 开头的标签互斥。
 issues.label_exclusive_warning=在编辑工单或合并请求的标签时，任何冲突的范围标签都将被删除。
 issues.label_count=%d 个标签
-issues.label_open_issues=%d 个开启的工单
+issues.label_open_issues=%d 个开放中的工单
 issues.label_edit=编辑
 issues.label_delete=删除
 issues.label_modify=编辑标签
@@ -1777,10 +1777,10 @@ issues.review.dismissed_label=已取消
 issues.review.left_comment=留下了一条评论
 issues.review.content.empty=您需要留下一个注释，表明需要的更改。
 issues.review.reject=于 %s 请求变更
-issues.review.wait=于 %s 请求审核
+issues.review.wait=于 %s 请求评审
 issues.review.add_review_request=于 %[2]s 请求 %[1]s 评审
 issues.review.remove_review_request=于 %[2]s 取消对 %[1]s 的评审请求
-issues.review.remove_review_request_self=于 %s 拒绝审核
+issues.review.remove_review_request_self=于 %s 拒绝评审
 issues.review.pending=待定
 issues.review.pending.tooltip=此评论目前对其他用户不可见。 若要提交您的待定评论，请在页面顶部选择 %s -> %s/%s/%s。
 issues.review.review=评审
@@ -1818,7 +1818,7 @@ pulls.allow_edits_from_maintainers_desc=对基础分支有写入权限的用户
 pulls.allow_edits_from_maintainers_err=更新失败
 pulls.compare_changes_desc=选择合并的目标分支和源分支。
 pulls.has_viewed_file=已查看
-pulls.has_changed_since_last_review=自您上次审核以来已更改
+pulls.has_changed_since_last_review=自您上次评审以来已有更改
 pulls.viewed_files_label=%[1]d / %[2]d 文件已查看
 pulls.expand_files=展开所有文件
 pulls.collapse_files=折叠所有文件
@@ -1829,11 +1829,11 @@ pulls.switch_head_and_base=切换 head 和 base
 pulls.filter_branch=过滤分支
 pulls.no_results=未找到结果
 pulls.show_all_commits=显示所有提交
-pulls.show_changes_since_your_last_review=显示自您上次审核以来的更改
+pulls.show_changes_since_your_last_review=显示自您上次评审以来的更改
 pulls.showing_only_single_commit=仅显示提交 %[1]s 的更改
 pulls.showing_specified_commit_range=仅显示 %[1]s...%[2]s 之间的更改
 pulls.select_commit_hold_shift_for_range=选择提交。按住 Shift + 单击选择一个范围
-pulls.review_only_possible_for_full_diff=只有在查看全部差异时才能进行审核
+pulls.review_only_possible_for_full_diff=只有在查看全部差异时才能进行评审
 pulls.filter_changes_by_commit=按提交筛选
 pulls.nothing_to_compare=分支内容相同，无需创建合并请求。
 pulls.nothing_to_compare_have_tag=所选分支/标签相同。
@@ -1868,8 +1868,8 @@ pulls.required_status_check_failed=一些必要的检查没有成功
 pulls.required_status_check_missing=缺少一些必要的检查。
 pulls.required_status_check_administrator=作为管理员，您仍可合并此合并请求
 pulls.blocked_by_approvals=此合并请求当前还没有通过审批。已获取审批数%d个，共需要审批数%d个。
-pulls.blocked_by_rejection=此合并请求有官方审核员请求的更改。
-pulls.blocked_by_official_review_requests=此合并请求需要一名或多名审核员审阅批准。
+pulls.blocked_by_rejection=此合并请求有官方评审员请求的更改。
+pulls.blocked_by_official_review_requests=此合并请求需要一名或多名评审员审阅批准。
 pulls.blocked_by_outdated_branch=此合并请求因过期而被阻止。
 pulls.blocked_by_changed_protected_files_1=此合并请求因修改了下列被保护的文件而被阻止：
 pulls.blocked_by_changed_protected_files_n=此合并请求因修改了下列被保护的文件而被阻止：
@@ -1882,14 +1882,14 @@ pulls.approve_count_1=%d 项批准
 pulls.approve_count_n=%d 项批准
 pulls.reject_count_1=%d 变更请求
 pulls.reject_count_n=%d 变更请求
-pulls.waiting_count_1=%d 个正在等待审核
-pulls.waiting_count_n=%d 个正在等待审核
+pulls.waiting_count_1=%d 个正在等待评审
+pulls.waiting_count_n=%d 个正在等待评审
 pulls.wrong_commit_id=提交 ID 必须是目标分支上的提交的 ID
 
 pulls.no_merge_desc=由于未启用合并选项，此合并请求无法被合并。
 pulls.no_merge_helper=在仓库设置中启用合并选项或者手工合并请求。
 pulls.no_merge_wip=这个合并请求无法合并，因为被标记为尚未完成的工作。
-pulls.no_merge_not_ready=此拉取请求尚未准备好合并，请检查审核状态和状态检查。
+pulls.no_merge_not_ready=此拉取请求尚未准备好被合并，请检查评审状态和状态检查。
 pulls.no_merge_access=您无权合并此拉取请求。
 pulls.merge_pull_request=创建合并提交
 pulls.rebase_merge_pull_request=变基后快进
@@ -1960,7 +1960,7 @@ milestones.new=新的里程碑
 milestones.closed=于 %s关闭
 milestones.update_ago=已更新 %s
 milestones.no_due_date=暂无截止日期
-milestones.open=开启
+milestones.open=开放中
 milestones.close=关闭
 milestones.new_subheader=里程碑可以帮助您组织工单并跟踪其进度。
 milestones.completeness=%d%% 已完成
@@ -2005,7 +2005,7 @@ ext_wiki.desc=链接到外部 wiki。
 
 wiki=百科
 wiki.welcome=欢迎来到百科!
-wiki.welcome_desc=百科允许你撰写和与协作者分享文档
+wiki.welcome_desc=百科允许你撰写并与协作者分享文档。
 wiki.desc=撰写和与协作者分享文档
 wiki.create_first_page=创建第一个页面
 wiki.page=页面
@@ -2166,14 +2166,14 @@ settings.external_wiki_url=外部百科链接
 settings.external_wiki_url_error=外部百科链接无效
 settings.external_wiki_url_desc=当点击百科标签时，访问者将被重定向到外部百科系统的URL。
 settings.issues_desc=启用仓库工单系统
-settings.use_internal_issue_tracker=使用内置的工单管理系统
-settings.use_external_issue_tracker=使用外部的工单管理系统
+settings.use_internal_issue_tracker=使用内置的工单系统
+settings.use_external_issue_tracker=使用外部的工单系统
 settings.external_tracker_url=外部工单系统 URL
 settings.external_tracker_url_error=外部百科链接无效
 settings.external_tracker_url_desc=当点击工单标签时，访问者将被重定向到外部工单系统的URL。
-settings.tracker_url_format=外部工单管理系统的 URL 格式
+settings.tracker_url_format=外部工单系统的 URL 格式
 settings.tracker_url_format_error=外部工单链接无效
-settings.tracker_issue_style=外部工单管理系统的编号格式
+settings.tracker_issue_style=外部工单系统的编号格式
 settings.tracker_issue_style.numeric=纯数字形式
 settings.tracker_issue_style.alphanumeric=英文字母数字组合形式
 settings.tracker_issue_style.regexp=正则表达式
@@ -2329,32 +2329,32 @@ settings.event_push_desc=Git 仓库推送
 settings.event_repository=仓库
 settings.event_repository_desc=创建或删除仓库
 settings.event_header_issue=工单事件
-settings.event_issues=工单
+settings.event_issues=修改
 settings.event_issues_desc=工单已打开、已关闭、已重新打开或已编辑。
-settings.event_issue_assign=工单已指派
+settings.event_issue_assign=指派
 settings.event_issue_assign_desc=工单已被指派或取消指派。
-settings.event_issue_label=工单已分类
-settings.event_issue_label_desc=工单标签被更新或清除。
-settings.event_issue_milestone=工单已被收入里程碑中
-settings.event_issue_milestone_desc=工单被收入或取消收入里程碑中。
-settings.event_issue_comment=工单评论
+settings.event_issue_label=标签
+settings.event_issue_label_desc=工单标签被添加或移除。
+settings.event_issue_milestone=里程碑
+settings.event_issue_milestone_desc=里程碑被添加、移除或修改。
+settings.event_issue_comment=评论
 settings.event_issue_comment_desc=工单评论被创建、编辑或删除
 settings.event_header_pull_request=合并请求事件
-settings.event_pull_request=合并请求
+settings.event_pull_request=修改
 settings.event_pull_request_desc=合并请求被打开、被关闭、被重新打开或被编辑。
-settings.event_pull_request_assign=合并请求被指派
+settings.event_pull_request_assign=指派
 settings.event_pull_request_assign_desc=合并请求被指派或取消指派。
-settings.event_pull_request_label=合并请求被贴上标签
-settings.event_pull_request_label_desc=合并请求的标签被更新或清除。
-settings.event_pull_request_milestone=合并请求被记录于里程碑中
-settings.event_pull_request_milestone_desc=合并请求被记录或取消记录于里程碑中。
-settings.event_pull_request_comment=合并请求被评论
+settings.event_pull_request_label=标签
+settings.event_pull_request_label_desc=合并请求的标签被添加或移除。
+settings.event_pull_request_milestone=里程碑
+settings.event_pull_request_milestone_desc=里程碑被添加、移除或修改。
+settings.event_pull_request_comment=评论
 settings.event_pull_request_comment_desc=合并请求评论被创建、编辑或删除。
-settings.event_pull_request_review=已审核的合并请求
-settings.event_pull_request_review_desc=合并请求被批准、拒绝或提出审查意见
-settings.event_pull_request_sync=合并请求被同步
-settings.event_pull_request_sync_desc=合并请求被同步。
-settings.event_pull_request_review_request=发起合并请求评审
+settings.event_pull_request_review=评审
+settings.event_pull_request_review_desc=合并请求被批准、拒绝或提出评审意见。
+settings.event_pull_request_sync=被同步
+settings.event_pull_request_sync_desc=分支自动更新为目标分支。
+settings.event_pull_request_review_request=评审请求
 settings.event_pull_request_review_request_desc=合并请求评审已请求或已取消
 settings.event_pull_request_approvals=合并请求批准
 settings.event_pull_request_merge=合并请求合并
@@ -2443,9 +2443,9 @@ settings.protect_status_check_matched=匹配
 settings.protect_invalid_status_check_pattern=无效的状态检查规则：“%s”。
 settings.protect_no_valid_status_check_patterns=没有有效的状态检查规则。
 settings.protect_required_approvals=所需的批准
-settings.protect_required_approvals_desc=只允许合并有足够审核人数的拉取请求。
+settings.protect_required_approvals_desc=只允许合并有足够评审人数的拉取请求。
 settings.protect_approvals_whitelist_enabled=批准仅限列入白名单的用户或团队
-settings.protect_approvals_whitelist_enabled_desc=只有白名单用户或团队的审核才能计数。 没有批准的白名单，来自任何有写访问权限的人的审核都将计数。
+settings.protect_approvals_whitelist_enabled_desc=只有白名单用户或团队的评审才能被计入需要的批准数量。 没有白名单时，来自任何有写入权限的人的评审都将计数。
 settings.protect_approvals_whitelist_users=审查者白名单
 settings.protect_approvals_whitelist_teams=审查团队白名单
 settings.dismiss_stale_approvals=取消过时的批准
@@ -2468,9 +2468,9 @@ settings.remove_protected_branch_success=移除分支保护规则"%s"成功。
 settings.remove_protected_branch_failed=移除分支保护规则"%s"失败。
 settings.protected_branch_deletion=禁用分支保护
 settings.protected_branch_deletion_desc=禁用分支保护允许具有写入权限的用户推送提交到此分支。继续？
-settings.block_rejected_reviews=拒绝审核阻止了此合并
+settings.block_rejected_reviews=有拒绝评审时阻止合并
 settings.block_rejected_reviews_desc=如果官方审查人员要求作出改动，即使有足够的批准，合并也不允许。
-settings.block_on_official_review_requests=有官方审核阻止了代码合并
+settings.block_on_official_review_requests=有官方评审请求时阻止代码合并
 settings.block_on_official_review_requests_desc=处于评审状态时，即使有足够的批准，也不能合并。
 settings.block_outdated_branch=如果拉取请求已经过时，阻止合并
 settings.block_outdated_branch_desc=当头部分支落后基础分支时，不能合并。
@@ -2490,7 +2490,7 @@ settings.tags.protection.allowed=允许列表
 settings.tags.protection.allowed.users=允许的账号
 settings.tags.protection.allowed.teams=允许的团队
 settings.tags.protection.allowed.noone=无
-settings.tags.protection.create=新建规则
+settings.tags.protection.create=添加规则
 settings.tags.protection.none=没有受保护的Git标签
 settings.tags.protection.pattern.description=你可以使用单个名称或 glob 模式匹配或正则表达式来匹配多个标签。了解详情请访问 受保护Git标签指南。
 settings.bot_token=机器人令牌
@@ -2586,7 +2586,7 @@ diff.comment.add_single_comment=添加单条评论
 diff.comment.add_review_comment=添加评论
 diff.comment.start_review=开始评审
 diff.comment.reply=回复
-diff.review=完成审核
+diff.review=完成评审
 diff.review.header=提交评审
 diff.review.placeholder=评审意见
 diff.review.comment=评论
@@ -2721,7 +2721,7 @@ issues.comment.blocked_by_user = 你无法对此工单进行评论，因为你
 settings.wiki_rename_branch_main_desc = 将百科内部使用的分支重命名为“%s”。此更改是永久性的且不可撤销。
 generated = 已生成
 editor.invalid_commit_mail = 用于创建提交的邮件地址无效。
-pulls.blocked_by_user = 你无法在此存储库上创建合并请求，因为您已被仓库所有者屏蔽。
+pulls.blocked_by_user = 你无法在此仓库上创建合并请求，因为您已被仓库所有者屏蔽。
 migrate.forgejo.description = 从 codeberg.org 或其他 Forgejo 实例迁移数据。
 commits.browse_further = 浏览更多
 commits.renamed_from = 重命名自 %s
@@ -2738,16 +2738,16 @@ settings.confirm_wiki_branch_rename = 重命名百科分支
 pulls.commit_ref_at = `在提交 %[2]s 中引用了此合并请求`
 desc.sha256 = SHA256
 settings.ignore_stale_approvals = 忽略过时的批准
-settings.ignore_stale_approvals_desc = 不对旧的提交（过时的审查）计入已批准的合并请求数量。注：如过期的审核已被取消，则无需设置。
+settings.ignore_stale_approvals_desc = 不将旧的提交（陈旧的评审）计入已批准的合并请求数量。注：如过期的评审已被取消，则无需设置。
 settings.archive.mirrors_unavailable = 不能镜像已归档的仓库。
-settings.wiki_rename_branch_main_notices_2 = 这将预先重命名 %s 的存储库百科的内部分支。 现存的检出方式需要更新。
-settings.wiki_branch_rename_failure = 无法标准化存储库百科的分支名称。
+settings.wiki_rename_branch_main_notices_2 = 这将预先重命名 %s 的仓库百科的内部分支。 现存的检出方式需要更新。
+settings.wiki_branch_rename_failure = 无法标准化仓库百科的分支名称。
 settings.add_collaborator_blocked_our = 因仓库所有者已将其拉黑，不能添加该用户为协作者。
 settings.add_collaborator_blocked_them = 因该用户已将仓库所有者拉黑，不能添加该用户为协作者。
 settings.units.units = 仓库功能
 pulls.fast_forward_only_merge_pull_request = 仅快速向前
 settings.units.overview = 概览
-settings.units.add_more = 添加更多…
+settings.units.add_more = 启用更多
 file_follow = 跟随符号链接
 pulls.reopen_failed.head_branch = 因头部分支不再存在，该合并请求不能再被重新打开。
 pulls.reopen_failed.base_branch = 因基础分支不再存在，该合并请求不能再被重新打开。
@@ -2861,7 +2861,7 @@ teams=团队
 code=代码
 lower_members=名成员
 lower_repositories=个仓库
-create_new_team=新建团队
+create_new_team=创建团队
 create_team=创建团队
 org_desc=组织描述
 team_name=团队名称
@@ -2964,7 +2964,7 @@ teams.add_duplicate_users=用户已经是团队成员。
 teams.repos.none=此团队无法访问任何仓库。
 teams.members.none=团队中没有成员。
 teams.specific_repositories=指定仓库
-teams.specific_repositories_helper=团队成员将只能访问添加到团队的仓库。 选择此项 将不会 自动删除已经添加的仓库。
+teams.specific_repositories_helper=团队成员将只能访问添加到团队的仓库。 选择此项将不会自动删除通过所有仓库添加的仓库。
 teams.all_repositories=所有仓库
 teams.all_repositories_helper=团队可以访问所有仓库。选择此选项将 添加所有现有的 仓库到指定团队。
 teams.all_repositories_read_permission_desc=此团队授予读取所有仓库的访问权限: 成员可以查看和克隆仓库。
@@ -3548,10 +3548,10 @@ rename_repo=重命名仓库 %[1]s 为 %[3]s
 commit_repo=推送到了仓库 %[4]s 的 %[3]s 分支
 create_issue=`创建了工单 %[3]s#%[2]s`
 close_issue=`关闭了工单 %[3]s#%[2]s`
-reopen_issue=`重新开启了工单 %[3]s#%[2]s`
+reopen_issue=`重新开放了工单 %[3]s#%[2]s`
 create_pull_request=`创建了合并请求 %[3]s#%[2]s`
 close_pull_request=`关闭了合并请求 %[3]s#%[2]s`
-reopen_pull_request=`重新开启了合并请求 %[3]s#%[2]s`
+reopen_pull_request=`重新开放了合并请求 %[3]s#%[2]s`
 comment_issue=`评论了工单 %[3]s#%[2]s`
 comment_pull=`评论了合并请求 %[3]s#%[2]s`
 merge_pull_request=`合并了合并请求 %[3]s#%[2]s`
@@ -3582,9 +3582,9 @@ future=将来
 1m=1分钟
 1h=1 小时
 1d=1 天
-1w=1周
+1w=1 周
 1mon=1 个月
-1y=1年
+1y=1 年
 seconds=%d 秒
 minutes=%d 分钟
 hours=%d 小时
@@ -3603,8 +3603,8 @@ remove_file=移除文件
 
 [notification]
 notifications=通知
-unread=未读消息
-read=已读消息
+unread=未读
+read=已读
 no_unread=没有未读通知。
 no_read=没有已读通知。
 pin=Pin 通知
@@ -3752,7 +3752,7 @@ settings.delete.success=软件包已被删除。
 settings.delete.error=删除软件包失败。
 owner.settings.cargo.title=Cargo 注册中心索引
 owner.settings.cargo.initialize=初始化索引
-owner.settings.cargo.initialize.description=使用 Cargo 注册中心时需要一个特殊索引的 Git 仓库。使用此选项将（重新）创建存储库并自动配置它。
+owner.settings.cargo.initialize.description=使用 Cargo 注册中心时需要一个特殊索引的 Git 仓库。使用此选项将（重新）创建仓库并自动配置它。
 owner.settings.cargo.initialize.error=初始化Cargo索引失败： %v
 owner.settings.cargo.initialize.success=Cargo索引已经成功创建。
 owner.settings.cargo.rebuild=重建索引

From 5a21ff8e95032c2f1ef3670add0b6cf3d3a0e507 Mon Sep 17 00:00:00 2001
From: 0ko <0ko@noreply.codeberg.org>
Date: Mon, 14 Oct 2024 05:20:02 +0000
Subject: [PATCH 153/443] i18n(en): fix typo (#5554)

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5554
Reviewed-by: Gusted 
---
 options/locale/locale_en-US.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 15267e4284..422e265368 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2381,7 +2381,7 @@ settings.event_push_desc = Git push to a repository.
 settings.event_repository = Repository
 settings.event_repository_desc = Repository created or deleted.
 settings.event_header_issue = Issue events
-settings.event_issues = Modifcation
+settings.event_issues = Modification
 settings.event_issues_desc = Issue opened, closed, reopened, or edited.
 settings.event_issue_assign = Assignment
 settings.event_issue_assign_desc = Issue assigned or unassigned.

From 1d961495f30a888d3c9301fc529bfdd7f0a67c04 Mon Sep 17 00:00:00 2001
From: JakobDev 
Date: Mon, 14 Oct 2024 19:24:56 +0200
Subject: [PATCH 154/443] fix: regression from #4125

---
 templates/repo/issue/openclose.tmpl | 10 ++++++----
 tests/integration/milestone_test.go | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/templates/repo/issue/openclose.tmpl b/templates/repo/issue/openclose.tmpl
index 5de1d1f639..4c2d69355b 100644
--- a/templates/repo/issue/openclose.tmpl
+++ b/templates/repo/issue/openclose.tmpl
@@ -13,8 +13,10 @@
 		{{svg "octicon-check" 16 "tw-mr-2"}}
 		{{ctx.Locale.PrettyNumber .ClosedCount}} {{ctx.Locale.Tr "repo.issues.closed_title"}}
 	
-	
-		{{svg "octicon-eye" 16 "tw-mr-2"}}
-		{{ctx.Locale.PrettyNumber (.AllCount)}} {{ctx.Locale.Tr "repo.issues.all_title"}}
-	
+	{{if not .PageIsMilestones}}
+		
+			{{svg "octicon-eye" 16 "tw-mr-2"}}
+			{{ctx.Locale.PrettyNumber (.AllCount)}} {{ctx.Locale.Tr "repo.issues.all_title"}}
+		
+	{{end}}
 

diff --git a/tests/integration/milestone_test.go b/tests/integration/milestone_test.go
index ba46740a19..8e07a0232b 100644
--- a/tests/integration/milestone_test.go
+++ b/tests/integration/milestone_test.go
@@ -23,3 +23,20 @@ func TestViewMilestones(t *testing.T) {
 	placeholder, _ := search.Attr("placeholder")
 	assert.Equal(t, "Search milestones...", placeholder)
 }
+
+func TestMilestonesCount(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	req := NewRequest(t, "GET", "/user2/repo1/milestones")
+	resp := MakeRequest(t, req, http.StatusOK)
+
+	htmlDoc := NewHTMLParser(t, resp.Body)
+
+	openCount := htmlDoc.doc.Find("a[data-test-name='open-issue-count']").Text()
+	assert.Contains(t, openCount, "2\u00a0Open")
+
+	closedCount := htmlDoc.doc.Find("a[data-test-name='closed-issue-count']").Text()
+	assert.Contains(t, closedCount, "1\u00a0Closed")
+
+	assert.Len(t, htmlDoc.doc.Find("a[data-test-name='closed-issue-count']").Nodes, 0)
+}

From c3cc4d82ec2be23a0769fd7cbb57e4c6e49b83d1 Mon Sep 17 00:00:00 2001
From: JakobDev 
Date: Mon, 14 Oct 2024 20:15:40 +0200
Subject: [PATCH 155/443] Use assert.Empty

---
 tests/integration/milestone_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/milestone_test.go b/tests/integration/milestone_test.go
index 8e07a0232b..6bcf7d7128 100644
--- a/tests/integration/milestone_test.go
+++ b/tests/integration/milestone_test.go
@@ -38,5 +38,5 @@ func TestMilestonesCount(t *testing.T) {
 	closedCount := htmlDoc.doc.Find("a[data-test-name='closed-issue-count']").Text()
 	assert.Contains(t, closedCount, "1\u00a0Closed")
 
-	assert.Len(t, htmlDoc.doc.Find("a[data-test-name='closed-issue-count']").Nodes, 0)
+	assert.Empty(t, htmlDoc.doc.Find("a[data-test-name='closed-issue-count']").Nodes)
 }

From 5443bca39ae32ec37095f96fa9db405a1efedc2a Mon Sep 17 00:00:00 2001
From: jutty 
Date: Mon, 14 Oct 2024 08:41:39 -0300
Subject: [PATCH 156/443] Fix typo in English locale file

Key settings.wiki_rename_branch_main_notices_2 had a duplicated 'the'.
---
 options/locale/locale_en-US.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 422e265368..d41c44eb26 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2288,7 +2288,7 @@ settings.trust_model.collaboratorcommitter.desc = Valid signatures by collaborat
 settings.wiki_rename_branch_main = Normalize the Wiki branch name
 settings.wiki_rename_branch_main_desc = Rename the branch used internally by the Wiki to "%s". This change is permanent and cannot be undone.
 settings.wiki_rename_branch_main_notices_1 = This operation CANNOT be undone.
-settings.wiki_rename_branch_main_notices_2 = This will permanently rename the the internal branch of %s's repository wiki. Existing checkouts will need to be updated.
+settings.wiki_rename_branch_main_notices_2 = This will permanently rename the internal branch of %s's repository wiki. Existing checkouts will need to be updated.
 settings.wiki_branch_rename_success = The repository wiki's branch name has been successfully normalized.
 settings.wiki_branch_rename_failure = Failed to normalize the repository wiki's branch name.
 settings.confirm_wiki_branch_rename = Rename the wiki branch

From 351c18c0619df4fc63190d797a4bc96e3e040a69 Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Mon, 14 Oct 2024 18:55:32 +0000
Subject: [PATCH 157/443] Update security option in issue template

Searching by the short key ID is not even enabled for keyservers. So point to https://forgejo.org/.well-known/security.txt instead for the necessary encryption details.
---
 .forgejo/issue_template/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.forgejo/issue_template/config.yml b/.forgejo/issue_template/config.yml
index 0e3caf9280..f2ea8d945a 100644
--- a/.forgejo/issue_template/config.yml
+++ b/.forgejo/issue_template/config.yml
@@ -1,7 +1,7 @@
 contact_links:
   - name: 🔓 Security Reports
     url: mailto:security@forgejo.org
-    about: "Please email  (GPG: `A4676E79`) instead of opening a public issue."
+    about: "Please email  (See https://forgejo.org/.well-known/security.txt)."
   - name: 💬 Matrix Chat Room
     url: https://matrix.to/#/#forgejo-chat:matrix.org
     about: Please ask questions and discuss configuration or deployment problems here.

From 7e805fa665cc58f99aa416707598ecd674dd0be9 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Mon, 14 Oct 2024 20:04:12 +0000
Subject: [PATCH 158/443] Update renovate to v38.121.0

---
 .forgejo/workflows/renovate.yml | 2 +-
 Makefile                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml
index d05495d317..2a72436e00 100644
--- a/.forgejo/workflows/renovate.yml
+++ b/.forgejo/workflows/renovate.yml
@@ -23,7 +23,7 @@ jobs:
 
     runs-on: docker
     container:
-      image: code.forgejo.org/forgejo-contrib/renovate:38.110.2
+      image: code.forgejo.org/forgejo-contrib/renovate:38.121.0
 
     steps:
       - name: Load renovate repo cache
diff --git a/Makefile b/Makefile
index 5dcf6e1f45..9ba556862d 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1 # renovate: datasour
 DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.26.0 # renovate: datasource=go
 GOMOCK_PACKAGE ?= go.uber.org/mock/mockgen@v0.4.0 # renovate: datasource=go
 GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.16.2 # renovate: datasource=go
-RENOVATE_NPM_PACKAGE ?= renovate@38.110.2 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate
+RENOVATE_NPM_PACKAGE ?= renovate@38.121.0 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate
 
 ifeq ($(HAS_GO), yes)
 	CGO_EXTRA_CFLAGS := -DSQLITE_MAX_VARIABLE_NUMBER=32766

From 2fc96073a15f605d50880ba54b03c8a23120539f Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Mon, 14 Oct 2024 20:04:59 +0000
Subject: [PATCH 159/443] Update module github.com/urfave/cli/v2 to v2.27.5

---
 go.mod | 4 ++--
 go.sum | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index 90bf00a530..1e96ed07ff 100644
--- a/go.mod
+++ b/go.mod
@@ -93,7 +93,7 @@ require (
 	github.com/stretchr/testify v1.9.0
 	github.com/syndtr/goleveldb v1.0.0
 	github.com/ulikunitz/xz v0.5.12
-	github.com/urfave/cli/v2 v2.27.4
+	github.com/urfave/cli/v2 v2.27.5
 	github.com/valyala/fastjson v1.6.4
 	github.com/xanzy/go-gitlab v0.109.0
 	github.com/yohcop/openid-go v1.0.1
@@ -160,7 +160,7 @@ require (
 	github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cloudflare/circl v1.3.8 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/davidmz/go-pageant v1.0.2 // indirect
diff --git a/go.sum b/go.sum
index fd879871ef..92dbd08388 100644
--- a/go.sum
+++ b/go.sum
@@ -165,8 +165,8 @@ github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38
 github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
 github.com/cloudflare/circl v1.3.8 h1:j+V8jJt09PoeMFIu2uh5JUyEaIHTXVOHslFoLNAKqwI=
 github.com/cloudflare/circl v1.3.8/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU=
-github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
-github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
+github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
 github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
@@ -662,8 +662,8 @@ github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oW
 github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
 github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/urfave/cli/v2 v2.27.4 h1:o1owoI+02Eb+K107p27wEX9Bb8eqIoZCfLXloLUSWJ8=
-github.com/urfave/cli/v2 v2.27.4/go.mod h1:m4QzxcD2qpra4z7WhzEGn74WZLViBnMpb1ToCAKdGRQ=
+github.com/urfave/cli/v2 v2.27.5 h1:WoHEJLdsXr6dDWoJgMq/CboDmyY/8HMMH1fTECbih+w=
+github.com/urfave/cli/v2 v2.27.5/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
 github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ=
 github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=

From 698d7596828a3582cf961fae7f453fff15eea945 Mon Sep 17 00:00:00 2001
From: JakobDev 
Date: Mon, 14 Oct 2024 22:23:14 +0200
Subject: [PATCH 160/443] Fix test

---
 tests/integration/milestone_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/milestone_test.go b/tests/integration/milestone_test.go
index 6bcf7d7128..2a01786dc0 100644
--- a/tests/integration/milestone_test.go
+++ b/tests/integration/milestone_test.go
@@ -38,5 +38,5 @@ func TestMilestonesCount(t *testing.T) {
 	closedCount := htmlDoc.doc.Find("a[data-test-name='closed-issue-count']").Text()
 	assert.Contains(t, closedCount, "1\u00a0Closed")
 
-	assert.Empty(t, htmlDoc.doc.Find("a[data-test-name='closed-issue-count']").Nodes)
+	assert.Empty(t, htmlDoc.doc.Find("a[data-test-name='allissue-count']").Nodes)
 }

From 0605219dcf79dc26da83981830af17fd7794ee71 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Tue, 15 Oct 2024 00:05:48 +0000
Subject: [PATCH 161/443] Update vitest monorepo to v2.1.3

---
 package-lock.json | 114 +++++++++++++++++++++++-----------------------
 package.json      |   4 +-
 2 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7e16a7ce05..ed24324ec7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -67,7 +67,7 @@
         "@stylistic/eslint-plugin-js": "2.9.0",
         "@stylistic/stylelint-plugin": "3.1.1",
         "@vitejs/plugin-vue": "5.1.4",
-        "@vitest/coverage-v8": "2.1.2",
+        "@vitest/coverage-v8": "2.1.3",
         "@vitest/eslint-plugin": "1.1.7",
         "@vue/test-utils": "2.4.6",
         "eslint": "8.57.1",
@@ -94,7 +94,7 @@
         "stylelint-value-no-unknown-custom-properties": "6.0.1",
         "svgo": "3.2.0",
         "vite-string-plugin": "1.3.4",
-        "vitest": "2.1.2"
+        "vitest": "2.1.3"
       },
       "engines": {
         "node": ">= 18.0.0"
@@ -4863,9 +4863,9 @@
       }
     },
     "node_modules/@vitest/coverage-v8": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-2.1.2.tgz",
-      "integrity": "sha512-b7kHrFrs2urS0cOk5N10lttI8UdJ/yP3nB4JYTREvR5o18cR99yPpK4gK8oQgI42BVv0ILWYUSYB7AXkAUDc0g==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-2.1.3.tgz",
+      "integrity": "sha512-2OJ3c7UPoFSmBZwqD2VEkUw6A/tzPF0LmW0ZZhhB8PFxuc+9IBG/FaSM+RLEenc7ljzFvGN+G0nGQoZnh7sy2A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4886,8 +4886,8 @@
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "@vitest/browser": "2.1.2",
-        "vitest": "2.1.2"
+        "@vitest/browser": "2.1.3",
+        "vitest": "2.1.3"
       },
       "peerDependenciesMeta": {
         "@vitest/browser": {
@@ -4896,9 +4896,9 @@
       }
     },
     "node_modules/@vitest/coverage-v8/node_modules/magic-string": {
-      "version": "0.30.11",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
-      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
+      "version": "0.30.12",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz",
+      "integrity": "sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4927,14 +4927,14 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.2.tgz",
-      "integrity": "sha512-FEgtlN8mIUSEAAnlvn7mP8vzaWhEaAEvhSXCqrsijM7K6QqjB11qoRZYEd4AKSCDz8p0/+yH5LzhZ47qt+EyPg==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.3.tgz",
+      "integrity": "sha512-SNBoPubeCJhZ48agjXruCI57DvxcsivVDdWz+SSsmjTT4QN/DfHk3zB/xKsJqMs26bLZ/pNRLnCf0j679i0uWQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "2.1.2",
-        "@vitest/utils": "2.1.2",
+        "@vitest/spy": "2.1.3",
+        "@vitest/utils": "2.1.3",
         "chai": "^5.1.1",
         "tinyrainbow": "^1.2.0"
       },
@@ -4943,13 +4943,13 @@
       }
     },
     "node_modules/@vitest/mocker": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.2.tgz",
-      "integrity": "sha512-ExElkCGMS13JAJy+812fw1aCv2QO/LBK6CyO4WOPAzLTmve50gydOlWhgdBJPx2ztbADUq3JVI0C5U+bShaeEA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.3.tgz",
+      "integrity": "sha512-eSpdY/eJDuOvuTA3ASzCjdithHa+GIF1L4PqtEELl6Qa3XafdMLBpBlZCIUCX2J+Q6sNmjmxtosAG62fK4BlqQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "^2.1.0-beta.1",
+        "@vitest/spy": "2.1.3",
         "estree-walker": "^3.0.3",
         "magic-string": "^0.30.11"
       },
@@ -4957,7 +4957,7 @@
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "@vitest/spy": "2.1.2",
+        "@vitest/spy": "2.1.3",
         "msw": "^2.3.5",
         "vite": "^5.0.0"
       },
@@ -4998,9 +4998,9 @@
       }
     },
     "node_modules/@vitest/pretty-format": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.2.tgz",
-      "integrity": "sha512-FIoglbHrSUlOJPDGIrh2bjX1sNars5HbxlcsFKCtKzu4+5lpsRhOCVcuzp0fEhAGHkPZRIXVNzPcpSlkoZ3LuA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.3.tgz",
+      "integrity": "sha512-XH1XdtoLZCpqV59KRbPrIhFCOO0hErxrQCMcvnQete3Vibb9UeIOX02uFPfVn3Z9ZXsq78etlfyhnkmIZSzIwQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5011,13 +5011,13 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.2.tgz",
-      "integrity": "sha512-UCsPtvluHO3u7jdoONGjOSil+uON5SSvU9buQh3lP7GgUXHp78guN1wRmZDX4wGK6J10f9NUtP6pO+SFquoMlw==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.3.tgz",
+      "integrity": "sha512-JGzpWqmFJ4fq5ZKHtVO3Xuy1iF2rHGV4d/pdzgkYHm1+gOzNZtqjvyiaDGJytRyMU54qkxpNzCx+PErzJ1/JqQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "2.1.2",
+        "@vitest/utils": "2.1.3",
         "pathe": "^1.1.2"
       },
       "funding": {
@@ -5025,13 +5025,13 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.2.tgz",
-      "integrity": "sha512-xtAeNsZ++aRIYIUsek7VHzry/9AcxeULlegBvsdLncLmNCR6tR8SRjn8BbDP4naxtccvzTqZ+L1ltZlRCfBZFA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.3.tgz",
+      "integrity": "sha512-qWC2mWc7VAXmjAkEKxrScWHWFyCQx/cmiZtuGqMi+WwqQJ2iURsVY4ZfAK6dVo6K2smKRU6l3BPwqEBvhnpQGg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "2.1.2",
+        "@vitest/pretty-format": "2.1.3",
         "magic-string": "^0.30.11",
         "pathe": "^1.1.2"
       },
@@ -5050,9 +5050,9 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.2.tgz",
-      "integrity": "sha512-GSUi5zoy+abNRJwmFhBDC0yRuVUn8WMlQscvnbbXdKLXX9dE59YbfwXxuJ/mth6eeqIzofU8BB5XDo/Ns/qK2A==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.3.tgz",
+      "integrity": "sha512-Nb2UzbcUswzeSP7JksMDaqsI43Sj5+Kry6ry6jQJT4b5gAK+NS9NED6mDb8FlMRCX8m5guaHCDZmqYMMWRy5nQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5063,13 +5063,13 @@
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.2.tgz",
-      "integrity": "sha512-zMO2KdYy6mx56btx9JvAqAZ6EyS3g49krMPPrgOp1yxGZiA93HumGk+bZ5jIZtOg5/VBYl5eBmGRQHqq4FG6uQ==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.3.tgz",
+      "integrity": "sha512-xpiVfDSg1RrYT0tX6czgerkpcKFmFOF/gCr30+Mve5V2kewCy4Prn1/NDMSRwaSmT7PRaOF83wu+bEtsY1wrvA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "2.1.2",
+        "@vitest/pretty-format": "2.1.3",
         "loupe": "^3.1.1",
         "tinyrainbow": "^1.2.0"
       },
@@ -16106,9 +16106,9 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.2.tgz",
-      "integrity": "sha512-HPcGNN5g/7I2OtPjLqgOtCRu/qhVvBxTUD3qzitmL0SrG1cWFzxzhMDWussxSbrRYWqnKf8P2jiNhPMSN+ymsQ==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.3.tgz",
+      "integrity": "sha512-I1JadzO+xYX887S39Do+paRePCKoiDrWRRjp9kkG5he0t7RXNvPAJPCQSJqbGN4uCrFFeS3Kj3sLqY8NMYBEdA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16193,19 +16193,19 @@
       }
     },
     "node_modules/vitest": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.2.tgz",
-      "integrity": "sha512-veNjLizOMkRrJ6xxb+pvxN6/QAWg95mzcRjtmkepXdN87FNfxAss9RKe2far/G9cQpipfgP2taqg0KiWsquj8A==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.3.tgz",
+      "integrity": "sha512-Zrxbg/WiIvUP2uEzelDNTXmEMJXuzJ1kCpbDvaKByFA9MNeO95V+7r/3ti0qzJzrxdyuUw5VduN7k+D3VmVOSA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/expect": "2.1.2",
-        "@vitest/mocker": "2.1.2",
-        "@vitest/pretty-format": "^2.1.2",
-        "@vitest/runner": "2.1.2",
-        "@vitest/snapshot": "2.1.2",
-        "@vitest/spy": "2.1.2",
-        "@vitest/utils": "2.1.2",
+        "@vitest/expect": "2.1.3",
+        "@vitest/mocker": "2.1.3",
+        "@vitest/pretty-format": "^2.1.3",
+        "@vitest/runner": "2.1.3",
+        "@vitest/snapshot": "2.1.3",
+        "@vitest/spy": "2.1.3",
+        "@vitest/utils": "2.1.3",
         "chai": "^5.1.1",
         "debug": "^4.3.6",
         "magic-string": "^0.30.11",
@@ -16216,7 +16216,7 @@
         "tinypool": "^1.0.0",
         "tinyrainbow": "^1.2.0",
         "vite": "^5.0.0",
-        "vite-node": "2.1.2",
+        "vite-node": "2.1.3",
         "why-is-node-running": "^2.3.0"
       },
       "bin": {
@@ -16231,8 +16231,8 @@
       "peerDependencies": {
         "@edge-runtime/vm": "*",
         "@types/node": "^18.0.0 || >=20.0.0",
-        "@vitest/browser": "2.1.2",
-        "@vitest/ui": "2.1.2",
+        "@vitest/browser": "2.1.3",
+        "@vitest/ui": "2.1.3",
         "happy-dom": "*",
         "jsdom": "*"
       },
@@ -16258,9 +16258,9 @@
       }
     },
     "node_modules/vitest/node_modules/magic-string": {
-      "version": "0.30.11",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
-      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
+      "version": "0.30.12",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz",
+      "integrity": "sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 4d8c6261d9..162e05eb26 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "@stylistic/eslint-plugin-js": "2.9.0",
     "@stylistic/stylelint-plugin": "3.1.1",
     "@vitejs/plugin-vue": "5.1.4",
-    "@vitest/coverage-v8": "2.1.2",
+    "@vitest/coverage-v8": "2.1.3",
     "@vitest/eslint-plugin": "1.1.7",
     "@vue/test-utils": "2.4.6",
     "eslint": "8.57.1",
@@ -93,7 +93,7 @@
     "stylelint-value-no-unknown-custom-properties": "6.0.1",
     "svgo": "3.2.0",
     "vite-string-plugin": "1.3.4",
-    "vitest": "2.1.2"
+    "vitest": "2.1.3"
   },
   "browserslist": ["defaults"]
 }

From 10c6ac77797284e84886ab71e7be5b85dee4fc65 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Tue, 15 Oct 2024 07:07:59 +0000
Subject: [PATCH 162/443] Update module github.com/redis/go-redis/v9 to v9.6.2
 (forgejo) (#5568)

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5568
Reviewed-by: Michael Kriese 
Co-authored-by: Renovate Bot 
Co-committed-by: Renovate Bot 
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index b500ce1bd1..88159611e2 100644
--- a/go.mod
+++ b/go.mod
@@ -84,7 +84,7 @@ require (
 	github.com/opencontainers/image-spec v1.1.0
 	github.com/pquerna/otp v1.4.0
 	github.com/prometheus/client_golang v1.18.0
-	github.com/redis/go-redis/v9 v9.6.1
+	github.com/redis/go-redis/v9 v9.6.2
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/santhosh-tekuri/jsonschema/v6 v6.0.1
 	github.com/sassoftware/go-rpmutils v0.4.0
diff --git a/go.sum b/go.sum
index 92dbd08388..41801a3626 100644
--- a/go.sum
+++ b/go.sum
@@ -579,8 +579,8 @@ github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqSc
 github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ=
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
-github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4=
-github.com/redis/go-redis/v9 v9.6.1/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA=
+github.com/redis/go-redis/v9 v9.6.2 h1:w0uvkRbc9KpgD98zcvo5IrVUsn0lXpRMuhNgiHDJzdk=
+github.com/redis/go-redis/v9 v9.6.2/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rhysd/actionlint v1.6.27 h1:xxwe8YmveBcC8lydW6GoHMGmB6H/MTqUU60F2p10wjw=

From 42092ead8b2c34c6e9fdd844866ade6bd8ecd160 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Wed, 16 Oct 2024 00:03:18 +0000
Subject: [PATCH 163/443] Update dependency chart.js to v4.4.5

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ed24324ec7..14da9e5227 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@primer/octicons": "19.9.0",
         "ansi_up": "6.0.2",
         "asciinema-player": "3.8.0",
-        "chart.js": "4.4.4",
+        "chart.js": "4.4.5",
         "chartjs-adapter-dayjs-4": "1.0.4",
         "chartjs-plugin-zoom": "2.0.1",
         "clippie": "4.1.1",
@@ -6215,9 +6215,9 @@
       }
     },
     "node_modules/chart.js": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.4.tgz",
-      "integrity": "sha512-emICKGBABnxhMjUjlYRR12PmOXhJ2eJjEHL2/dZlWjxRAZT1D8xplLFq5M0tMQK8ja+wBS/tuVEJB5C6r7VxJA==",
+      "version": "4.4.5",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.5.tgz",
+      "integrity": "sha512-CVVjg1RYTJV9OCC8WeJPMx8gsV8K6WIyIEQUE3ui4AR9Hfgls9URri6Ja3hyMVBbTF8Q2KFa19PE815gWcWhng==",
       "license": "MIT",
       "dependencies": {
         "@kurkle/color": "^0.3.0"
diff --git a/package.json b/package.json
index 162e05eb26..bb631dca75 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "@primer/octicons": "19.9.0",
     "ansi_up": "6.0.2",
     "asciinema-player": "3.8.0",
-    "chart.js": "4.4.4",
+    "chart.js": "4.4.5",
     "chartjs-adapter-dayjs-4": "1.0.4",
     "chartjs-plugin-zoom": "2.0.1",
     "clippie": "4.1.1",

From 0c146ddf72a9d98cd92b788dd19d25c5c7933c93 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Wed, 16 Oct 2024 02:05:17 +0000
Subject: [PATCH 164/443] Update module
 github.com/buildkite/terminal-to-html/v3 to v3.16.3

---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 5f4b800d5d..9175ee9891 100644
--- a/go.mod
+++ b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/alecthomas/chroma/v2 v2.14.0
 	github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb
 	github.com/blevesearch/bleve/v2 v2.4.2
-	github.com/buildkite/terminal-to-html/v3 v3.16.2
+	github.com/buildkite/terminal-to-html/v3 v3.16.3
 	github.com/caddyserver/certmagic v0.21.4
 	github.com/chi-middleware/proxy v1.1.1
 	github.com/djherbis/buffer v1.2.0
diff --git a/go.sum b/go.sum
index 5020569b45..66b5bcee2f 100644
--- a/go.sum
+++ b/go.sum
@@ -143,8 +143,8 @@ github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
 github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
 github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
-github.com/buildkite/terminal-to-html/v3 v3.16.2 h1:ueVE+BUqKOK3O4p+oul1y4Lo0sq7Qoj2Fb6/DJOrxYM=
-github.com/buildkite/terminal-to-html/v3 v3.16.2/go.mod h1:tdi6+MA4AjV5udS5cm8PVxLHsbJWLGsr5W/tHFzPgbY=
+github.com/buildkite/terminal-to-html/v3 v3.16.3 h1:IGuJjboHjuMLWOGsKZKNxbbn41emOLiHzXPmQZk31fk=
+github.com/buildkite/terminal-to-html/v3 v3.16.3/go.mod h1:r/J7cC9c3EzBzP3/wDz0RJLPwv5PUAMp+KF2w+ntMc0=
 github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
 github.com/caddyserver/certmagic v0.21.4 h1:e7VobB8rffHv8ZZpSiZtEwnLDHUwLVYLWzWSa1FfKI0=
 github.com/caddyserver/certmagic v0.21.4/go.mod h1:swUXjQ1T9ZtMv95qj7/InJvWLXURU85r+CfG0T+ZbDE=

From 2f1c33b5e06f61c0763ec282ef24c46b1fd294ff Mon Sep 17 00:00:00 2001
From: Codeberg Translate 
Date: Wed, 16 Oct 2024 02:49:05 +0000
Subject: [PATCH 165/443] i18n: update of translations from Codeberg Translate
 (#5555)

Co-authored-by: Benedikt Straub 
Co-authored-by: SomeTr 
Co-authored-by: Juno Takano 
Co-authored-by: Atul_Eterno 
Co-authored-by: Outbreak2096 
Co-authored-by: Xinayder 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5555
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Codeberg Translate 
Co-committed-by: Codeberg Translate 
---
 options/locale/locale_es-ES.ini |    4 +-
 options/locale/locale_fr-FR.ini |   30 +-
 options/locale/locale_lt.ini    |    2 +
 options/locale/locale_nds.ini   | 1532 ++++++++++++++++++++++++++++++-
 options/locale/locale_pt-BR.ini |  230 ++---
 options/locale/locale_uk-UA.ini |  124 ++-
 options/locale/locale_zh-CN.ini |    2 +-
 7 files changed, 1744 insertions(+), 180 deletions(-)

diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
index d890914e8c..77580cb528 100644
--- a/options/locale/locale_es-ES.ini
+++ b/options/locale/locale_es-ES.ini
@@ -1598,9 +1598,9 @@ issues.no_content=No se ha proporcionado una descripción.
 issues.close=Cerrar incidencia
 issues.comment_pull_merged_at=commit fusionado %[1]s en %[2]s %[3]s
 issues.comment_manually_pull_merged_at=commit manualmente fusionado %[1]s en %[2]s %[3]s
-issues.close_comment_issue=Comentar y cerrar
+issues.close_comment_issue=Cerrar con comentario
 issues.reopen_issue=Reabrir
-issues.reopen_comment_issue=Comentar y reabrir
+issues.reopen_comment_issue=Reabrir con comentario
 issues.create_comment=Comentar
 issues.closed_at=`cerró esta incidencia %[2]s`
 issues.reopened_at=`reabrió esta incidencia %[2]s`
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
index f35054d72c..2d6dea5c94 100644
--- a/options/locale/locale_fr-FR.ini
+++ b/options/locale/locale_fr-FR.ini
@@ -2329,32 +2329,32 @@ settings.event_push_desc=Soumission Git.
 settings.event_repository=Dépôt
 settings.event_repository_desc=Dépôt créé ou supprimé.
 settings.event_header_issue=Événements de ticket
-settings.event_issues=Ticket
+settings.event_issues=Modification
 settings.event_issues_desc=Ticket ouvert, rouvert, fermé ou modifié.
-settings.event_issue_assign=Ticket assigné
+settings.event_issue_assign=Assigné
 settings.event_issue_assign_desc=Ticket assigné ou dé-assigné.
-settings.event_issue_label=Ticket étiqueté
+settings.event_issue_label=Étiqueté
 settings.event_issue_label_desc=Labels attribués ou retirés.
-settings.event_issue_milestone=Ticket jalonné
+settings.event_issue_milestone=Jalonné
 settings.event_issue_milestone_desc=Ticket jalonné ou dé-jalonné.
-settings.event_issue_comment=Ticket commenté
+settings.event_issue_comment=Commenté
 settings.event_issue_comment_desc=Commentaire créé, modifié ou supprimé.
 settings.event_header_pull_request=Événements de demande d'ajout
 settings.event_pull_request=Demande d'ajout
 settings.event_pull_request_desc=Demande d’ajout ouverte, rouverte, fermée ou modifiée.
-settings.event_pull_request_assign=Demande d'ajout assignée
+settings.event_pull_request_assign=Assignée
 settings.event_pull_request_assign_desc=Demande d'ajout assignée ou non assignée.
-settings.event_pull_request_label=Demande d'ajout étiquetée
+settings.event_pull_request_label=Étiquetée
 settings.event_pull_request_label_desc=Label attribué ou retiré.
-settings.event_pull_request_milestone=Demande d'ajout jalonnée
-settings.event_pull_request_milestone_desc=Demande d'ajout jalonnée ou dé-jalonnée.
-settings.event_pull_request_comment=Commentaire sur une demande d'ajout
+settings.event_pull_request_milestone=Jalonnée
+settings.event_pull_request_milestone_desc=Jalonnée ou dé-jalonnée.
+settings.event_pull_request_comment=Commentaires
 settings.event_pull_request_comment_desc=Commentaire créé, modifié ou supprimé.
-settings.event_pull_request_review=Demande d'ajout évaluée
-settings.event_pull_request_review_desc=Demande d’ajout approuvée, rejetée ou commentée.
-settings.event_pull_request_sync=Demande d'ajout synchronisée
-settings.event_pull_request_sync_desc=Demande d'ajout synchronisée.
-settings.event_pull_request_review_request=Requête d’évaluation d'une demande d'ajout
+settings.event_pull_request_review=Évaluations
+settings.event_pull_request_review_desc=Demande d’ajout approuvée, rejetée ou commentaires d'évaluation ajoutés.
+settings.event_pull_request_sync=Synchronisée
+settings.event_pull_request_sync_desc=Branche mise à jour automatiquement avec la branche cible.
+settings.event_pull_request_review_request=Requête d’évaluation
 settings.event_pull_request_review_request_desc=Création ou suppresion de demandes d’évaluation.
 settings.event_pull_request_approvals=Approbations de demande d'ajout
 settings.event_pull_request_merge=Fusion de demande d'ajout
diff --git a/options/locale/locale_lt.ini b/options/locale/locale_lt.ini
index 62be471c1a..22716796f9 100644
--- a/options/locale/locale_lt.ini
+++ b/options/locale/locale_lt.ini
@@ -238,6 +238,7 @@ buttons.unindent.tooltip = Išdėti elementus vienu lygiu
 network_error = Tinklo klaida
 server_internal = Vidinio serverio klaida
 occurred = Įvyko klaida.
+report_message = Jei manote, kad tai „Forgejo“ riktas, ieškokite problemų platformoje „Codeberg“ arba, jei reikia, atidarykite naują problemą.
 
 [startpage]
 app_desc = Nesudėtinga, savarankiškai teikiama „Git“ paslauga
@@ -263,6 +264,7 @@ federated_avatar_lookup.description = Ieškokite pseudoportretų naudojant „Li
 db_schema_helper = Palikite tuščią, jei tai numatytoji duomenų bazė („public“).
 err_empty_admin_password = Administratoriaus slaptažodis negali būti tuščias.
 err_empty_admin_email = Administratoriaus el. paštas negali būti tuščias.
+install = Diegimas
 
 [explore]
 go_to = Eiti į
diff --git a/options/locale/locale_nds.ini b/options/locale/locale_nds.ini
index 5c39d4b5a2..d00efccffa 100644
--- a/options/locale/locale_nds.ini
+++ b/options/locale/locale_nds.ini
@@ -172,6 +172,7 @@ code_kind = In Quelltext söken …
 package_kind = In Paketen söken …
 issue_kind = In Gefallens söken …
 keyword_search_unavailable = Woorden-Söök is stedenwies nich verföögbaar. Bidde kuntakteer de Sied-Chef.
+code_search_by_git_grep = Stedenwies Quelltext-Söök-Resultaten worden vun »git grep« paraatstellt. Wenn de Sied-Chef de Quelltext-Indizerer anknipst, kann dat betere Resultaten geven.
 
 [aria]
 navbar = Navigerens-Balken
@@ -220,6 +221,13 @@ report_message = Wenn du glöövst, dat dat een Fehler mit Forgejo is, dann sö
 [startpage]
 app_desc = Een sülvst-hostet Git-Deenst sünner Pien
 install = Licht to installeren
+lightweight = Lichtgewichtig
+lightweight_desc = Forgejo hett minne Minnstanförderns un kann sülvst up eenem billigen Raspberry Pi lopen. Spaar diener Maschien Stroom!
+platform_desc = Forgejo löppt nawieselk up frejen Bedrievssysteemen as Linux un FreeBSD, un ok up verschedenen CPU-Architekturen. Köör ut, welke du am leevsten hest!
+license = Quellopen
+platform = Över all Plattformen
+license_desc = Gah un haal di Forgejo! Maak bi uns mit, um dat Projekt noch beter to maken. Wees nich schüchtern, een Bidrager to wesen!
+install_desc = Du kannst dat Programm eenfach up diener Plattfoorm utföhren, dat mit Docker verdeel, of dat as Paket halen.
 
 [home]
 uname_holder = Brukernaam of E-Mail-Adress
@@ -257,7 +265,7 @@ organizations = Verenigungen
 [auth]
 create_new_account = Konto vermarken
 disable_register_prompt = Registreren is utknipst. Bidde kuntakteer de Sied-Chef.
-disable_register_mail = E-Mail-Utwiiesen för ’t Registreren is utknipst.
+disable_register_mail = E-Mail-Utwiesen för ’t Registreren is utknipst.
 manual_activation_only = Kuntakteer de Sied-Chef, um dat Aktiveren oftosluten.
 remember_me = Deeses Gereed marken
 forgot_password = Passwoord vergeten?
@@ -311,6 +319,22 @@ oauth_signup_tab = Nejes Konto vermarken
 oauth_signup_title = Nejes Konto ofsluten
 oauth_signin_title = Mell di an, um dat Konto-Verbinnen to verlöven
 openid_connect_title = Mit eenem bestahn Konto verbinnen
+confirmation_mail_sent_prompt = Eene neje Utwiesens-E-Mail is an %s sennt worden. Um dat Registreren oftosluten, kiek bidde in dienen E-Mail-Ingang un folg de Verwies daarin in de anner %s. Wenn de E-Mail falsk is, kannst du di anmellen un eene neje Utwiesens-E-Mail an eene anner E-Mail-Adress verlangen.
+reset_password_mail_sent_prompt = Eene neje Utwiesens-E-Mail is an %s sennt worden. Um dat Konto-Torügghalen oftosluten, kiek bidde in dienen E-Mail-Ingang un folg de Verwies daarin in de anner %s.
+has_unconfirmed_mail = Moin %s, du hest eene nich utwiesen E-Mail-Adress (%s). Wenn du keene Utwiesens-E-Mail kregen hest of eene neje bruukst, klick bidde up de Knoop unnern.
+non_local_account = Frömde Brukers könen hör Passwoord nich dör de Forgejo-Internett-Brukerschnittstee vernejen.
+openid_register_desc = De utköört OpenID-URI is unbekannt. Verbinn dat hier mit eenem nejen Konto.
+disable_forgot_password_mail = Konto-Torügghalen is utknipst, denn keene E-Mail is inricht. Bidde kuntakteer dienen Sied-Chef.
+authorize_application_description = Wenn du de Togang verlöövst, kann dat all diene Konto-Informatioon lesen un schrieven, ok privaate Repos un Verenigungen.
+authorization_failed_desc = Dat Anmellen is fehlslagen, denn wi hebben eene ungültig Anfraag funnen. Bidde kuntakteer de Chef vun de Programm, wat du anmellen willst.
+twofa_scratch_used = Du hest dien Eenmaalpasswoord bruukt. Du büst to de Twee-Faktooren-Instellens-Sied umleit worden, waar du 2FA utknipsen of een nejes Eenmaalpasswoord maken kannst.
+oauth.signin.error.temporarily_unavailable = Anmellen fehlslagen, denn de Anmell-Server is jüüst nich verföögbaar. Bidde versöök dat naher noch eenmaal.
+twofa_passcode_incorrect = Diene Pass-Tahl is falsk. Wenn du diene Gereedskupp nich finnen kannst, bruuk tum Anmellen dien Eenmaalpasswoord.
+disable_forgot_password_mail_admin = Konto-Torügghalen is blots verföögbaar, wenn E-Mail inricht is. Bidde richt E-Mail in, um Konto-Torügghalen antoknipsen.
+oauth.signin.error = Bi’m Verarbeiden vun de Anmellens-Anfraag is een Fehler uptreden. Wenn de Fehler wieder uptreddt, kuntakteer bidde de Sied-Chef.
+openid_connect_desc = De utköört OpenID-URI is unbekannt. Verbinn dat hier mit eenem nejen Konto.
+openid_signin_desc = Giff diene OpenID-URI in. To’n Bispööl: alice.openid.example.org of https://openid.example.org/alice.
+password_pwned = Dat Passwoord, wat du utköört hest, is up eener List vun klaut Passwoorden, wat tovör in publiken Datenbröken blootmaakt worden is. Bidde versöök dat noch eenmaal mit eenem anner Passwoord, un överlegg di, of du deeses Passwoord ok annerwaar ännern willst.
 
 [mail]
 view_it_on = Up %s wiesen
@@ -379,6 +403,7 @@ issue.action.close = @%[1]s hett #%[2]s dichtmaakt.
 repo.transfer.body = Um dat antonehmen of oftolehnen, besöök %s, of ignoreer dat eenfach.
 release.download.zip = Quelltext (ZIP)
 team_invite.subject = %[1]s hett di inladen, in de Verenigung %[2]s intotreden
+admin.new_user.text = Bidde klick hier, um deesen Bruker vun de Chef-Paneel to verwalten.
 
 [modal]
 no = Nee
@@ -477,6 +502,9 @@ required_prefix = Ingaav mutt mit »%s« begünnen
 must_use_public_key = Du hest eenen privaaten Slötel ingeven. Bidde laad dienen privaaten Slötel nienich elkeenwaar up. Bruuk in Stee daarvun dienen publiken Slötel.
 still_has_org = Dien Konto is een Liddmaat in een of mehr Verenigungen, verlaat se eerst.
 org_still_own_packages = Deese Verenigung is een Eegner vun een of mehr Paketen, löske se eerst.
+PayloadUrl = Ladung-URL
+visit_rate_limit = Frömd-Togriep hett Togrieps-Begrenz troffen.
+2fa_auth_required = Frömd-Togriep bruukt Twee-Faktooren-Anmellen.
 
 [user]
 change_avatar = Änner dien Kontobill …
@@ -509,6 +537,15 @@ disabled_public_activity = Deeser Bruker hett dat publike Ankieken vun de Doon u
 form.name_chars_not_allowed = Brukernaam »%s« enhollt ungültig Bookstavens.
 form.name_pattern_not_allowed = Dat Muster »%s« is in eenem Brukernaam nich verlöövt.
 form.name_reserved = De Brukernaam »%s« is vörbehollen.
+block_user.detail = Bidde wees wiss, dat dat Blockeren vun eenem Bruker anner Resultaten hett, nämlich:
+block_user.detail_1 = Jo wordt elkeen anner nich mehr nagahn un eenanner ok nich mehr nagahn könen.
+block_user.detail_2 = Deeser Bruker kann nich mit dienen Repositoriums warken, un ok nich mit Gefallens un Kommentaren, wat to maakt hest.
+block_user.detail_3 = Jo köönt eenanner nich as Repositoriums-Mitarbeiders hentofögen.
+follow_blocked_user = Du kannst deesem Bruker nich nagahn, denn du hest deesen Bruker blockeert of deeser Bruker hett di blockeert.
+public_activity.visibility_hint.self_public = Dien Doon is för elkeen sichtbaar, blots nich dat Warken in privaaten Steden. Inrichten.
+public_activity.visibility_hint.admin_public = Dien Doon is för elkeen sichtbaar, aver as Chef kannst du ok dat Warken in privaaten Steden sehn.
+public_activity.visibility_hint.self_private = Blots du un de Instanz-Chefs könen dien Doon sehn. Inrichten.
+public_activity.visibility_hint.admin_private = Du kannst deeses Doon sehn, um dat, dat du een Chef büst, aver de Bruker will, dat dat privaat blievt.
 
 [settings]
 profile = Profil
@@ -537,7 +574,7 @@ language.localization_project = Hülp uns, Forgejo in diene Spraak to översette
 hints = Wenken
 update_hints = Wenken vernejen
 update_hints_success = Wenken sünd verneeit worden.
-hidden_comment_types = Verbargen Kommentaar-Aarden
+hidden_comment_types = Verburgen Kommentaar-Aarden
 hidden_comment_types.issue_ref_tooltip = Kommentaren, waar de Bruker de Twieg/Mark, wat mit deesem Gefall verbunnen is, ännert hett
 comment_type_group_branch = Twieg
 comment_type_group_time_tracking = Tied-Erfaten
@@ -773,7 +810,7 @@ then_enter_passcode = Un giff de Pass-Tahl in, wat dat Programm wiest:
 webauthn_delete_key = Sekerheids-Slötel wegdoon
 webauthn_key_loss_warning = Wenn du diene Sekerheids-Slötels verlüst, verlüst du ok Togriep to dien Konto.
 manage_account_links = Verbunnt Konten
-hooks.desc = Föög Internett-Hakens hento, wat för all Repositoriums, vun wat du een Eegner büst, upropen worden.
+hooks.desc = Föög Internett-Hakens hento, wat för all Repositoriums, vun wat du een Eegner büst, utlööst worden.
 email_notifications.andyourown = Un ok för diene eegenen Narichtens
 visibility = Bruker-Sichtbaarkeid
 visibility.limited_tooltip = Blots anmellt Brukers könen ’t sehn
@@ -789,6 +826,25 @@ delete_with_all_comments = Dien Konto is junger as %s. Um Spöök-Kommentaren to
 confirm_delete_account = Lösken utwiesen
 email_notifications.disable = Nich över E-Mail benarichtigen
 visibility.public_tooltip = Elkeen kann ’t sehen
+password_username_disabled = Frömde Brukers könen hör Brukernaam nich ännern. Bidde kuntakteer dienen Sied-Chef för mehr Informationen.
+profile_desc = Richt in, wo dien Profil to anner Brukers wiest word. Diene Höövd-E-Mail-Adress word för Narichtens, Passwoord-Torügghalen un Git-Aktioonen över ’t Internett bruukt.
+hidden_comment_types_description = Kommentaar-Arden, wat hier utköört sünd, worden in Gefall-Sieden nich wiest. Wenn du to’n Bispööl »Vermark« utköörst, worden all de » hett Vermark hentoföögt/wegdaan«-Kommentaaren wegdaan.
+email_desc = Diene Höövd-E-Mail-Adress word för Narichtens, Passwoord-Torügghalen un, wenn se nich verburgen is, Git-Aktioonen över ’t Internett bruukt.
+can_not_add_email_activations_pending = Een Aktiveren staht noch ut. Wenn du eene neje E-Mail-Adress hentofögen willst, versöök dat in een paar Menüten noch eenmaal.
+email_deletion_desc = De E-Mail-Adress un daarmit verbunnen Informatioon word ut dienem Konto wegdaan. Git-Kommitterens vun deeser E-Mail-Adress worden nich ännert. Wiedermaken?
+principal_desc = Deese SSH-Zertifikaat-Höövdmannen sünd mit dienem Konto verbunnen un geven kumpleten Togriep up diene Repositoriums.
+add_email_confirmation_sent = Eene Utwiesens-E-Mail is an »%s« sennt worden. Um diene E-Mail-Adress uttowiesen, kiek bidde in dienen E-Mail-Ingang un folg de Verwies daarin in de anner %s.
+ssh_desc = Deese publiken SSH-Slötels sünd mit dienem Konto verbunnen. De tohörig privaate Slötel gifft kumpleten Togriep up diene Repositoriums. SSH-Slötels, wat utwiest worden sünd, könen bruukt worden, um SSH-unnerschreven Git-Kommitterens uttowiesen.
+keep_email_private_popup = Dat word diene E-Mail-Adress vun dienem Profil verburgen. Dann is dat nich mehr de Normaalweert för Kommitterens, wat du över de Internett-Schnittstee maakst, so as Datei-Upladens un Bewarkens, un word nich in Tosamenföhrens-Kommitterens bruukt. In Stee daarvun kann eene besünnere Adress %s bruukt worden, um Kommitterens mit dienem Konto to verbinnen. Wees wiss, dat dat Ännern vun deeser Instellen bestahn Kommitterens nich ännert.
+ssh_helper = Bruukst du Hülp? Kiek de Inföhren an, wo du diene eegenen SSH-Slötels maakst of hülp gewohnten Probleemen of, över wat man mit SSH mennigmaal strukelt.
+access_token_desc = Utköört Teken-Verlöövnissen begrenzen dat Anmellen blots up de tohörig API-Padden. Lees de Dokumenteren för mehr Informationen.
+oauth2_confidential_client = Diskreeter Klient. Köör dat för Programmen ut, wat dat Geheimnis diskreet behanneln, as Internett-Sieden. Köör dat nich för stedenwies Programmen ut, as Schrievdisk- un Telefoon-Programmens.
+gpg_helper = Bruukst du Hülp? Kiek de Inföhren över GPG an.
+gpg_desc = Deese publiken GPG-Slötels sünd mit dienem Konto verbunnen un worden bruukt, um diene Kommitterens uttowiesen. Holl de tohörig privaaten Slötels seker, denn daarmit kann man Kommitterens mit diener Unnerschrift unnerschrieven.
+oauth2_application_locked = Forgejo vermarkt vörweg eenige OAuth2-Programmen bi’m Starten, wenn dat in de Instellens anknipst is. Um unverwachts Verhollen to verhinnern, könen se nich bewarkt of wegdaan worden. Bidde kiek för mehr Informationen de OAuth2-Dokumenteren an.
+twofa_desc = Um dien Konto tegen Passwoordklau to schütten, kannst du een Smart-Telefoon of anner Geraadskupp bruken, um tied-baseerte Eenmaalpasswoorden (»TOTP«) to kriegen.
+twofa_recovery_tip = Wenn du dien Geraadskupp verlüst, kannst du eenen Eenmaal-Bruuk-Torügghalens-Slötel bruken, um weer in dien Konto to komen.
+webauthn_desc = Sekerheids-Slötels sünd Geraadskuppen, wat kryptographisk Slötels enthollen. Se könen för dat Anmellen mit Twee Faktooren bruukt worden. Sekerheids-Slötels mutten de »WebAuthn Authenticator«-Standard unnerstütten.
 
 [repo]
 rss.must_be_on_branch = Du muttst up eenem Twieg wesen, um eenen RSS-Schuuv to hebben.
@@ -1177,7 +1233,7 @@ editor.upload_file = Datei upladen
 editor.preview_changes = Ännerns vörwiesen
 filter_branch_and_tag = Twieg of Mark filtern
 symbolic_link = Symbolisk Verwies
-editor.cannot_edit_non_text_files = Binäär-Datein könen nich in de Internett-Schnittstee bewarkt worden.
+editor.cannot_edit_non_text_files = Binäärdateien könen nich in de Internett-Schnittstee bewarkt worden.
 editor.must_be_on_a_branch = Du muttst up eenem Twieg wesen, um Ännerns an deeser Datei to maken of vörtoslagen.
 editor.fork_before_edit = Du muttst deeses Repositorium gabeln, um Ännerns an deeser Datei to maken of vörtoslagen.
 n_branch_few = %s Twiegen
@@ -1953,4 +2009,1470 @@ settings.new_owner_has_same_repo = De neje Eegner hett al een Repositorium mit d
 settings.new_owner_blocked_doer = De neje Eegner hett di blockeert.
 settings.transfer_desc = Överdraag deeses Repositorium to eenem Bruker of eener Verenigung, waar du Chef-Rechtens hest.
 settings.transfer_notices_1 = - Du hest keen Togriep mehr up dat Repositorium, wenn du dat to eenem enkelt Bruker överdraggst.
-settings.transfer_notices_3 = - Wenn dat Repositorium privaat is un to eenem enkelt Bruker överdragen word, passt deese Aktioon up, dat de Bruker tominnst Lesen-Togriep hett (un ännert de Rechtens as nödig).
\ No newline at end of file
+settings.transfer_notices_3 = - Wenn dat Repositorium privaat is un to eenem enkelt Bruker överdragen word, passt deese Aktioon up, dat de Bruker tominnst Lesen-Togriep hett (un ännert de Rechtens as nödig).
+settings.signing_settings = Unnerschrift-Utwiesens-Instellens
+settings.trust_model.collaborator = Mitarbeider
+settings.trust_model.collaborator.long = Mitarbeider: Unnerschriftens vun Mitarbeiders vertrauen
+settings.trust_model.committer = Kommitterer
+settings.trust_model.committer.long = Kommitterer: Vertrau Unnerschriften, wat to de Kommitterer passen (Dat is jüüst as up GitHub un dwingt, dat Kommitterens, wat vun Forgejo unnerschrieven worden, Forgejo as Kommitterer hebben)
+settings.trust_model.committer.desc = Gültige Unnerschriften worden blots dann as »vertraut« markeert, wenn se to de Kommitterer passen, un sünst as »unvertraut«. Dat dwingt Forgejo, de Kommitterer up unnerschrieven Kommitterens to wesen, un de eegentlik Kommitterer word mit Nadragen »Co-authored-by:« un »Co-committed-by:« im Kommitteren vermarkt. De normaale Slötel för Forgejo mutt to eenem Bruker in de Datenbank passen.
+settings.trust_model.collaboratorcommitter = Mitarbeider+Kommitterer
+settings.trust_model.collaboratorcommitter.long = Mitarbeider+Kommitterer: Vertrau Unnerschriften vun Mitarbeiders, wat to de Kommitterer passen
+settings.wiki_rename_branch_main_notices_1 = Dat KANN NICH torüggnohmen worden.
+settings.wiki_rename_branch_main_notices_2 = Dat benöömt för all Tieden de binnern Twieg vun de Repositoriums-Wiki vun %s um. Bestahn Utcheckens mutten dann verneeit worden.
+settings.wiki_branch_rename_failure = Kunn de Twieg-Naam vun de Wiki vun de Repositorium nich normaliseren.
+settings.confirm_wiki_branch_rename = De Wiki-Twieg umbenöömen
+settings.wiki_delete = Wiki-Daten lösken
+settings.wiki_delete_desc = De Repositoriums-Wiki-Daten to lösken is för all Tieden un kann nich torüggnohmen worden.
+settings.wiki_delete_notices_1 = - Dat word dat Repositoriums-Wiki för %s för all Tieden lösken un utknipsen.
+settings.confirm_wiki_delete = Wiki-Daten lösken
+settings.delete = Deeses Repositorium lösken
+settings.delete_desc = Een Repositorium to lösken is för all Tieden un kann nich torüggnohmen worden.
+settings.delete_notices_1 = - Dat KANN NICH torüggnohmen worden.
+settings.trust_model.default = Normaales Vertroens-Modell
+settings.wiki_deletion_success = De Repositoriums-Wiki-Daten sünd lösket worden.
+settings.trust_model = Unnerschrift-Vertroens-Modell
+settings.trust_model.collaborator.desc = Gültige Unnerschriften vun Mitarbeiders in deesem Repositorium worden as »vertraut« markeert (of se to de Kommitterer passen of nich). Annerns worden gültige Unnerschriften as »unvertraut« markeert, wenn de Unnerschrift tum Kommitterer passt, un as »passt nich«, wenn nich.
+settings.trust_model.collaboratorcommitter.desc = Gültige Unnerschriften vun Mitarbeiders in deesem Repositorium worden as »vertraut« markeert, wenn se to de Kommitterer passen. Annerns worden gültige Unnerschriften as »unvertraut« markeert, wenn de Unnerschrift tum Kommitterer passt, un as »passt nich«, wenn nich. Dat dwingt Forgejo, de Kommitterer up unnerschrieven Kommitterens to wesen, un de eegentlik Kommitterer word mit Nadragen »Co-authored-by:« un »Co-committed-by:« im Kommitteren vermarkt. De normaale Slötel för Forgejo mutt to eenem Bruker in de Datenbank passen.
+settings.trust_model.default.desc = Dat normaale Repositoriums-Vertroens-Modell för deese Instanz bruken.
+settings.wiki_rename_branch_main_desc = De Twieg, wat binnern vun de Wiki bruukt word, to »%s« umbenöömen. Deeses Ännern is för all Tieden un kann nich torüggnohmen worden.
+settings.wiki_rename_branch_main = De Wiki-Twieg-Naam normaliseren
+settings.wiki_branch_rename_success = De Twieg-Naam vun de Wiki vun de Repositorium is normaliseert worden.
+settings.delete_notices_2 = - Dat lösket för all Tieden dat Repositorium %s mit all Quelltexten, Gefallens, Kommentaren, Wiki-Daten un Mitarbeider-Instellens.
+settings.deletion_success = Dat Repositorium is lösket worden.
+settings.update_settings_success = De Repositoriums-Instellens sünd verneeit worden.
+settings.add_collaborator_success = De Mitarbeider is hentoföögt worden.
+settings.add_collaborator_owner = Kann eenen Eegner nich as Mitarbeider hentofögen.
+settings.add_collaborator_duplicate = Deeser Mitarbeider is al to de Repositorium hentoföögt worden.
+settings.add_collaborator_blocked_our = Kann de Mitarbeider nich hentofögen, denn de Repositoriums-Eegner hett hüm blockeert.
+settings.add_collaborator_blocked_them = Kann de Mitarbeider nich hentofögen, denn he hett de Repositoriums-Eegner blockeert.
+settings.delete_collaborator = Wegdoon
+settings.collaborator_deletion = Mitarbeider wegdoon
+settings.collaborator_deletion_desc = Wenn du eenen Mitarbeider wegdoost, hett he keenen Togriep mehr up deeses Repositorium. Wiedermaken?
+settings.remove_collaborator_success = De Mitarbeider is wegdaan worden.
+settings.org_not_allowed_to_be_collaborator = Verenigungen könen nich as Mitarbeider hentoföögt worden.
+settings.change_team_access_not_allowed = Blots de Verenigungs-Eegner kann de Klottjen-Togriep to de Repositorium ännern
+settings.team_not_in_organization = De Klottje is nich in de sülve Verenigung as dat Repositorium
+settings.teams = Klottjen
+settings.add_team = Klottje hentofögen
+settings.add_team_duplicate = Klottje hett dat Repositorium al
+settings.add_team_success = De Klottje hett nu Togriep to de Repositorium.
+settings.change_team_permission_tip = De Klottjen-Rechte sünd up de Klottjen-Instellens-Sied sett un könen nich pro Repositorium ännert worden
+settings.delete_team_tip = Deese Klottje hett Togriep to all Repositoriums un kann nich lösket worden
+settings.remove_team_success = De Togriep vun de Klottje to de Repositorium is wegdaan worden.
+settings.add_webhook = Internett-Haak hentofögen
+settings.add_webhook.invalid_channel_name = Internett-Haak-Kanaal-Naam düür nich leeg wesen un mutt mehr as blot de #-Bookstaav enthollen.
+settings.webhook_deletion = Internett-Haak wegdoon
+settings.webhook_deletion_success = De Internett-Haak is wegdaan worden.
+settings.webhook.test_delivery = Levern testen
+settings.webhook.test_delivery_desc = Deesen Internett-Haak mit eenem falsken Vörfall testen.
+settings.webhook.test_delivery_desc_disabled = Aktiveer deesen Internett-Haak, um hüm mit eenem falsken Vörfall to testen.
+settings.webhook.request = Anfraag
+settings.webhook.response = Antwoord
+settings.webhook.payload = Inholl
+settings.webhook.body = Text
+settings.webhook.replay.description_disabled = Aktiveer deesen Internett-Haak, um hüm weer uttoföhren.
+settings.githook_edit_desc = Wenn de Haak nich aktiiv is, word Bispööl-Inholl wiest. Wenn du de Inholl leeg lettst, word deeser Haak utknipst.
+settings.githook_name = Haak-Naam
+settings.githook_content = Haak-Inholl
+settings.update_githook = Haak vernejen
+settings.payload_url = Enn-URL
+settings.http_method = HTTP-Aard
+settings.content_type = Aard vum POST-Inholl
+settings.secret = Geheimnis
+settings.slack_username = Brukernaam
+settings.slack_color = Klöör
+settings.discord_username = Brukernaam
+settings.discord_icon_url = Bill-URL
+settings.event_desc = Utlösen för:
+settings.event_push_only = Schuuv-Vörfall
+settings.event_send_everything = All Vörfallen
+settings.event_choose = Eegene Vörfallen …
+settings.event_header_repository = Repositoriums-Vörfallen
+settings.event_create = Maken
+settings.event_create_desc = Twieg of Mark maakt.
+settings.event_delete = Lösken
+settings.event_delete_desc = Twieg of Mark lösket.
+settings.event_fork_desc = Repositorium gabelt.
+settings.event_wiki = Wiki
+settings.event_release = Publizeren
+settings.event_release_desc = Publizeren in eenem Repositorium maakt, verneeit of lösket.
+settings.event_push = Schuuv
+settings.event_push_desc = Git-Schuuv to eenem Repositorium.
+settings.event_repository = Repositorium
+settings.event_repository_desc = Repositorium maakt of lösket.
+settings.event_header_issue = Gefall-Vörfallen
+settings.event_issues_desc = Gefall opmaakt, dichtmaakt, weer opmaakt of bewarkt.
+settings.event_issue_assign = Towiesen
+settings.event_issue_label = Vermarkens
+settings.event_issue_milestone = Markstenen
+settings.event_issue_milestone_desc = Marksteen hentoföögt, wegdaan of ännert.
+settings.event_issue_comment = Kommentaren
+settings.event_issue_comment_desc = Gefall-Kommentaar maakt, bewarkt of lösket.
+settings.event_header_pull_request = Haalvörslag-Vörfallens
+settings.event_pull_request = Ännern
+settings.event_pull_request_desc = Haalvörslag opmaakt, dichtmaakt, weer opmaakt of bewarkt.
+settings.event_pull_request_assign = Towiesen
+settings.event_pull_request_assign_desc = Haalvörslag towiesen of Towiesen wegdaan.
+settings.event_pull_request_label = Vermarkens
+settings.event_pull_request_label_desc = Haalvörslag-Vermarkens hentoföögt of wegdaan.
+settings.event_pull_request_milestone = Markstenen
+settings.event_pull_request_milestone_desc = Marksteen hentoföögt, wegdaan of ännert.
+settings.event_pull_request_comment = Kommentaren
+settings.event_pull_request_comment_desc = Haalvörslag-Kommentaar maakt, bewarkt of lösket.
+settings.event_pull_request_review = Nakiekens
+settings.event_pull_request_review_desc = Haalvörslag tostimmt of torüggwiest of Nakiekens-Kommentaren hentoföögt.
+settings.event_pull_request_sync = Verneeit
+settings.event_pull_request_sync_desc = Twieg automatisk mit de Enn-Twieg verneeit.
+settings.event_pull_request_review_request = Nakiekens-Anfragen
+settings.event_pull_request_review_request_desc = Haalvörslag-Nakieken anfraggt of Nakiekens-Anfraag wegdaan.
+settings.event_pull_request_approvals = Haalvörslag-Tostimmens
+settings.event_pull_request_merge = Haalvörslag-Tosamenföhren
+settings.event_pull_request_enforcement = Dwingen
+settings.event_package = Paket
+settings.event_package_desc = Paket in eenem Repositorium maakt of lösket.
+settings.branch_filter = Twieg-Filter
+settings.add_hook_success = De Internett-Haak is hentoföögt worden.
+settings.update_webhook = Internett-Haak vernejen
+settings.update_hook_success = De Internett-Haak is verneeit worden.
+settings.delete_webhook = Internett-Haak wegdoon
+settings.recent_deliveries = Leste Leverns
+settings.hook_type = Haak-Aard
+settings.slack_token = Teken
+settings.graphql_url = GraphQL-URL
+settings.web_hook_name_gitea = Gitea
+settings.web_hook_name_discord = Discord
+settings.web_hook_name_telegram = Telegram
+settings.web_hook_name_matrix = Matrix
+settings.web_hook_name_msteams = Microsoft Teams
+settings.web_hook_name_feishu = Feishu / Lark Suite
+settings.web_hook_name_feishu_only = Feishu
+settings.web_hook_name_larksuite_only = Lark Suite
+settings.web_hook_name_wechatwork = WeCom (WeChat Work)
+settings.web_hook_name_packagist = Packagist
+settings.packagist_username = Packagist-Brukernaam
+settings.packagist_api_token = API-Teken
+settings.packagist_package_url = Packagist-Paket-URL
+settings.web_hook_name_sourcehut_builds = Up SourceHut bauen
+settings.sourcehut_builds.manifest_path = Padd tum Bau-Manifest
+settings.sourcehut_builds.visibility = Upgaav-Sichtbaarkeid
+settings.add_deploy_key = Utbrengens-Slötel hentofögen
+settings.is_writable = Schriev-Togriep anknipsen
+settings.is_writable_info = Deesem Utbrengens-Slötel verlöven, tum Repositorium to schuven.
+settings.no_deploy_keys = Dat gifft noch keene Utbrengens-Slötels.
+settings.title = Titel
+settings.key_name_used = Dat gifft al eenen Utbrengens-Slötel mit de sülve Naam.
+settings.add_key_success = De Utbrengens-Slötel »%s« is hentoföögt worden.
+settings.deploy_key_deletion = Utbrengens-Slötel wegdoon
+settings.deploy_key_deletion_success = De Utbrengens-Slötel is wegdaan worden.
+settings.branches = Twiegen
+settings.protected_branch = Twieg Schütten
+settings.protected_branch.save_rule = Örder sekern
+settings.protected_branch.delete_rule = Örder wegdoon
+settings.branch_protection = Schüttens-Örders för Twieg »%s«
+settings.protect_new_rule = Eene neje Twieg-Schüttens-Örder hentofögen
+settings.protect_disable_push = Schuven utknipsen
+settings.protect_enable_push = Schuven anknipsen
+settings.protect_whitelist_committers = Verlöövt Schuvers utkören
+settings.protect_whitelist_committers_desc = Blots verlöövt Brukers of Klottjen düren to deesem Twieg schuven (aver nich dwangsschuven).
+settings.protect_whitelist_deploy_keys = Verlöövt Utbrengens-Slötels mit Schriev-Togriep as Schuvers.
+settings.protect_whitelist_users = Verlöövt Brukers as Schuvers
+settings.protect_merge_whitelist_teams = Verlöövt Klottjen as Tosamenföhrers
+settings.protect_check_status_contexts = Tostands-Överprüfens anknipsen
+settings.protect_check_status_contexts_list = Tostands-Överprüfens, wat in deesem Repositorium in de leste Week funnen worden sünd
+settings.protect_invalid_status_check_pattern = Ungültiges Tostands-Överprüfens-Muster: »%s«.
+settings.protect_required_approvals = Nödige Tostimmens
+settings.protect_approvals_whitelist_enabled = Blots verlöövt Brukers of Klottjen düren tostimmen
+settings.protect_approvals_whitelist_teams = Verlöövt Klottjen tum Nakieken
+settings.dismiss_stale_approvals = Verslaan Tostimmens ofseggen
+settings.dismiss_stale_approvals_desc = Wenn neje Kommitterens up de Twieg schuven worden, wat de Inholl vum Haalvörslag ännern, worden olle Tostimmens ofseggt.
+settings.ignore_stale_approvals = Verslaan Tostimmens minnachten
+settings.ignore_stale_approvals_desc = Tostimmens, wat up oller Kommitterens maakt worden sünd (verslaan Nakiekens), nich daarto tellen, wo völe Tostimmens de HV hett. Is egaal wenn verslaan Nakiekens eh ofseggt worden.
+settings.require_signed_commits = Kommitterens mutten unnerschrieven wesen
+settings.require_signed_commits_desc = Schuvens to deesem Twieg verseggen, wat nich unnerschrieven sünd of nich utwiest worden könen.
+settings.protect_branch_name_pattern = Naam-Muster för schütt Twiegen
+settings.protect_patterns = Musters
+settings.protect_protected_file_patterns = Schütt Dateinaam-Musters (trennt mit Semikolons »;«)
+settings.update_protect_branch_success = Twieg-Schütten för Örder »%s« is verneeit worden.
+settings.remove_protected_branch_failed = Twieg-Schüttens-Örder »%s« kunn nich wegdaan worden.
+settings.block_rejected_reviews = Tosamenföhren bi Nakiekens mit erbeden Ännerns blockeren
+settings.block_rejected_reviews_desc = Dat Tosamenföhren is nich verlöövt, wenn offizielle Nakiekers um Ännerns beden hebben, ok wenn dat genoog Tostimmens gifft.
+settings.block_on_official_review_requests = Tosamenföhren bi offiziellen Nakiekens-Anfragen blockeren
+settings.block_on_official_review_requests_desc = Dat Tosamenföhren is nich verlöövt, wenn eene offizielle Nakieker-Anfraag utstaht, ok wenn dat genoog Tostimmens gifft.
+settings.block_outdated_branch = Tosamenföhren för verollte Haalvörslagen blockeren
+settings.enforce_on_admins_desc = Repositoriums-Chefs düren deese Örder nich minnachten.
+settings.merge_style_desc = Tosamenföhrens-Aarden
+settings.default_merge_style_desc = Normaale Tosamenföhrens-Aard
+settings.edit_protected_branch = Bewarken
+settings.add_collaborator = Mitarbeider hentofögen
+settings.webhook.replay.description = Deesen Internett-Haak weer utföhren.
+settings.event_issues = Ännern
+settings.webhook.delivery.success = Een Vörfall is to de Leverslang hentoföögt worden. Dat kann een paar Sekünnen düren, ehr dat in de Lever-Histoorje vörkummt.
+settings.discord_icon_url.exceeds_max_length = Bill-URL düür nich langer as 2048 Bookstavens wesen
+settings.update_settings_no_unit = Dat Repositorium sall tominnst elk of anner Aard vun Gebruuk verlöven.
+settings.delete_notices_fork_1 = - Gabels vun deesem Repositorium worden nach de Lösken to normaalen Repositoriums.
+settings.confirm_delete = Repositorium lösken
+settings.add_collaborator_inactive_user = Kann eenen inaktiiv Bruker nich as Mitarbeider hentofögen.
+settings.add_webhook.invalid_path = Padd düür keen Deel enthollen, wat ».« of »..« of leeg is, un kann nich mit eenem Schüünstreek begünnen of ennen.
+settings.hooks_desc = Internett-Hakens sennen automatisk HTTP-POST-Anfragen to eenem Server, wenn wisse Forgejo-Vörfallen passeren. Lees mehr in de Internett-Hakens-Dokumenteren.
+settings.webhook_deletion_desc = Wenn du eenen Internett-Haak wegdoost, worden siene Instellens un Lever-Histoorje lösket. Wiedermaken?
+settings.githooks_desc = Git-Hakens worden vun Git sülvst utföhrt. Du kannst Haken-Dateien unnern bewarken, um eegene Aktioonen intorichten.
+settings.webhook.headers = Koppriegen
+settings.event_fork = Gabel
+settings.event_wiki_desc = Wiki-Sied maakt, umbenöömt, bewarkt of lösket.
+settings.slack_icon_url = Bill-URL
+settings.slack_channel = Kanaal
+settings.web_hook_name_forgejo = Forgejo
+settings.sourcehut_builds.secrets = Geheimnissen
+settings.sourcehut_builds.secrets_helper = Giff de Upgaav Togang to de Bau-Geheimnissen (bruukt de Verlöövnis SECRETS:RO)
+settings.deploy_keys = Utbrengens-Slötels
+settings.protect_enable_merge = Tosamenföhren anknipsen
+settings.protect_no_valid_status_check_patterns = Keene gültigen Tostands-Överprüfens-Musters.
+settings.protect_approvals_whitelist_users = Verlöövt Nakiekers
+settings.protect_unprotected_file_patterns = Nich schütt Dateinaam-Musters (trennt mit Semikolons »;«)
+settings.remove_protected_branch_success = Twieg-Schütten för Örder »%s« is wegdaan worden.
+settings.default_branch_desc = Köör eenen Höövd-Repositoriums-Twieg för Haalvörslagen un Quelltext-Kommitterens ut:
+settings.choose_branch = Köör eenen Twieg ut …
+settings.event_issue_assign_desc = Gefall towiesen of Towiesen wegdaan.
+settings.add_web_hook_desc = %s in dien Repositorium inbinnen.
+settings.web_hook_name_gogs = Gogs
+settings.key_been_used = Een Utbrengens-Slötel mit de sülve Inholl word al bruukt.
+settings.protect_merge_whitelist_committers = Tosamenföhrens-Verlööv-List anknipsen
+settings.protect_merge_whitelist_users = Verlöövt Brukers as Tosamenföhrers
+settings.event_issue_label_desc = Gefall-Vermarkens hentoföögt of wegdaan.
+settings.active_helper = Informationen över utlööst Vörfallen worden to deeser Internett-Haak-URL sennt.
+settings.web_hook_name_slack = Slack
+settings.protect_enable_push_desc = Elkeen, well Schriev-Togriep hett, düür to deesem Twieg schuven (aver nich dwangsschuven).
+settings.protect_status_check_patterns = Tostands-Överprüfens-Musters
+settings.protect_status_check_patterns_desc = Giff Musters in, wat angeven, welke Tostands-Överprüfens klaar wesen mutten, ehr Twiegen in eenen Twieg, wat up deese Örder passt, tosamenföhrt worden könen. Elkeen Rieg sett een Muster. Musters düren nich leeg wesen.
+settings.protect_status_check_matched = Passt
+settings.protect_approvals_whitelist_enabled_desc = Blots Nakiekens vun verlöövt Brukers of Klottjen tellen to de nödige Tahl vun Tostimmens. Sünner eene sülke List tellen Nakiekens vun elkeen, well Schriev-Togriep hett, to de nödige Tahl vun Tostimmens.
+settings.protect_branch_name_pattern_desc = Naam-Musters för schütt Twiegen. Kiek in de Dokumenteren för de Muster-Syntax. Bispölen: main, release/**
+settings.protected_branch_deletion = Twieg-Schütten wegdoon
+settings.protected_branch_deletion_desc = Wenn du de Twieg-Schütten utknipst, düren all Brukers mit Schriev-Rechten to the Twieg schuven. Wiedermaken?
+settings.active = Aktiiv
+settings.deploy_key_desc = Utbrengens-Slötels hebben Blots-Lesen-Togriep up dat Repositorium.
+settings.deploy_key_deletion_desc = Wenn du eenen Utbrengens-Slötel wegdoost, hett he keenen Togriep mehr up deeses Repositorium. Wiedermaken?
+settings.protect_disable_push_desc = Man düür nich to deesem Twieg schuven.
+settings.protect_enable_merge_desc = Elkeen, well Schriev-Togriep hett, düür Haalvörslagens in deesen Twieg tosamenföhren.
+settings.protect_whitelist_teams = Verlöövt Klottjen as Schuvers
+settings.protect_merge_whitelist_committers_desc = Blots verlöövt Brukers of Klottjen düren Haalvörslagen in deesen Twieg tosamenföhren.
+settings.protect_check_status_contexts_desc = Verlang, dat vör de Tosamenföhren Tostands-Överprüfens klaar wesen mutten. Wenn dat anknipst is, mutten Kommitterens eerst to een anner Twieg schuven worden, un könen eerst dann tosamenföhrt of strack to eenem Twieg schuuvt worden, wat up deese Örder passt, nadeem de Tostands-Överprüfens klaar worden sünd. Wenn keen Umgeven passt, mutt de leste Kommitteren klaar wesen, wat ok immer de Umgeven is.
+settings.protect_required_approvals_desc = Verlööv Haalvörslagen blots dann tosamentoföhren, wenn genoog Nakiekers tostimmt hebben.
+settings.block_outdated_branch_desc = Dat Tosamenföhren is nich verlöövt, wenn de Kopp-Twieg achter de Grund-Twieg torügg is.
+settings.authorization_header = Anmellens-Kopprieg
+settings.authorization_header_desc = Wenn sett, word dat as Anmellens-Kopprieg för Anfragen anföögt. Bispölen: %s.
+settings.slack_domain = Domään
+settings.web_hook_name_dingtalk = DingTalk
+settings.deploy_key_content = Inholl
+settings.no_protected_branch = Dat gifft keene schütt Twiegen.
+settings.enforce_on_admins = Deese Örder för Repositoriums-Chefs dwingen
+settings.protected_branch_duplicate_rule_name = För deese Sammlung vun Twiegen gifft dat all een Örder
+settings.tags = Markens
+settings.tags.protection = Mark-Schütten
+settings.tags.protection.allowed = Verlöövt
+settings.tags.protection.allowed.teams = Verlöövt Klottjen
+settings.tags.protection.allowed.noone = Nüms
+settings.tags.protection.none = Dat gifft keene schütt Markens.
+settings.thread_id = Thema-ID
+settings.matrix.homeserver_url = Heimaadserver-URL
+settings.matrix.room_id = Ruum-ID
+settings.archive.header = Deeses Repo archiveren
+settings.archive.error_ismirror = Du kannst een spegelt Repo nich archiveren.
+settings.archive.tagsettings_unavailable = Mark-Instellens sünd nich verföögbar, wenn dat Repo archiveert is.
+settings.unarchive.button = Repo ut Archiv torügghalen
+settings.unarchive.success = Dat Repo is nu nich mehr archiveert.
+settings.unarchive.error = Een Fehler is bi’m Torügghalen vum Repo ut de Archiv uptreden. Kiek in de Utgaav för mehr Informationen.
+settings.lfs = LFS
+settings.lfs_filelist = LFS-Dateien, wat in deesem Repositorium verwahrt sünd
+settings.lfs_lfs_file_no_commits = Keene Kommitterens för deese LFS-Datei funnen
+settings.tags.protection.pattern = Mark-Muster
+settings.tags.protection.allowed.users = Verlöövt Brukers
+settings.chat_id = Snack-ID
+settings.archive.button = Repo archiveren
+settings.unarchive.header = Deeses Repo as nich mehr archiveert setten
+settings.update_avatar_success = Dat Repositoriums-Kontobill is verneeit worden.
+settings.lfs_findcommits = Kommitterens finnen
+settings.protected_branch_required_approvals_min = Nödige Tostimmens könen nich negativ wesen.
+settings.archive.mirrors_unavailable = Spegels sünd nich verföögbar, wenn dat Repo archiveert is.
+settings.tags.protection.create = Örder hentofögen
+settings.bot_token = Bot-Teken
+settings.matrix.message_type = Narichten-Aard
+settings.archive.text = Wenn dat Repo archiveert word, kann man daar blots noch lesen. Dat word vum Disk verburgen. Nüms (ok nich du sülvst!) kann noch neje Kommitterens maken of Gefallens of Haalvörslagen opmaken.
+settings.archive.success = Dat Repo is archiveert worden.
+settings.archive.error = Een Fehler is bi’m Archiveren vum Repo uptreden. Kiek in de Utgaav för mehr Informationen.
+settings.archive.branchsettings_unavailable = Twieg-Instellens sünd nich verföögbar, wenn dat Repo archiveert is.
+settings.unarchive.text = Wenn dat Repo nich mehr archiveert is, kann dat weer Kommitterens un Schuvens kriegen un ok neje Gefallens un Haalvörslagens.
+settings.lfs_no_lfs_files = In deesem Repositorium sünd keene LFS-Dateien verwahrt
+settings.lfs_noattribute = Deeser Padd is im Höövd-Twieg nich as toslutbaar markeert
+settings.lfs_findpointerfiles = Wieser-Dateien finnen
+settings.lfs_invalid_locking_path = Ungültiger Padd: %s
+settings.lfs_lock = Slött
+settings.lfs_lock_path = Dateipadd tum tosluten …
+settings.lfs_locks_no_locks = Keene Slötten
+settings.lfs_force_unlock = Upsluten dwingen
+settings.lfs_pointers.sha = Blob-Prüfsumm
+settings.lfs_pointers.oid = OID
+settings.lfs_pointers.inRepo = Im Repo
+settings.lfs_pointers.accessible = Bruker kann togriepen
+settings.lfs_pointers.associateAccessible = %d togangelk OIDs benöömen
+settings.rename_branch_failed_exist = Kann Twieg nich umbenöömen, denn de Enn-Twieg %s gifft dat al.
+settings.rename_branch_success = Twieg %s is in %s umbenöömt worden.
+settings.rename_branch = Twieg umbenöömen
+diff.browse_source = In Quell stövern
+diff.parent = Ollern
+diff.commit = Kommitteren
+diff.git-notes = Anmarkens
+diff.data_not_available = Unnerscheed-Inholl is nich verföögbaar
+diff.options_button = Unnerscheed-Instellens
+diff.show_diff_stats = Statistiken wiesen
+diff.download_patch = Plack-Datei runnerladen
+diff.show_split_view = Deelte Sicht
+diff.show_unified_view = Vereenigte Sicht
+diff.whitespace_button = Leegtekens
+diff.whitespace_ignore_all_whitespace = Leegtekens bi’m Verglieken vun Riegen minnachten
+diff.whitespace_ignore_amount_changes = Ännerns in de Meng an Leegtekens minnachten
+diff.whitespace_ignore_at_eol = Ännerns in de Leegtekens am Datei-Enn minnachten
+diff.stats_desc_file = %d Ännerns: %d neje Riegen un %d lösket Riegen
+diff.bin = BIN
+diff.bin_not_shown = Binäärdatei word nich wiesen.
+diff.view_file = Datei wiesen
+diff.file_before = Vörher
+diff.file_after = Daarna
+diff.file_byte_size = Grött
+diff.file_suppressed = Datei-Unnerscheed unnerdrückt, denn dat is to grot
+diff.too_many_files = Eenige Dateien worden nich wiesen, denn in deesem Unnerscheed sünd to völe Dateien ännert worden
+diff.show_more = Mehr wiesen
+diff.load = Unnerscheed laden
+diff.generated = maakt
+diff.vendored = verkoperig
+diff.comment.placeholder = Eenen Kommentaar schrieven
+diff.comment.start_review = Nakieken begünnen
+diff.review = Nakieken klaarmaken
+diff.review.header = Nakieken avgeven
+diff.review.approve = Tostimmen
+diff.committed_by = kommitteert vun
+diff.protected = Schütt
+diff.image.side_by_side = Tegenanner
+diff.image.swipe = Wisken
+diff.show_file_tree = Dateiboom wiesen
+diff.hide_file_tree = Dateiboom verbargen
+release.releases = Publizerens
+release.detail = Över de Publizeren
+release.tags = Markens
+release.new_release = Nejes Publizeren
+release.draft = Sketts
+release.prerelease = Vör-Publizeren
+release.stable = Stevig
+release.edit = Bewarken
+release.ahead.commits = %d Kommitterens
+release.ahead.target = to %s siet deesem Publizeren
+tag.ahead.target = to %s siet deeser Mark
+release.source_code = Quelltext
+release.edit_subheader = Publizerens organiseren Projekt-Versioonen.
+release.tag_name = Mark-Naam
+release.target = Enn
+release.tag_helper_existing = Bestahn Mark.
+release.title_empty = Titel kann nich leeg wesen.
+release.message = Beschriev deeses Publizeren
+release.prerelease_desc = As Vör-Publizeren markeren
+release.prerelease_helper = Markeer, dat deeses Publizeren nich för stevig Gebruuk dacht is.
+release.cancel = Ofbreken
+release.publish = Publizeren publik maken
+release.save_draft = Sketts sekern
+release.deletion_success = Dat Publizeren is lösket worden.
+release.tag_name_already_exist = Een Publizeren mit deesem Mark-Naam gifft dat al.
+release.tag_name_invalid = De Mark-Naam is nich gültig.
+release.tag_name_protected = De Mark-Naam is schütt.
+release.downloads = Runnerladens
+release.download_count_one = %s maal runnerladen
+release.download_count_few = %s maal runnerladen
+release.hide_archive_links = Automatisk maakt Archiven verbargen
+release.releases_for = Publizerens för %s
+release.tags_for = Markens för %s
+release.system_generated = Deeser Anhang is automatisk maakt worden.
+release.type_attachment = Anhang
+release.type_external_asset = Frömdes Objekt
+release.asset_external_url = Frömde URL
+release.add_external_asset = Frömdes Objekt hentofögen
+branch.name = Twieg-Naam
+branch.already_exists = Een Twieg mit de Naam »%s« gifft dat al.
+branch.delete_head = Lösken
+branch.delete = Twieg »%s« lösken
+branch.delete_html = Twieg lösken
+branch.create_branch = Maak Twieg %s
+branch.create_from = vun »%s«
+branch.create_success = Twieg »%s« is maakt worden.
+branch.branch_already_exists = Twieg »%s« gifft dat in deesem Repositorium al.
+branch.deleted_by = Vun %s lösket
+branch.restore_failed = Kunn Twieg »%s« nich torügghalen.
+branch.protected_deletion_failed = Twieg »%s« is schütt un kann nich lösket worden.
+branch.restore = Twieg »%s« torügghalen
+branch.download = Twieg »%s« runnerladen
+branch.rename = Twieg »%s« umbenöömen
+branch.included = Enthollen
+branch.create_new_branch = Twieg vum Twieg maken:
+branch.rename_branch_to = »%s« umbenöömen to:
+branch.create_branch_operation = Twieg maken
+branch.new_branch = Nejen Twieg maken
+topic.manage_topics = Themen verwalten
+topic.done = Daan
+topic.count_prompt = Du kannst nich mehr as 25 Themen utkören
+settings.lfs_lock_already_exists = Slött gifft dat al: %s
+diff.whitespace_show_everything = All Ännerns wiesen
+diff.review.placeholder = Nakiekens-Kommentaar
+settings.lfs_delete = LFS-Datei mit OID %s lösken
+settings.lfs_delete_warning = Wenn eene LFS-Datei lösket word, kann bi’m Utchecken de Fehler »Objekt gifft dat nich« uptreden. Willst du dat würrelk?
+settings.lfs_locks = Slötten
+diff.comment.markdown_info = Markdown kann bruukt worden, um dat Textformaat antopassen.
+settings.lfs_invalid_lock_directory = Kann Verteeknis nich tosluten: %s
+settings.lfs_pointers.exists = Bestaht im Lager
+settings.rename_branch_failed_not_exist = Kann Twieg %s nich umbenöömen, denn de Twieg gifft dat nich.
+diff.comment.reply = Antern
+diff.image.overlay = Överleggen
+settings.lfs_lock_file_no_exist = Tosluten Datei gifft dat im Höövd-Twieg nich
+diff.file_suppressed_line_too_long = Datei-Unnerscheed unnerdrückt, denn een of mehr Riegen sünd to lang
+settings.lfs_pointers.found = Hett %d Blob-Wieser(s) funnen – %d benöömt, %d unbenöömt (im Lager fehlen %d)
+settings.rename_branch_failed_protected = Kann Twieg %s nich umbenöömen, denn dat is een schütt Twieg.
+diff.download_diff = Unnerscheed-Datei runnerladen
+diff.stats_desc = %d ännert Dateien mit %d nejen Riegen un %d lösket Riegen
+diff.file_image_height = Höcht
+tag.create_tag_from = Neje Mark vun »%s« maken
+tag.create_success = Mark »%s« is maakt worden.
+error.csv.too_large = Kann deese Datei nich teken, denn se is to grot.
+diff.file_image_width = Breddt
+diff.comment.add_line_comment = Riegen-Kommentaar hentofögen
+diff.comment.add_review_comment = Kommentaar hentofögen
+release.tag_helper_new = Neje Mark. Deese Mark word vun de Enn maakt.
+release.edit_release = Publizeren vernejen
+release.deletion_desc = Wenn du een Publizeren löskest, word dat blots vun Forgejo wegdaan. Dat ännert nix an de Git-Mark, de Inholl vun dienem Repositorium of siener Histoorje. Wiedermaken?
+release.add_tag = Mark maken
+release.asset_name = Objekt-Naam
+branch.delete_branch_has_new_commits = Twieg »%s« kann nich lösket worden, denn na de Tosamenföhren sünd neje Kommitterens hentoföögt worden.
+branch.restore_success = Twieg »%s« is torügghaalt worden.
+tag.create_tag = Mark %s maken
+diff.comment.add_single_comment = Enkelt Kommentaar hentofögen
+diff.review.comment = Kommentaar
+diff.review.reject = Um Ännerns bidden
+diff.has_escaped = Deese Rieg hett verburgen Unicode-Bookstavens
+releases.desc = Verfolg Projekt-Versioonen un Runnerladens.
+diff.review.self_reject = Haalvörslag-Authoren könen nich up hör eegen Haalvörslag um Ännerns beden
+diff.review.self_approve = Haalvörslag-Authoren könen nich hör eegen Haalvörslag tostimmen
+release.deletion_tag_desc = Lösket deese Mark ut de Repositorium. Dat ännert nix an de Inholl vun de Repositorium of siener Histoorje. Wiedermaken?
+release.invalid_external_url = Ungültige frömde URL: »%s«
+tag.confirm_create_tag = Mark maken
+release.compare = Verglieken
+branch.delete_desc = Eenen Twieg to lösken is för all Tieden. Ok wenn de lösket Twieg villicht noch körte Tied rumliggt, ehr he würrelk wegdaan word, KANN DAT MEESTTIEDENS NICH torüggnohmen worden. Wiedermaken?
+branch.deletion_success = Twieg »%s« is lösket worden.
+branch.included_desc = Deeser Twieg is Deel vum Höövd-Twieg
+release.new_subheader = Publizerens organiseren Projekt-Versioonen.
+release.tag_helper = Köör eene bestahn Mark ut of maak eene neje Mark.
+release.deletion_tag_success = De Mark is lösket worden.
+release.tag_already_exist = De Mark-Naam gifft dat al.
+branch.warning_rename_default_branch = Du benöömst de Höövd-Twieg um.
+branch.renamed = Twieg %s is in %s umbenöömt worden.
+topic.format_prompt = Themen mutten mit eenem Bookstaav of Tahl begünnen, düren Binnestrekens (»-«) un Punkten (».«) enthollen un könen bit to 35 Bookstavens lang wesen. All Bookstavens mutten Kleenbookstavens wesen.
+error.csv.invalid_field_count = Kann deese Datei nich teken, denn se hett de falske Tahl vun Felden in Rieg %d.
+release.title = Publizerens-Titel
+release.delete_release = Publizeren lösken
+release.delete_tag = Mark lösken
+release.deletion = Publizeren lösken
+release.hide_archive_links_helper = Verbargt automatisk maakt Quelltext-Archiven för deeses Publizeren. To’n Bispööl wenn du diene eegenen uplaadst.
+branch.deletion_failed = Kunn Twieg »%s« nich lösken.
+branch.branch_name_conflict = Twieg-Naam »%s« is unverdragelk mit de al bestahn Twieg »%s«.
+branch.new_branch_from = Nejen Twieg vun »%s« maken
+tag.create_tag_operation = Mark maken
+release.add_tag_msg = Bruuk de Titel un Inholl vun de Publizeren as Mark-Naricht.
+find_file.go_to_file = Datei finnen
+find_file.no_matching = Keene passend Datei funnen
+branch.tag_collision = Twieg »%s« kann nich maakt worden, denn in de Repositorium gifft dat al eene Mark mit de sülve Naam.
+branch.default_deletion_failed = Twieg »%s« is de Höövd-Twieg un kann nich lösket worden.
+branch.confirm_create_branch = Twieg maken
+error.csv.unexpected = Kann deese Datei nich teken, denn se enthollt eenen unverwachten Bookstaav in Rieg %d un Striep %d.
+pulls.edit.already_changed = Kann Ännerns an de Haalvörslag nich sekern. Dat schient, dat de Inholl al vun een anner Bruker ännert worden is. Bidde laad de Sied neei un versöök, dat dann noch eenmaal to bewarken, daarmit du hör Ännerns nich överschriffst
+mirror_lfs_endpoint_desc = Spegel word versöken, de Klonen-URL to bruken, um de LFS-Server uttofinnen. Du kannst ok eenen eegenen Ennpunkt angeven, wenn de Repositoriums-LFS-Dateien annerwaar lagert worden.
+migrate_options_lfs_endpoint.description = Umtreck word versöken, de frömde Git-Tegenstee to bruken, um de LFS-Server uttofinnen. Du kannst ok eenen eegenen Ennpunkt angeven, wenn de Repositoriums-LFS-Dateien annerwaar lagert worden.
+clear_ref = `Stedenwies Beteekner leegmaken`
+org_labels_desc = Verenigungs-Vermarkens, wat mit all Repositoriums unner deeser Verenigung bruukt worden könen
+invisible_runes_header = `Deese Datei enthollt unsichtbaare Unicode-Bookstavens`
+ambiguous_runes_line = `Deese Rieg hett verwesselbaare Unicode-Bookstavens`
+ambiguous_character = `%[1]c [U+%04[1]X] kann mit %[2]c [U+%04[2]X] verwesselt worden`
+commits.search.tooltip = Du kannst Slötelwoorden mit »author:«, »committer:«, »after:« of »before:« begünnen, to’n Bispööl »revert author:Alice before:2019-01-13«.
+projects.new_subheader = Verwalt, verfolg un verneei diene Arbeid an eener Stee, daarmit Projekten dörsichtig un up Tied blieven.
+issues.label_archive_tooltip = Archiveert Vermarkens worden in de Vörslagens, wenn du na Vermarkens söchst, normaal nich wiest.
+issues.label_exclusive_desc = Benööm de Vermark Rebeet/Ding, daarmit dat nich mit anner Vermarkens ut de sülven Rebeet/ tosamen bruukt worden kann.
+issues.label_exclusive_warning = Elkeen anner Vermark in de sülve Rebeet word wegdaan, wenn de Vermarkens vun eenem Gefall of Haalvörslag bewarkt worden.
+blame.ignore_revs.failed = Kunn de Versioonen in de .git-blame-ignore-revs nich minnachten.
+invisible_runes_line = `Deese Rieg hett verburgen Unicode-Bookstavens`
+mirror_address_url_invalid = De angeven URL is ungültig. Du muttst all Delen vun de URL recht utkielen.
+mirror_address_protocol_invalid = De angeven URL is ungültig. Blots Steden vun de Aarden »http(s)://« of »git://« könen tum Spegeln bruukt worden.
+mirror_use_ssh.helper = Forgejo spegelt dat Repositorium mit Git över SSH un maakt för di een Slötelpaar, wenn du deese Instellen utköörst. Du muttst wiss maken, dat de maakt publike Slötel dat Recht kriggt, to de Enn-Repositorium to schuven. Wenn du dat utköörst, kannst du keen Anmellen mit Passwoord bruken.
+migrate.permission_denied_blocked = Du kannst nich vun verboden Servers importeren; bidde fraag de Chef, of he de Instellens ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS överprüfen maag.
+blame.ignore_revs = Minnacht Versioonen in .git-blame-ignore-revs. Klick hier, um daar överwegtogahn un de normaale Schüld-Ansicht to wiesen.
+migrate.github_token_desc = Du kannst hier een of mehr Tekens angeven, wat mit Kommas trennt sünd, um dat Umtrecken fixer to maken, um de GitHub-API-Togrieps-Begrenz. WAHRSCHAU: Wenn du dat missbruukst, kannst du de Richtlienjen vun de Deenstbedriev verletzen un dien Konto kann sperrt worden.
+issues.edit.already_changed = Kann Ännerns an de Gefall nich sekern. Dat schient, dat de Inholl al vun een anner Bruker ännert worden is. Bidde laad de Sied neei un versöök, dat dann noch eenmaal to bewarken, daarmit du hör Ännerns nich överschriffst
+broken_message = De Git-Daten unner deesem Repositorium könen nich lesen worden. Kuntakteer de Chef vun deeser Instanz of löske dat Repositorium.
+ambiguous_runes_header = `Deese Datei enthollt verwesselbaare Unicode-Bookstavens`
+ambiguous_runes_description = `Deese Datei enthollt Unicode-Bookstavens, wat man licht mit anner Bookstavens verwesseln kann. Wenn du glöövst, dat dat so wesen sall, kannst du deese Wahrschau seker minnachten. Bruuk de Utkielen-Knoop, um se to wiesen.`
+invisible_runes_description = `Deese Datei enthollt unsichtbaare Unicode-Bookstavens, wat Minsken nich sehn könen, aver vun eenem Reekner anners verarbeidt worden könen. Wenn du glöövst, dat dat so wesen sall, kannst du deese Wahrschau seker minnachten. Bruuk de Utkielen-Knoop, um se to wiesen.`
+comments.edit.already_changed = Kann Ännerns an de Kommentaar nich sekern. Dat schient, dat de Inholl al vun een anner Bruker ännert worden is. Bidde laad de Sied neei un versöök, dat dann noch eenmaal to bewarken, daarmit du hör Ännerns nich överschriffst
+pulls.clear_merge_message_hint = Wenn du de Tosamenföhrens-Naricht leeg maakst, lösket dat blots de Naricht-Inholl un behollt sülk automatisk maakte Git-Nadragens as »Co-Authored-By …«.
+settings.add_webhook_desc = Forgejo sennt POST-Anfragen mit eener angeven Inholls-Aard to de Enn-URL. Lees mehr in de Internett-Hakens-Inföhren.
+issues.review.pending.tooltip = Deeser Kommentaar is jüüst för anner Brukers nich sichtbaar. Um diene utstahn Kommentaaren avtogeven, köör boven in de Sied »%s« → »%s/%s/%s« ut.
+settings.sourcehut_builds.access_token_helper = Togang-Teken, wat de Verlöövnis JOBS:RW hett. Maak een builds.sr.ht-Teken of een builds.sr.ht-Teken mit Togriep to Geheimnissen up meta.sr.ht.
+settings.protect_unprotected_file_patterns_desc = Nich schütt Dateien, wat stracks ännert worden düren, wenn de Bruker Schriev-Togriep hett, an de Schuuv-Schüttens-Örders vörbi. Mennig Musters könen mit Semikolon (»;«) trennt worden. Kiek de Dokumenteren för ">%[2]s för de Syntax an. Bispölen: .drone.yml, /docs/**/*.txt.
+settings.protected_branch_required_rule_name = Ördernaam is nödig
+settings.protect_protected_file_patterns_desc = Schütt Dateien, wat nich stracks ännert worden düren, sülvst wenn de Bruker dat Recht hett, Dateien in deesem Twieg hentotofögen, to bewarken of to lösken. Mennig Musters könen mit Semikolon (»;«) trennt worden. Kiek de Dokumenteren för ">%[2]s för de Syntax an. Bispölen: .drone.yml, /docs/**/*.txt.
+settings.branch_filter_desc = Twieg-Verlöövnis-List för Vörfallen över dat Schuven un dat Maken un Lösken vun Twiegen, angeven as een Glob-Muster. Wenn leeg of * worden Vörfallen för all Twiegen mellt. Kiek de Dokumenteren för ">%[2]s för de Syntax an. Bispölen: master, {master,release*}.
+settings.matrix.room_id_helper = De Ruum-ID kann vun de Element-Internett-Sied unner Ruum-Instellens → Verwiedert → Binnere Ruum-ID haalt worden. Bispööl: %s.
+settings.tags.protection.pattern.description = Du kannst eenen enkelt Naam bruken of een Glob-Muster of Regel-Utdruck, um up mennig Markens to passen. Lees mehr in de Inföhren över schütt Markens.
+error.broken_git_hook = Git-Hakens in deesem Repositorium schienen kaputt to wesen. Bidde folg de Dokumenteren, um se to repareren, dann schuuv een paar Kommitterens, um de Tostand to vernejen.
+settings.matrix.access_token_helper = Dat word anraden, daarföör eegens een Matrix-Konto intorichten. Dat Togangs-Teken kann in de Element-Internett-Sied (in eener privaaten/anonymen Karteikaart) unner Brukermenü (boven links) → All Instellens → Hülp & Över → Togangs-Teken (stracks unner de Heimaadserver-URL) haalt worden. Maak de privaate/anonyme Karteikaart dicht (wenn du di avmellst, word dat Teken ungültig).
+
+[repo.permissions]
+code.read = Lesen: De Quelltext vun deesem Repositorium ankieken un klonen.
+code.write = Schrieven: Schuuv to de Repositorium un maak Twiegen un Markens.
+issues.read = Lesen: Gefallens un Kommentaaren lesen un maken.
+issues.write = Schrieven: Gefallens dichtmaken un wiedere Informatioonen so as Vermarkens, Markstenen, Towiesens, Anstahns-Daten un Ofhangens bewarken.
+releases.write = Schrieven: Publizerens un hör Objekten publik maken, bewarken un lösken.
+releases.read = Lesen: Publizerens ankieken un runnerladen.
+wiki.write = Schrieven: Sieden in de inbaut Wiki maken, vernejen un lösken.
+wiki.read = Lesen: Dat inbaut Wiki un siene Histoorje lesen.
+pulls.write = Schrieven: Haalvörslagen dichtmaken un wiedere Informatioonen so as Vermarkens, Markstenen, Towiesens, Anstahns-Daten un Ofhangens bewarken.
+pulls.read = Lesen: Haalvörslagen lesen un maken.
+projects.read = Lesen: Repositoriums-Projekt-Bredden wiesen.
+projects.write = Schrieven: Projekten un Striepen maken un bewarken.
+packages.read = Lesen: Paketen in de Repositorium ankieken un runnerladen.
+actions.write = Schrieven: CI-/CD-Affolgens vun Hand utlösen, neei starten, ofbreken of tostimmen.
+actions.read = Lesen: CI-/CD-Affolgens un hör Utgaav ankieken.
+ext_issues = Togriep to de Verwies to eenem frömden Gefall-Verfolger. De Rechten worden frömd verwalt.
+ext_wiki = Togriep to de Verwies to eenem frömden Wiki. De Rechten worden frömd verwalt.
+packages.write = Schrieven: Paketen in de Repositorium publik maken un lösken.
+
+[graphs]
+component_loading = Lade %s …
+component_loading_failed = Kunn %s nich laden
+component_loading_info = Dat kann een bietje düren …
+component_failed_to_load = Een unverwacht Fehler is uptreden.
+code_frequency.what = Quelltext-Frequenz
+contributors.what = Bidragens
+recent_commits.what = Leste Kommitterens
+
+[org]
+org_name_holder = Verenigungs-Naam
+org_full_name_holder = Kumpleter Naam vun de Verenigung
+org_name_helper = Verenigungs-Namen sallen kört un lich to marken wesen.
+create_org = Verenigung maken
+open_dashboard = »Mien Disk« opmaken
+repo_updated = %s verneeit
+members = Liddmaten
+teams = Klottjen
+code = Quelltext
+lower_members = Liddmaten
+lower_repositories = Repositoriums
+create_new_team = Neje Klottje
+team_name = Klottjen-Naam
+team_desc = Beschrieven
+team_desc_helper = Beschriev de Zweck of Rull vun de Klottje.
+team_access_desc = Repositoriums-Togriep
+team_permission_desc = Rechten
+team_unit_desc = Togriep to Repositoriums-Delen verlöven
+team_unit_disabled = (Utknipst)
+form.create_org_not_allowed = Du hest nich dat Recht, eene Verenigung to maken.
+settings = Instellens
+settings.options = Verenigung
+settings.full_name = Kumpleter Naam
+settings.website = Internett-Sied
+settings.visibility.limited = Begrenzt (blots anmellt Brukers könen ’t sehn)
+settings.visibility.limited_shortname = Begrenzt
+settings.visibility.private_shortname = Privaat
+settings.update_settings = Instellens vernejen
+settings.update_setting_success = Verenigungs-Instellens sünd verneeit worden.
+settings.change_orgname_redirect_prompt = De olle Naam leit daarhen um, bit well anners hüm nimmt.
+settings.update_avatar_success = Dat Verenigungs-Kontobill is verneeit worden.
+settings.delete = Verenigung lösken
+settings.delete_account = Deese Verenigung lösken
+settings.delete_prompt = Dat lösket de Verenigung för all Tieden. Dat KANN NICH torüggnohmen worden!
+settings.confirm_delete_account = Lösken utwiesen
+settings.delete_org_title = Verenigung lösken
+settings.delete_org_desc = De Verenigung word för all Tieden lösket. Wiedermaken?
+settings.labels_desc = Föög Vermarkens hento, wat för Gefallens in all Repositoriums unner deeser Verenigung bruukt worden könen.
+create_team = Klottje maken
+form.name_pattern_not_allowed = Dat Muster »%s« is in eenem Verenigungs-Naam nich verlöövt.
+follow_blocked_user = Du kannst deeser Verenigung nich nagahn, denn de Verenigung hett du blockeert.
+form.name_reserved = De Verenigungs-Naam »%s« is vörbehollen.
+settings.repoadminchangeteam = Repositoriums-Chef kann Togriep för Klottjen hentofögen un wegdoon
+settings.email = Kuntakt-E-Mail
+settings.permission = Verlöövnissen
+settings.visibility.private = Privaat (blots Verenigungs-Liddmaten könen ’t sehn)
+team_name_helper = Klottjen-Namen sallen kört un licht to marken wesen.
+settings.location = Stee
+settings.change_orgname_prompt = Wahrschau: Wenn du de Verenigungs-Naam ännerst, ännert sik ok de Verenigungs-URL un de olle Naam word freeigeven.
+org_desc = Beschrieven
+settings.visibility = Sichtbaarkeid
+settings.visibility.public = Publik
+settings.hooks_desc = Föög Internett-Hakens hento, wat för all Repositoriums unner deeser Verenigung utlööst worden.
+members.membership_visibility = Liddmaat-Sichtbaarkeid:
+members.public = Sichtbaar
+members.public_helper = Verbargen
+members.private = Nich sichtbaar
+members.private_helper = Sichtbaar maken
+members.member_role = Liddmaat-Rull:
+members.owner = Eegner
+members.member = Liddmaat
+members.remove = Wegdoon
+members.remove.detail = %[1]s ut %[2]s wegdoon?
+members.leave = Verlaten
+members.leave.detail = Willst du de Verenigung »%s« würrelk verlaten?
+members.invite_desc = Föög eenen nejen Liddmaat to %s hento:
+members.invite_now = Nu inladen
+teams.join = Bitreden
+teams.leave = Verlaten
+teams.leave.detail = Willst du de Klottje »%s« würrelk verlaten?
+teams.can_create_org_repo = Repositoriums maken
+teams.can_create_org_repo_helper = Liddmaten könen neje Repositoriums in de Verenigung maken. De Maker kriggt Chef-Rechten in de neje Repositorium.
+teams.none_access = Keen Togang
+teams.none_access_helper = De Instellen »Keen Togang« is blots för privaate Repositoriums vun Belang.
+teams.general_access = Eegener Togang
+teams.general_access_helper = Liddmaten-Rechten worden vun de Rechten-Tabell unnern fastleggt.
+teams.read_access = Lesen
+teams.write_access = Schrieven
+teams.admin_access = Chef-Togang
+teams.no_desc = Deese Klottje is nich beschrieven
+teams.settings = Instellens
+teams.owners_permission_desc = Eegners hebben kumpleten Togang to all Repositoriums un hebben Chef-Togang to de Verenigung.
+teams.update_settings = Instellens vernejen
+teams.delete_team = Klottje wegdoon
+teams.add_team_member = Klottjen-Liddmaat hentofögen
+teams.delete_team_success = De Klottje is wegdaan worden.
+teams.write_permission_desc = Deese Klottje gifft Schrievens-Togriep: Liddmaten könen Klottjen-Repositoriums ankieken un daarhen schuven.
+teams.remove_all_repos_title = All Klottjen-Repositoriums wegdoon
+teams.add_all_repos_title = All Repositoriums hentofögen
+teams.add_nonexistent_repo = Dat Repositorium, wat du hentofögen willst, gifft dat nich; bidde maak ’t eerst.
+teams.add_duplicate_users = Bruker is al een Klottjen-Liddmaat.
+teams.members.none = Deese Klottje hett keene Liddmaten.
+teams.specific_repositories = Wisse Repositoriums
+teams.all_repositories_helper = Klottje het Togang to all Repositoriums. Wenn du dat utköörst, worden all bestahn Repositoriums to de Klottje hentoföögt.
+teams.invite.title = Du büst inladen worden, to de Klottje %s in de Verenigung %s bitotreden.
+teams.invite.by = Vun %s inladen
+teams.invite.description = Bidde klick up de Knoop unnern, um to de Klottje bitotreden.
+teams.invite_team_member = To %s inladen
+teams.delete_team_desc = Wenn du eene Klottje wegdoost, hebben hör Liddmaten keen Togriep mehr up de Repositoriums. Wiedermaken?
+teams.admin_permission_desc = Deese Klottje gifft Chef-Togriep: Liddmaten könen Klottjen-Repositoriums ankieken, daarhen schuven un Mitarbeiders hentofögen.
+teams.create_repo_permission_desc = Daarto gifft deese Klottje dat Recht, Repositoriums to maken: Liddmaten könen neje Repositoriums in de Verenigung maken.
+teams.repositories = Klottjen-Repositoriums
+teams.members = Klottjen-Liddmaten
+teams.add_all_repos_desc = Dat föögt all de Repositoriums in de Verenigung to de Klottje hento.
+teams.admin_access_helper = Liddmaten könen to Klottjen-Repositoriums schuven un halen un daar Mitarbeiders hentofögen.
+teams.delete_team_title = Klottje wegdoon
+teams.invite_team_member.list = Utstahn Inladens
+teams.remove_all_repos_desc = Dat doot all Repositoriums vun de Klottje weg.
+teams.read_permission_desc = Deese Klottje gifft Lesens-Togriep: Liddmaten könen Klottjen-Repositoriums ankieken un klonen.
+teams.repos.none = Deese Klottje kann up keene Repositoriums togriepen.
+teams.specific_repositories_helper = Liddmaten hebben blots Togriep up Repositoriums, wat besünners to de Klottje hentoföögt worden sünd. Wenn du dat utköörst, worden Repositoriums, wat du al mit All Repositoriums hentoföögt hest, nich automatisk wegdaan.
+teams.all_repositories = All Repositoriums
+
+[admin]
+dashboard = Mien Disk
+self_check = Sülvst-Överprüfen
+identity_access = Sülvst & Togang
+users = Brukerkonten
+organizations = Verenigungen
+assets = Quelltext-Objekten
+repositories = Repositoriums
+hooks = Internett-Hakens
+integrations = Inbinnens
+authentication = Anmellens-Quellen
+emails = Bruker-E-Mails
+config = Inrichten
+notices = Systeem-Narichtens
+config_summary = Tosamenfaten
+monitor = Överwachen
+first_page = Eerste
+last_page = Leste
+config_settings = Instellens
+total = All tosamen: %d
+settings = Chef-Instellens
+dashboard.statistic = Tosamenfaten
+dashboard.operations = Plegens-Aktioonen
+dashboard.new_version_hint = Forgejo %s is nu verföögbaar, du hest %s. Kiek de Blog för mehr Informationen an.
+dashboard.delete_generated_repository_avatars = Maakte Repositoriums-Kontobillers lösken
+dashboard.sync_repo_tags = Markens vun Git-Daten to de Datenbank spegeln
+dashboard.update_mirrors = Spegels vernejen
+dashboard.repo_health_check = Gesundheids-Överprüfen för all Repositoriums
+dashboard.check_repo_stats = De Statistiken vun all Repositoriums överprüfen
+dashboard.deleted_branches_cleanup = Lösket Twiegen uprümen
+dashboard.git_gc_repos = Up all Repositoriums de Müll avhalen
+dashboard.resync_all_sshprincipals = De ».ssh/authorized_principals«-Datei mit de SSH-Höövdmannen vun Forgejo vernejen.
+dashboard.reinit_missing_repos = All fehlend Git-Repositoriums neei inrichten, för wat dat Uptekens gifft
+dashboard.cleanup_packages = Avlopen Paketen uprümen
+dashboard.cleanup_actions = Avlopen Utgaven un Objekten vun Aktioonen uprümen
+dashboard.current_goroutine = Stedenwies Go-Routinen
+dashboard.total_memory_allocated = Spieker towiesen all tosamen
+dashboard.memory_allocate_times = Spieker-Towiesens
+dashboard.system_status = Systeem-Tostand
+dashboard.operation_switch = Wesseln
+dashboard.operation_run = Utföhren
+dashboard.clean_unbind_oauth_success = All unverbunnen OAuth-Verbinnens sünd wegdaan worden.
+dashboard.task.process = Upgaav: %[1]s
+dashboard.task.cancelled = Upgaav: %[1]s ofbroken: %[3]s
+dashboard.task.error = Fehler in Upgaav: %[1]s: %[3]s
+dashboard.task.unknown = Unbekannte Upgaav: %[1]s
+dashboard.cron.started = Hett Tiedplaan begunnen: %[1]s
+dashboard.cron.error = Fehler im Tiedplaan: %s: %[3]s
+dashboard.delete_inactive_accounts.started = Upgaav, um all nich aktiveerten Konten to lösken, begunnen.
+dashboard.delete_repo_archives = All Repositoriums-Archiven (ZIP, TAR.GZ, usw. …) lösken
+dashboard.delete_missing_repos.started = Upgaav, um all Repositoriums sünner Git-Dateien to lösken, begunnen.
+dashboard.delete_missing_repos = All Repositoriums sünner Git-Dateien lösken
+dashboard.task.finished = Upgaav: %[1]s vun %[2]s begunnen is daan worden
+dashboard.cron.finished = Tiedplaan: %[1]s is daan worden
+dashboard.operation_name = Aktioons-Naam
+dashboard.cron.process = Tiedplaan: %[1]s
+dashboard.cron.cancelled = Tiedplaan: %[1]s ofbroken: %[3]s
+dashboard.resync_all_sshkeys = De ».ssh/authorized_keys«-Datei mit de SSH-Slötels vun Forgejo vernejen.
+dashboard.memory_obtained = Spieker erhollen
+dashboard.pointer_lookup_times = Wieser-Nakiek-Tieden
+dashboard.task.started = Hett Upgaav begunnen: %[1]s
+dashboard.delete_inactive_accounts = All nich aktiveerten Konten lösken
+dashboard.delete_repo_archives.started = Upgaav, um all Repositoriums-Archiven to lösken, begunnen.
+dashboard.archive_cleanup = Olle Repositoriums-Archiven lösken
+dashboard.resync_all_hooks = De Hakens »pre-receive«, »update« un »post-receive« in all Repositoriums vernejen
+dashboard.clean_unbind_oauth = Unverbunnen OAuth-Verbinnens uprümen
+dashboard.sync_repo_branches = Fehlend Twiegen vun Git-Daten to de Datenbank spegeln
+dashboard.update_migration_poster_id = Umtreck-Author-IDs vernejen
+dashboard.cleanup_hook_task_table = hook_task-Tabell uprümen
+dashboard.sync_external_users = Frömde Brukerdaten vernejen
+dashboard.server_uptime = Server-Bedrievstied
+dashboard.current_memory_usage = Stedenwies Spiekerbruuk
+dashboard.heap_memory_obtained = Hoopspieker erhollen
+dashboard.current_heap_usage = Stedenwies Hoopbruuk
+dashboard.heap_memory_idle = Hoopspieker mit nix to doon
+dashboard.heap_memory_released = Hoopspieker freeigeven
+dashboard.heap_objects = Hoopobjekten
+dashboard.bootstrap_stack_usage = Bootstrap-Stapelbruuk
+dashboard.stack_memory_obtained = Stapelspieker erhollen
+dashboard.mspan_structures_usage = MSpan-Struktuuren-Bruuk
+dashboard.mspan_structures_obtained = MSpan-Struktuuren erhollen
+dashboard.mcache_structures_usage = MCache-Struktuuren-Bruuk
+dashboard.gc_metadata_obtained = Wiedere Informatioonen för GC erhollen
+dashboard.other_system_allocation_obtained = Anner Systeemtowiesens erhollen
+dashboard.next_gc_recycle = Anner GC-Müllavhalen
+dashboard.last_gc_time = Tied siet lestem GC
+dashboard.total_gc_pause = GC-Paus all tosamen
+dashboard.last_gc_pause = Leste GC-Paus
+dashboard.gc_times = GC-Tieden
+dashboard.delete_old_actions = All olles Doon ut de Datenbank lösken
+dashboard.update_checker = Vernejens-Sööker
+dashboard.delete_old_system_notices = All ollen Systeemnarichten ut de Datenbank lösken
+dashboard.gc_lfs = In LFS-Meta-Objekten de Müll avhalen
+dashboard.stop_zombie_tasks = Spöök-Aktioonen-Upgaven anhollen
+dashboard.stop_endless_tasks = Aktioonen-Upgaven sünner Enn anhollen
+dashboard.cancel_abandoned_jobs = Verlaten Aktioonen-Upgaven ofbreken
+dashboard.sync_branch.started = Twieg-Vernejen begunnen
+users.user_manage_panel = Brukerkonten verwalten
+users.new_account = Brukerkonto maken
+users.name = Brukernaam
+users.full_name = Kumpleter Naam
+users.activated = Aktiveert
+users.admin = Chef
+users.restricted = Begrenzt
+users.reserved = Vörbehollen
+users.created = Maakt
+users.last_login = Tolest anmellt
+users.never_login = Nie anmellt
+users.send_register_notify = E-Mail-Naricht över dat Registreren sennen
+users.new_success = Dat Brukerkonto »%s« is maakt worden.
+users.edit = Bewarken
+users.auth_source = Anmellens-Quell
+users.local = Stedenwies
+users.auth_login_name = Anmell-Naam
+users.password_helper = Laat dat Passwoord leeg, um dat nich to ännern.
+users.update_profile_success = Dat Brukerkonto is verneeit worden.
+users.edit_account = Brukerkonto bewarken
+users.is_activated = Konto aktiveert
+users.prohibit_login = Konto sperrt
+users.block.description = Deesem Bruker verseggen, mit deesem Deenst dör deeses Konto to warken, un dat Anmellen verseggen.
+users.is_admin = Chefkonto
+users.admin.description = Deesem Bruker kumpleten Togriep to all Chef-Aktioonen geven, wat mit de Internett-Schnittstee un de API gahn.
+users.is_restricted = Begrenztes Konto
+users.allow_git_hook = Kann Git-Hakens maken
+dashboard.memory_free_times = Spieker-Freeigevens
+users.bot = Bot
+users.2fa = 2FA
+dashboard.profiling_bucket_hash_table_obtained = Profileren-Emmer-Prüfsummtabell erhollen
+dashboard.sync_tag.started = Mark-Vernejen begunnen
+dashboard.rebuild_issue_indexer = Gefall-Indizerer neei bauen
+users.activated.description = Of dat E-Mail-Utwiesen ofsluten is. De Eegner vun eenem nich aktiveerten Konto kann sik nich anmellen, bit dat E-Mail-Utwiesen ofsluten is.
+dashboard.heap_memory_in_use = Hoopspieker bruukt
+users.max_repo_creation_desc = (Giff -1 in, um de Normaalweert vun de Instanz to bruken.)
+dashboard.mcache_structures_obtained = MCache-Struktuuren erhollen
+dashboard.start_schedule_tasks = Aktioonen-Upgaven mit Tiedplaan begünnen
+users.remote = Frömd
+users.max_repo_creation = Hoogste Tahl vun Repositoriums
+dashboard.delete_old_actions.started = Hett begunnen, all olles Doon ut de Datenbank to lösken.
+users.repos = Repos
+users.restricted.description = Verlööv blots, mit de Repositoriums un Verenigungen to warken, waar deeser Bruker as Mitarbeider hentoföögt is. Dat verhinnert Togriep to publiken Repositoriums in deeser Instanz.
+users.allow_git_hook_tooltip = Git-Hakens worden as de BS-Bruker utföhrt, unner well Forgejo löppt, un hebben dat sülve Maat an Host-Togriep. Also könen Brukers mit de Git-Haak-Recht all Forgejo-Repositoriums ankieken un bewarken un ok de Datenbank, wat Forgejo bruukt. Also könen se ok Chef-Rechten för Forgejo kriegen.
+users.allow_import_local = Kann stedenwies Repositoriums importeren
+users.local_import.description = Verlööv, Repositoriums vun de stedenwies Dateisysteem vum Server to importeren. Dat kann een Sekerheidsprobleem wesen.
+users.allow_create_organization = Kann Verenigungen maken
+users.organization_creation.description = Verlööv, neje Verenigungen to maken.
+users.update_profile = Brukerkonto vernejen
+users.delete_account = Brukerkonto lösken
+users.cannot_delete_self = Du kannst nich di sülven lösken
+users.still_own_repo = De Bruker is noch een Eegner vun een of mehr Repositoriums. Löske of överdraag deese Repositoriums eerst.
+users.still_has_org = De Bruker is noch een Liddmaat vun eener Verenigung. Doo de Bruker eerst ut all Verenigungen weg.
+users.purge = Bruker wegschüren
+users.purge_help = Mit Dwang de Bruker un all siene Repositoriums Verenigungen un Paketen lösken. All Kommentaaren un Gefallens, wat deeser Bruker maakt hett, worden ok lösket.
+users.still_own_packages = Deeser Bruker is noch Eegner vun een of mehr Paketen, löske eerst deese Paketen.
+users.list_status_filter.menu_text = Filter
+users.list_status_filter.not_active = Nich aktiiv
+users.list_status_filter.is_restricted = Begrenzt
+users.list_status_filter.not_restricted = Unbegrenzt
+users.list_status_filter.is_2fa_enabled = 2FA anknipst
+users.list_status_filter.not_2fa_enabled = 2FA utknipst
+users.details = Bruker-Informationen
+emails.email_manage_panel = Bruker-E-Mails verwalten
+emails.primary = Höövd
+emails.activated = Aktiveert
+emails.filter_sort.email = E-Mail
+emails.filter_sort.email_reverse = E-Mail (umdreiht)
+emails.filter_sort.name = Brukernaam
+emails.filter_sort.name_reverse = Brukernaam (umdreiht)
+emails.updated = E-Mail verneeit
+emails.not_updated = Kunn de erbeden E-Mail-Adress nich vernejen: %v
+emails.duplicate_active = Deese E-Mail-Adress is al för eenen anner Bruker aktiiv.
+emails.change_email_header = E-Mail-Eegenskuppen vernejen
+emails.change_email_text = Willst du deese E-Mail-Adress würrelk vernejen?
+emails.delete = E-Mail wegdoon
+emails.delete_desc = Willst du deese E-Mail-Adress würrelk wegdoon?
+emails.deletion_success = De E-Mail-Adress is wegdaan worden.
+emails.delete_primary_email_error = Du kannst de Höövd-E-Mail nich wegdoon.
+orgs.org_manage_panel = Verenigungen verwalten
+orgs.name = Naam
+orgs.teams = Klottjen
+orgs.members = Liddmaten
+orgs.new_orga = Neje Verenigung
+repos.repo_manage_panel = Repositoriums verwalten
+repos.unadopted = Repositoriums sünner Eegner
+repos.unadopted.no_more = Keene Repositoriums sünner Eegner funnen.
+repos.owner = Eegner
+repos.name = Naam
+repos.private = Privaat
+repos.issues = Gefallens
+repos.size = Grött
+repos.lfs_size = LFS-Grött
+packages.package_manage_panel = Paketen verwalten
+packages.total_size = Grött all tosamen: %s
+packages.unreferenced_size = Unbenöömt Grött: %s
+packages.cleanup = Avlopen Daten uprümen
+packages.cleanup.success = Avlopen Daten uprüümt
+packages.owner = Eegner
+packages.creator = Maker
+packages.name = Naam
+packages.version = Versioon
+packages.type = Aard
+packages.repository = Repositorium
+packages.size = Grött
+packages.published = Publizeert
+defaulthooks = Normaale Internett-Hakens
+defaulthooks.add_webhook = Normaalen Internett-Haak hentofögen
+defaulthooks.update_webhook = Normaalen Internett-Haak vernejen
+systemhooks = Systeem-Internett-Hakens
+systemhooks.add_webhook = Systeem-Internett-Haak hentofögen
+systemhooks.update_webhook = Systeem-Internett-Haak vernejen
+auths.auth_manage_panel = Anmellens-Quellen verwalten
+auths.new = Anmellens-Quell hentofögen
+auths.name = Naam
+auths.type = Aard
+systemhooks.desc = Internett-Hakens sennen automatisk HTTP-POST-Anfragen to eenem Server, wenn wisse Forgejo-Vörfallen passeren. Internett-Hakens, wat hier inricht worden, hanneln för all Repositoriums in de Systeem, also bedenk bidde, wat dat för de Systeemlast heten word. Lees mehr in de Internett-Hakens-Dokumenteren.
+auths.enabled = Anknipst
+auths.updated = Verneeit
+auths.security_protocol = Sekerheids-Protokoll
+auths.domain = Domään
+auths.host = Host
+auths.port = Poort
+auths.bind_dn = Binne-DN
+auths.bind_password = Binne-Passwoord
+auths.user_base = Bruker-Söök-Grundlaag
+auths.user_dn = Bruker-DN
+auths.attribute_username = Brukernaam-Eegenskupp
+auths.attribute_username_placeholder = Laat dat leeg, um de Brukernaam to bruken, wat in Forgejo ingeven worden is.
+auths.attribute_name = Vörnaam-Eegenskupp
+auths.attribute_surname = Achternaam-Eegenskupp
+auths.attribute_mail = E-Mail-Eegenskupp
+auths.attribute_ssh_public_key = Eegenskupp för publiken SSH-Slötel
+auths.attribute_avatar = Kontobill-Eegenskupp
+auths.attributes_in_bind = Eegenskuppen in Binne-DN-Umgeven halen
+auths.default_domain_name = Normaaler Domään-Naam för de E-Mail-Adress
+auths.allow_deactivate_all = Verlööv, dat een leges Söökresultaat all Brukers as nich aktiiv sett
+auths.use_paged_search = Söök mit Siedens bruken
+auths.search_page_size = Siedengrött
+auths.filter = Bruker-Filter
+auths.admin_filter = Chef-Filter
+auths.restricted_filter = Begrenzt-Filter
+auths.verify_group_membership = Gruppen-Liddmatenskupp in LDAP utwiesen (laat de Filter leeg, um dat to överspringen)
+auths.group_search_base = Gruppensöök-Grundlaag-DN
+auths.group_attribute_list_users = Gruppen-Eegenskupp, wat de Brukerlist enthollt
+auths.user_attribute_in_group = Bruker-Eegenskupp in Grupp list
+auths.map_group_to_team_removal = Brukers ut spegelt Klottjen wegdoon, wenn de Bruker nich in de tohörig LDAP-Grupp is
+auths.enable_ldap_groups = LDAP-Gruppen anknipsen
+auths.ms_ad_sa = MS-AD-Söök-Eegenskuppen
+auths.smtp_auth = SMTP-Anmellens-Aard
+auths.smtphost = SMTP-Host
+auths.smtpport = SMP-Poort
+auths.allowed_domains = Verlöövte Domänen
+auths.skip_tls_verify = TLS-Utwiesen överspringen
+auths.force_smtps = SMTPS dwingen
+auths.helo_hostname = HELO-Hostnaam
+auths.helo_hostname_helper = Hostnaam, wat mit HELO sennt word. Laat dat leeg, um de stedenwies Hostnaam to sennen.
+auths.disable_helo = HELO utknipsen
+auths.pam_service_name = PAM-Deenst-Naam
+auths.pam_email_domain = PAM-E-Mail-Domään (nich nödig)
+auths.oauth2_provider = OAuth2-Anbeder
+auths.oauth2_icon_url = Bill-URL
+auths.oauth2_clientID = Klient-ID (Slötel)
+auths.oauth2_clientSecret = Klient-Geheimnis
+auths.oauth2_use_custom_url = Eegene URLs in Stee vun de normaalen URLs bruken
+auths.oauth2_tokenURL = Teken-URL
+auths.oauth2_authURL = Anmellen-URL
+auths.oauth2_profileURL = Profil-URL
+auths.oauth2_emailURL = E-Mail-URL
+auths.skip_local_two_fa = Stedenwies 2FA överspringen
+auths.oauth2_tenant = Inwohner
+auths.oauth2_scopes = Wiedere Rebeeten
+users.deletion_success = Dat Brukerkonto is lösket worden.
+users.list_status_filter.is_admin = Chef
+auths.syncenabled = Bruker-Vernejen anknipsen
+users.reset_2fa = 2FA torüggsetten
+users.list_status_filter.is_prohibit_login = Anmellen verseggen
+users.list_status_filter.not_admin = Keen Chef
+auths.auth_type = Anmellens-Aard
+auths.restricted_filter_helper = Laat dat leeg, wenn keene Brukers begrenzt wesen sallen. Bruuk eenen Steern (»*«), um all Brukers, wat nich up de Chef-Filter passen, as begrenzt to setten.
+auths.force_smtps_helper = SMTPS word alltieden up Poort 465 bruukt. Sett dat, um SMTPS up anner Poorten to dwingen. (Anners word up anner Poorten STARTTLS bruukt, wenn de Host dat unnerstütt.)
+users.list_status_filter.reset = Torüggsetten
+users.list_status_filter.is_active = Aktiiv
+users.list_status_filter.not_prohibit_login = Anmellen verlöven
+auths.auth_name = Anmellens-Naam
+auths.map_group_to_team = LDAP-Gruppens up Verenigungs-Klottjen avbillen (laat dat Feld leeg, um dat to överspringen)
+auths.allowed_domains_helper = Laat dat leeg, um all Domänens to verlöven. Trenn mennig Domänen mit eenem Komma (»,«).
+defaulthooks.desc = Internett-Hakens sennen automatisk HTTP-POST-Anfragen to eenem Server, wenn wisse Forgejo-Vörfallen passeren. Internett-Hakens, wat hier inricht worden, sünd Normaalweertens un worden in all neje Repositoriums kopeert. Lees mehr in de Internett-Hakens-Dokumenteren.
+auths.openIdConnectAutoDiscoveryURL = URL för Automatisk Utförsken mit OpenID-Verbinnen
+auths.skip_local_two_fa_helper = Wenn dat nich sett is, heet dat, dat stedenwies Brukers mit 2FA doch tum Anmellen dör 2FA gahn mutten
+
+[action]
+rename_repo = hett een Repositorium vun %[1]s na %[3]s umbenöömt
+create_issue = `hett Gefall %[3]s #%[2]s opmaakt`
+close_issue = `hett Gefall %[3]s #%[2]s dichtmaakt`
+reopen_issue = `hett Gefall %[3]s #%[2]s weer opmaakt`
+create_pull_request = `hett Haalvörslag %[3]s #%[2]s opmaakt`
+reopen_pull_request = `hett Haalvörslag %[3]s #%[2]s weer opmaakt`
+comment_issue = `hett up Gefall %[3]s #%[2]s kommenteert`
+comment_pull = `hett up Haalvörslag %[3]s #%[2]s kommenteert`
+auto_merge_pull_request = `hett Haalvörslag %[3]s #%[2]s automatisk tosamenföhrt`
+transfer_repo = hett Repositorium %s na %s överdragen
+delete_branch = hett Twieg %[2]s vun %[3]s lösket
+compare_branch = Verglieken
+compare_commits = %d Kommitterens verglieken
+compare_commits_general = Kommitterens verglieken
+mirror_sync_create = hett nejen Beteekner %[3]s na %[4]s spegelt
+approve_pull_request = `hett %[3]s#%[2]s tostimmt`
+reject_pull_request = `hett um Ännerns in %[3]s#%[2]s beden`
+review_dismissed = `hett dat Nakieken vun %[4]s för %[3]s#%[2]s ofseggt`
+review_dismissed_reason = Grund:
+starred_repo = hett up %[2]s eenen Steern sett
+merge_pull_request = `hett Haalvörslag %[3]s #%[2]s tosamenföhrt`
+create_branch = hett Twieg %[3]s in %[4]s maakt
+delete_tag = hett Mark %[2]s vun %[3]s lösket
+push_tag = hett Mark %[3]s na %[4]s schuven
+publish_release = `hett %[4]s in %[3]s publik maakt`
+commit_repo = hett to %[3]s in %[4]s schuven
+close_pull_request = `hett Haalvörslag %[3]s #%[2]s dichtmaakt`
+create_repo = hett dat Repositorium %s maakt
+mirror_sync_push = hett Kommitterens na %[3]s in %[4]s spegelt
+mirror_sync_delete = hett Beteekner %[2]s in %[3]s spegelt un lösket
+watched_repo = hett begunnen, %[2]s to beluren
+
+[tool]
+future = in Tokunft
+1s = 1 Sekünn
+1m = 1 Menüüt
+1d = 1 Dag
+1w = 1 Week
+1mon = 1 Maant
+1y = 1 Jahr
+seconds = %d Sekünnen
+hours = %d Stünnen
+days = %d Dagen
+weeks = %d Weken
+months = %d Maanten
+years = %d Jahren
+raw_seconds = Sekünnen
+raw_minutes = Menüten
+minutes = %d Menüten
+now = nu
+1h = 1 Stünn
+
+[munits.data]
+b = B
+kib = KiB
+mib = MiB
+gib = GiB
+tib = TiB
+pib = PiB
+eib = EiB
+
+[dropzone]
+default_message = Laat Dateien hier fallen of klick hier tum Upladen.
+invalid_input_type = Du kannst deese Aard vun Dateien nich upladen.
+file_too_big = Dateigrött ({{filesize}} MB) is boven de hoogste Dateigrött vun {{maxFilesize}} MB.
+remove_file = Datei wegdoon
+
+[notification]
+notifications = Narichtens
+unread = Nich lesen
+read = Lesen
+no_unread = Keene nejen Narichtens.
+no_read = Keene lesen Narichtens.
+pin = Naricht faststeken
+mark_as_read = As lesen markeren
+mark_as_unread = As nich lesen markeren
+mark_all_as_read = All as lesen markeren
+subscriptions = Abonneerens
+watching = Beluren
+no_subscriptions = Nix abonneert
+
+[gpg]
+default_key = Mit normaalem Slötel unnerschrieven
+error.extract_sign = Kunn Unnerschrift nich uttrecken
+error.generate_hash = Kunn Prüfsumm vum Kommitteren nich bereken
+error.no_committer_account = Keen Konto mit de Kommitterer-E-Mail-Adress verbunnen
+error.no_gpg_keys_found = Keen bekannter Slötel för deese Unnerschrift in de Datenbank funnen
+error.not_signed_commit = Kommitteren is nich unnerschrieven
+error.failed_retrieval_gpg_keys = Kunn keenen Slötel halen, wat mit de Konto vum Kommitterer verbunnen is
+error.probable_bad_signature = WAHRSCHAU! Ofschoonst een Slötel mit deeser ID in de Datenbank is, wiest dat deeses Kommitteren nich ut! Deeses Kommitteren is VERDÄCHTIG.
+error.probable_bad_default_signature = WAHRSCHAU! Ofschoonst de normaal-Slötel deese ID hett, wiest dat deeses Kommitteren nich ut! Deeses Kommitteren is VERDÄCHTIG.
+
+[install]
+install = Installeren
+title = Eerstinrichten
+docker_helper = Wenn du Forgejo in Docker utföhrst, lees bidde de Dokumenteren, ehr du eets Instellens ännerst.
+require_db_desc = Forgejo bruukt MySQL, PostgreSQL, SQLite3 of TiDB (MySQL-Protokoll).
+db_title = Datenbank-Instellens
+db_type = Datenbank-Aard
+host = Host
+user = Brukernaam
+password = Passwoord
+db_name = Datenbank-Naam
+db_schema = Schema
+db_schema_helper = Leeg laten, um de Normaalweert för de Datenbank to bruken (»public«).
+path = Padd
+reinstall_error = Du versöchst, in eene bestahn Forgejo-Datenbank to installeren
+reinstall_confirm_check_2 = De Repositoriums un Instellens mutten villicht verneeit worden. Indeem du deese Kist utköörst, stimmst du to, dat du de Hakens för de Repositoriums un de authorized_keys-Datei vun Hand vernejen worst. Du wiest ut, dat du wiss maken worst, dat de Repositoriums- un Spegel-Instellens all recht sünd.
+err_empty_db_path = De SQLite3-Datenbank-Padd kann nich leeg wesen.
+no_admin_and_disable_registration = Du kannst Bruker-Sülvst-Registreren nich utknipsen, sünner eerst een Chef-Konto to maken.
+err_empty_admin_password = Dat Chef-Passwoord kann nich leeg wesen.
+err_empty_admin_email = De Chef-E-Mail-Adress kann nich leeg wesen.
+err_admin_name_is_reserved = Chef-Brukernaam is ungültig, Brukernaam is vörbehollen
+general_title = Allgemeene Instellens
+app_name = Instanz-Titel
+app_slogan = Instanz-Motto
+repo_path = Repositoriums-Ruut-Padd
+lfs_path = Git-LFS-Ruut-Padd
+lfs_path_helper = Dateien, wat vun Git LFS verfolgt worden, worden in deesem Verteeknis sekert. Leeg laten, um dat uttoknipsen.
+run_user = Bruker för ’t Utföhren
+domain = Server-Domään
+domain_helper = Domään of Hostadress för de Server.
+ssh_port = SSH-Server-Poort
+http_port = HTTP-Tohören-Poort
+http_port_helper = Poort-Tahl, wat de Forgejo-Internett-Server bruken word.
+ssh_port_helper = Poort-Tahl, wat de SSH-Server bruken word. Leeg laten, um de SSH-Server uttoknipsen.
+log_root_path = Utgaav-Padd
+log_root_path_helper = Utgaav-Dateien worden in deeses Verteeknis schreven.
+email_title = E-Mail-Instellens
+smtp_addr = SMTP-Host
+smtp_port = SMP-Poort
+smtp_from = E-Mail sennen as
+smtp_from_invalid = De »E-Mail sennen as«-Adress is ungültig
+smtp_from_helper = E-Mail-Adress, wat Forgejo bruken word. Giff eene slichte E-Mail-Adress in of bruuk dat Formaat »"Naam" «.
+mailer_user = SMTP-Brukernaam
+mailer_password = SMTP-Passwoord
+register_confirm = E-Mail-Utwiesen bi’m Registreren verlangen
+mail_notify = E-Mail-Narichtens anknipsen
+server_service_title = Instellens för de Server un Frömdanbeder-Deensten
+offline_mode = Stedenwies Modus anknipsen
+disable_gravatar = Gravatar utknipsen
+federated_avatar_lookup = Verdeelte Kontobillers anknipsen
+federated_avatar_lookup.description = Kontobillers över Libravatar söken.
+disable_registration = Sülvst-Registreren utknipsen
+disable_registration.description = Blots Instanz-Chefs könen neje Brukerkonten maken. Dat word nödig anraden, dat Registreren uttoknipsen, wenn du nich vörhest, eene publike Instanz för alle Lüü to hosten un paraat büst, mit mennig Oolkert-Konten klaartoworden.
+allow_only_external_registration = Registreren blots över frömde Deenste verlöven
+allow_only_external_registration.description = Brukers könen neje Konten blots över inricht frömde Deensten maken.
+openid_signin.description = Brukers verlöven, sik över OpenID antomellen.
+openid_signup.description = Brukers verlöven, Konten över OpenID to maken, wenn Sülvst-Registreren anknipst is.
+enable_captcha = CAPTCHA bi’m Registreren anknipsen
+require_sign_in_view = Anmellen verlangen, um Instanz-Inholl to wiesen
+default_keep_email_private = E-Mail-Adressen normaal verbargen
+default_keep_email_private.description = Dat Verbargen vun de E-Mail-Adress för neje Brukers anknipsen, sodat deese Informatioon na de Registreren nich stracks dörsickert.
+default_enable_timetracking = Tied-Erfaten normaal anknipsen
+default_enable_timetracking.description = Nejen Repositoriums stracks verlöven, Tied-Erfatens to bruken.
+admin_title = Chefkonto-Instellens
+admin_setting.description = Du mutts nich vun Nood een Chefkonto inrichten. De eerste registreert Bruker word automatisk een Chef.
+admin_name = Chef-Brukernaam
+admin_password = Passwoord
+confirm_password = Passwoord utwiesen
+install_btn_confirm = Forgejo installeren
+invalid_db_setting = De Datenbank-Instellens sünd ungültig: %v
+invalid_db_table = De Datenbank-Tabell »%s« is ungültig: %v
+invalid_repo_path = De Repositoriums-Ruut-Padd is ungültig: %v
+invalid_app_data_path = De Programm-Daten-Padd is ungültig: %v
+run_user_not_match = De »Bruker för ’t Utföhren«-Brukernaam is nich de stedenwies Brukernaam: %s → %s
+internal_token_failed = Kunn binneres Teken nich maken: %v
+secret_key_failed = Kunn geheemen Slötel nich maken: %v
+err_admin_name_pattern_not_allowed = Chef-Brukernaam is ungültig, de Brukernaam passt up een vörbehollen Muster
+run_user_helper = De Bedrievssysteem-Brukernaam, as wat Forgejo löppt. Wees wiss, dat deeser Bruker Togriep to de Repositoriums-Ruut-Padd hebben mutt.
+optional_title = Nich nödige Instellens
+openid_signin = OpenID-Anmellen anknipsen
+openid_signup = OpenID-Sülvst-Registreren anknipsen
+save_config_failed = Kunn Inrichten nich sekern: %v
+enable_update_checker_helper_forgejo = Dat söcht alltied weer na nejen Forgejo-Versioonen, indeem een TXT-DNS-Upteken unner release.forgejo.org ankiekt word.
+app_slogan_helper = Giff hier dat Motto för diene Instanz in. Leeg laten, um dat uttoknipsen.
+ssl_mode = SSL
+reinstall_confirm_message = Neei-installeren mit eener bestahn Forgejo-Datenbank kann mennig Problemen geven. Meesttiedens is dat beter, du bruukst diene bestahn »app.ini«, um Forgejo uttoföhren. Wenn du weetst, wat do doost, wies dat hier ut:
+sqlite_helper = Dateipadd för de SQLite3-Datenbank.
Giff eenen absoluuten Padd in, wenn du Forgejo as Deenst utföhrst.
+reinstall_confirm_check_1 = De Daten, wat vun de SECRET_KEY in app.ini verslötelt sünd, könen verloren gahn: Brukes könen sik villicht nich mehr mit 2FA/OTP anmellen un Spegels sün villicht kaputt. Wenn du deese Kist utköörst, stimmst du to, dat de stedenwies app.ini de rechten SECRET_KEY enthollt.
+repo_path_helper = Frömde Git-Repositoriums worden in deesem Verteeknis sekert.
+offline_mode.description = Frömdanbeder-Inholls-Levern-Nettwarken utknipsen un all Objekten stedenwies levern.
+require_sign_in_view.description = Blots anmellt Brukers verlöven Togriep to eets Inhollen verlöven. Gasten könen nix as de Anmell-Sieden sehn.
+default_allow_create_organization = Normaal verlöven, Verenigungen to maken
+default_allow_create_organization.description = Nejen Brukers stracks verlöven, Verenigungen to maken. Wenn deese Instellen utknipst is, mutt een Chef nejen Brukers eerst dat Recht geven, Verenigungen to maken.
+config_location_hint = Deese Inricht-Instellens worden sekert in:
+reinstall_confirm_check_3 = Du wiest ut, dat du heel un dall wiss büst, dat Forgejo mit de rechten app.ini-Stee löppt un dat du wiss büst, dat du würrelk neei installeren muttst. Du wiest ut, dat du de Gefahren boven annimmst.
+err_admin_name_is_invalid = Chef-Brukernaam is ungültig
+app_name_helper = Giff hier dienen Instanz-Naam in. Dat word up elkeen Sied wiest.
+disable_gravatar.description = Gravatar un anner Frömdanbeder-Kontobill-Quellen utknipsen. Dat Normaalbill word för Bruker-Kontobillers bruukt, wenn se nich hör eegen Kontobill to de Instanz upladen.
+test_git_failed = Kunn »git«-Befehl nich testen: %v
+sqlite3_not_available = Deese Forgejo-Versioon unnerstütt SQLite3 nich. Bidde laad de offizielle Binäärversioon vun %s runner (nich de »gobuild«-Versioon).
+app_url = Grund-URL
+app_url_helper = Grund-Adress för HTTP(S)-Kloon-URLs un E-Mail-Narichtens.
+enable_captcha.description = Verlangen, dat Brukers een CAPTCHA ofsluten, um Konten to maken.
+admin_email = E-Mail-Adress
+allow_dots_in_usernames = Brukers verlöven, Punkten in hör Brukernamen to bruken. Ännert nix an bestahn Konten.
+no_reply_address = Verburgen E-Mail-Domään
+no_reply_address_helper = Domään-Naam för Brukers mit eener verburgen E-Mail-Adrees. To’n Bispööl word de Brukernaam »fiete« in Git as »fiete@noreply.example.org« vermarkt, wenn de verbargen E-Mail-Domään as »noreply.example.org« sett is.
+invalid_admin_setting = Chefkonto-Instellen is ungültig: %v
+invalid_log_root_path = De Utgaav-Padd is ungültig: %v
+password_algorithm = Passwoord-Prüfsumm-Funktioon
+enable_update_checker = Vernejens-Nakieker anknipsen
+env_config_keys = Umgevens-Inrichten
+env_config_keys_prompt = Deese Umgevens-Variaabeln worden ok up diene Instellens-Datei anwennt:
+password_algorithm_helper = Sett de Passwoord-Prüfsumm-Funktioon. Funktioonen hebben verscheden Vörutsettens un Starkden. De argon2-Funktioon is bannig seker, aver se bruukt mennig Spieker un is för lütte Systeemen villicht nich gadelk.
+invalid_password_algorithm = Ungültige Passwoord-Prüfsumm-Funktioon
+
+[units]
+unit = Eenheid
+error.no_unit_allowed_repo = Du hest nich dat Recht, to elkeen Deel vun deesem Repositorium totogriepen.
+error.unit_not_allowed = Du hest nich dat Recht, up deese Deel vum Repositorium totogriepen.
+
+[packages]
+title = Paketen
+desc = Repositorium-Paketen verwalten.
+empty = Dat gifft noch keene Paketen.
+filter.type = Aard
+filter.type.all = All
+filter.container.tagged = Markt
+filter.container.untagged = Nich markt
+published_by = %[1]s vun %[3]s publizeert
+installation = Installeren
+about = Över deeses Paket
+requirements = Bruukt
+dependencies = Ofhangens
+keywords = Slötelwoorden
+details = Mehr Informatioonen
+details.author = Author
+details.project_site = Projekt-Internett-Sied
+details.repository_site = Repositoriums-Internett-Sied
+details.documentation_site = Dokumenterens-Internett-Sied
+details.license = Lizenz
+assets = Objekten
+versions = Versioonen
+versions.view_all = All wiesen
+dependency.id = ID
+dependency.version = Versioon
+alpine.registry.info = Köör $branch un $repository ut de List unnern ut.
+alpine.repository = Repositoriums-Informatioon
+alpine.repository.branches = Twiegen
+alpine.repository.repositories = Repositoriums
+arch.version.properties = Versioon-Eegenskuppen
+arch.version.provides = Stellt paraat
+arch.version.groups = Grupp
+arch.version.depends = Hangt of vun
+arch.version.optdepends = Hangt nich nödig of vun
+arch.version.makedepends = Bau-Ofhangens
+arch.version.checkdepends = Överprüfens-Ofhangens
+arch.version.conflicts = Unverdragelkheiden
+arch.version.replaces = Staht liek för
+composer.dependencies = Ofhangens
+composer.dependencies.development = Entwicklens-Ofhangens
+conan.details.repository = Repositorium
+container.labels = Vermarkens
+container.labels.key = Slötel
+container.labels.value = Weert
+cran.install = Um dat Paket to installeren, föhr deese Oorder ut:
+debian.install = Um dat Paket to installeren, föhr deese Oorder ut:
+debian.repository = Repositoriums-Informatioon
+debian.repository.distributions = Verdeelens
+debian.repository.components = Delen
+debian.repository.architectures = Architekturen
+helm.install = Um dat Paket to installeren, föhr deese Oorder ut:
+npm.dependencies.development = Entwicklens-Ofhangens
+npm.dependencies.bundle = Mitbrocht Ofhangens
+npm.dependencies.peer = Maten-Ofhangens
+npm.dependencies.optional = Nich nödige Ofhangens
+npm.details.tag = Mark
+pypi.requires = Bruukt Python
+rpm.repository = Repositoriums-Informatioon
+rpm.repository.architectures = Architekturen
+rubygems.dependencies.runtime = Looptied-Ofhangens
+rubygems.dependencies.development = Entwicklens-Ofhangens
+rubygems.required.ruby = Bruukt Ruby-Versioon
+rubygems.required.rubygems = Bruukt RubyGem-Versioon
+swift.install2 = un föhr deese Oorder ut:
+settings.link.description = Wenn du een Paket mit eenem Repositorium verbinnst, word dat Paket in de Paketlist vum Repositorium wiest.
+settings.link.select = Repositorium utkören
+settings.link.error = Kunn de Repositoriums-Verwies nich vernejen.
+settings.delete = Paket lösken
+settings.delete.description = Een Paket to lösken is för all Tieden un kann nich torüggnohmen worden.
+settings.delete.success = Dat Paket is lösket worden.
+settings.delete.error = Kunn dat Paket nich lösken.
+owner.settings.cargo.initialize = Index inrichten
+owner.settings.cargo.initialize.error = Kunn Cargo-Index nich inrichten: %v
+owner.settings.cargo.initialize.success = De Cargo-Index is inricht worden.
+owner.settings.cargo.rebuild = Index neei bauen
+owner.settings.cargo.rebuild.error = Kunn Cargo-Index nich neei bauen: %v
+owner.settings.cargo.rebuild.success = De Cargo-Index is neei baut worden.
+owner.settings.cleanuprules.title = Schoonmakens-Örders
+owner.settings.cleanuprules.add = Schoonmakens-Örder hentofögen
+owner.settings.cleanuprules.edit = Schoonmakens-Örder bewarken
+owner.settings.cleanuprules.none = Dat gifft noch keene Schoonmakens-Örders.
+owner.settings.cleanuprules.preview = Schoonmakens-Örder-Vörschau
+owner.settings.cleanuprules.preview.none = Schoonmakens-Örder passt up keene Paketen.
+owner.settings.cleanuprules.enabled = Anknipst
+owner.settings.cleanuprules.pattern_full_match = Muster up de kumplete Paketnaam anwennen
+owner.settings.cleanuprules.keep.count = De neeiste behollen
+owner.settings.cleanuprules.keep.count.1 = 1 Versioon pro Paket
+owner.settings.cleanuprules.keep.count.n = %d Versioonen pro Paket
+owner.settings.cleanuprules.keep.pattern = Versioonen behollen, wat passen
+owner.settings.cleanuprules.remove.title = Versioonen, wat up deese Örders passen, worden lösket, wenn dat keene Örder boven gifft, wat seggt, dat se behollt worden mutten.
+owner.settings.cleanuprules.remove.days = Versioonen oller as dat lösken
+owner.settings.cleanuprules.remove.pattern = Versioonen lösken, wat passen
+owner.settings.cleanuprules.success.update = Schoonmakens-Örder is verneeit worden.
+filter.no_result = Dien Filter gifft keene Resultaten.
+alpine.repository.architectures = Architekturen
+settings.link.button = Repositoriums-Verwies vernejen
+alpine.install = Um dat Paket to installeren, föhr deese Oorder ut:
+arch.version.description = Beschrieven
+published_by_in = %[1]s vun %[3]s in %[5]s publizeert
+settings.link.success = Repositoriums-Verwies is verneeit worden.
+settings.delete.notice = Du willst %s (%s) lösken. Dat kann nich torüggnohmen worden, willst du dat würrelk?
+owner.settings.cleanuprules.preview.overview = %d Paketen sünd tum Lösken vörmarkt.
+owner.settings.cleanuprules.success.delete = Schoonmakens-Örder is wegdaan worden.
+owner.settings.cargo.rebuild.no_index = Kann nich neei bauen, keen Index is inricht.
+npm.dependencies = Ofhangens
+rpm.install = Um dat Paket to installeren, föhr deese Oorder ut:
+settings.link = Verbinn deeses Paket mit eenem Repositorium
+owner.settings.cleanuprules.keep.title = Versioonen, wat up deese Örders passen, worden behollt, ok wenn se up eene Löskens-Örder unnern passen.
+empty.documentation = För mehr Informationen över de Paketlist, kiek de Dokumenteren an.
+empty.repo = Hest du een Paket upladen, aver dat word hier nich wiest? Gah to de Paket-Instellens un verbinn dat mit deesem Repo.
+registry.documentation = För mehr Informationen över de %s-Paketlist, kiek de Dokumenteren an.
+alpine.registry = Richt deese Paketlist in, indeem du de URL in diene /etc/apk/repositories-Datei inföögst:
+alpine.registry.key = Laad de publiken RSA-Slötel vun de Paketlist in dat Verteeknis /etc/apk/keys/ runner, um de Index-Unnerschrift uttowiesen:
+arch.pacman.helper.gpg = Föög dat Vertroens-Zertifikaat för Pacman hento:
+arch.pacman.repo.multi = %s hett in mennig Verdeelens de sülve Versioon.
+arch.pacman.repo.multi.item = Inrichten för %s
+arch.pacman.conf = Föög de Server mit de verwandt Verdeelen un Architektuur to de /etc/pacman.conf hento:
+arch.pacman.sync = Verneei dat Paket mit Pacman:
+arch.version.backup = Sekerheids-Kopie
+cargo.registry = Richt deese Paketlist in de Cargo-Instellens-Datei in (to’n Bispööl ~/.cargo/config.toml):
+cargo.install = Um dat Paket mit Cargo to installeren, föhr deese Oorder ut:
+chef.install = Um dat Paket to installeren, föhr deese Oorder ut:
+chef.registry = Richt deese Paketlist in diener ~/.chef/config.rb-Datei in:
+composer.registry = Richt deese Paketlist in diener ~/.composer/config.json-Datei in:
+conan.registry = Richt deese Paketlist vun de Oorderreeg in:
+conda.registry = Richt deese Paketlist as een Conda-Repositorium in diener ~/.condarc-Datei in:
+composer.install = Um dat Paket mit Composer to installeren, föhr deese Oorder ut:
+conda.install = Um dat Paket mit Conda to installeren, föhr deese Oorder ut:
+container.details.type = Avbill-Aard
+container.details.platform = Plattfoorm
+container.pull = Haal deeses Avbill vun de Oorderreeg:
+container.digest = Prüüfsumm:
+container.multi_arch = BS / Arch
+container.layers = Avbill-Schichten
+cran.registry = Richt deese Paketlist in diener Rprofile.site-Datei in:
+debian.registry = Richt deese Paketlist vun de Oorderreeg in:
+debian.registry.info = Köör $distribution un $component ut de unnern List ut.
+generic.download = Laad deeses Paket vun de Oorderreeg runner:
+go.install = Installeer dat Paket vun de Oorderreeg:
+helm.registry = Richt deese Paketlist vun de Oorderreeg in:
+maven.registry = Richt deese Paketlist in diener pom.xml-Datei in:
+maven.install2 = Vun de Oorderreeg utföhren:
+maven.download = Um de Ofhangen runnertoladen, föhr in de Oorderreeg ut:
+nuget.registry = Richt deese Paketlist vun de Oorderreeg in:
+nuget.install = Um dat Paket mit NuGet to installeren, föhr deese Oorder ut:
+nuget.dependency.framework = Enn-Rahmwark
+npm.registry = Richt deese Paketlist in de .npmrc-Datei vun dienem Projekt in:
+maven.install = Um dat Paket to bruken, giff in de dependencies-Deel vun de pom.xml-Datei dat an:
+npm.install = Um dat Paket mit npm to installeren, föhr deese Oorder ut:
+npm.install2 = of föög dat to de »package.json«-Datei hento:
+pub.install = Um dat Paket mit Dart to installeren, föhr deese Oorder ut:
+pypi.install = Um dat Paket mit pip to installeren, föhr deese Oorder ut:
+rpm.registry = Richt deese Paketlist vun de Oorderreeg in:
+rpm.distros.redhat = Up Verdeelens mit RedHat as Grundlaag
+rpm.distros.suse = Up Verdeelens mit SUSE as Grundlaag
+rpm.repository.multiple_groups = Deeses Paket is in mennig Gruppen verföögbaar.
+rubygems.install = Um dat Paket mit gem to installeren, föhr deese Oorder ut:
+rubygems.install2 = of föög dat to de »Gemfile«-Datei hento:
+swift.registry = Richt deese Paketlist vun de Oorderreeg in:
+swift.install = Föög dat Paket in diener Package.swift-Datei hento:
+vagrant.install = Um eene Vagrant-Kist hentotofögen, föhr deese Oorder ut:
+owner.settings.cargo.title = Cargo-Paketlist-Index
+owner.settings.cargo.initialize.description = Een besünners Index-Git-Repositorium is nödig, um de Cargo-Paketlist to bruken. Deese Instellen word dat Repositorium (neei) maken un automatisk inrichten.
+owner.settings.cargo.rebuild.description = Neeibauen kann nüttelk wesen, wenn de Index nich to de lagert Cargo-Paketen passt.
+owner.settings.cleanuprules.keep.pattern.container = De latest-Versioon word för Behälter-Paketen alltieden behollen.
+owner.settings.chef.title = Chef-Paketlist
+owner.settings.chef.keypair = Slötelpaar maken
+owner.settings.chef.keypair.description = Een Slötelpaar is nödig, um sik bi de Chef-Paketlist antomellen. Wenn du al een Slötelpaar maakt hest, word dat olle Slötelpaar wegdaan, wenn du een nejes Slötelpaar maakst.
+conan.install = Um dat Paket mit Conan to installeren, föhr deese Oorder ut:
+
+[secrets]
+secrets = Geheimnissen
+description = Geheimnissen worden an wisse Aktioonen övergeven un könen anners nich lesen worden.
+none = Dat gifft noch keene Geheimnissen.
+creation = Geheimnis hentofögen
+creation.success = Dat Geheimnis »%s« is hentoföögt worden.
+creation.failed = Kunn Geheimnis nich hentofögen.
+deletion = Geheimnis wegdoon
+deletion.success = Dat Geheimnis is wegdaan worden.
+deletion.failed = Kunn Geheimnis nich wegdoon.
+management = Geheimnissen verwalten
+creation.value_placeholder = Giff elkeen Inholl in. Leegtekens am Begünn un Enn word ofsneden.
+deletion.description = Een Geheimnis wegtodoon is för all Tieden un kann nich torüggnohmen worden. Wiedermaken?
+creation.name_placeholder = Blots alphanumerisk Boostavens (dat word nich tüsken Groot- un Kleenbookstavens unnerscheden) un Unnerstrekens; kann nich mit GITEA_ of GITHUB_ begünnen
+
+[actions]
+actions = Aktioonen
+status.unknown = Unbekannt
+status.waiting = Wacht
+status.running = Löppt
+status.success = Daankregen
+status.failure = Fehlslagen
+status.cancelled = Ofbroken
+status.skipped = Översprungen
+runners = Lopers
+runners.runner_manage_panel = Lopers verwalten
+runners.new = Nejen Loper maken
+runners.new_notice = Wo man eenen Loper start
+runners.status = Tostand
+runners.id = ID
+runners.name = Naam
+runners.owner_type = Aard
+runners.description = Beschrieven
+runners.labels = Vermarkens
+runners.runner_title = Loper
+runners.task_list = Leste Upgaven up deesem Loper
+runners.task_list.no_tasks = Dat gifft noch keene Upgaav.
+runners.task_list.run = Utföhren
+runners.task_list.status = Tostand
+runners.task_list.repository = Repositorium
+runners.task_list.commit = Kommitteren
+runners.task_list.done_at = Daan um
+runners.edit_runner = Loper bewarken
+runners.update_runner_success = Loper verneeit
+runners.update_runner_failed = Kunn Loper nich vernejen
+runners.delete_runner = Deesen Loper wegdoon
+runners.delete_runner_success = Loper wegdaan
+runners.delete_runner_failed = Kunn Loper nich wegdoon
+runners.delete_runner_header = Wies ut, dat du deesen Loper wegdoon willst
+runners.none = Keene Lopers verföögbaar
+runners.status.unspecified = Unbekannt
+runners.status.idle = Nix to doon
+runners.status.active = Aktiiv
+runners.status.offline = Nich verbunnen
+runners.version = Versioon
+runners.reset_registration_token = Registrerens-Teken torüggsetten
+runners.reset_registration_token_success = Loper-Registrerens-Teken torüggsett
+runs.all_workflows = All Warkwiesen
+runs.commit = Kommitteren
+runs.scheduled = Na Tiedplaan
+runs.pushed_by = schuven vun
+runs.workflow = Warkwies
+runs.invalid_workflow_helper = Warkwies-Instellens-Datei is ungültig. Bidde kiek diene Instellens-Datei na: %s
+runs.no_matching_online_runner_helper = Keen verbunnen Loper, wat passt, mit de Vermark funnen: %s
+runs.no_job = De Warkwies mutt tominnst eene Upgaav enthollen
+runs.actor = Aktöör
+runs.status = Tostand
+runs.actors_no_select = All Aktören
+runs.status_no_select = All Tostanden
+runs.no_results = Keene Resultaten passen.
+runs.no_workflows = Dat gifft noch keene Warkwiesens.
+runs.no_runs = Deese Warkwies is noch nich utföhrt worden.
+runs.empty_commit_message = (lege Kommitterens-Naricht)
+runs.expire_log_message = Utgaav is wegdaan worden, denn se weer to oll.
+workflow.enable = Warkwies anknipsen
+workflow.enable_success = Warkwies »%s« is anknipst worden.
+workflow.disabled = Warkwies is utknipst.
+workflow.dispatch.trigger_found = Deese Warkwies hett eenen workflow_dispatch-Vörfall-Utlööser.
+workflow.dispatch.use_from = Warkwies bruken vun
+workflow.dispatch.run = Warkwies utföhren
+workflow.dispatch.input_required = Weert för Ingaav »%s« nödig.
+workflow.dispatch.invalid_input_type = Ungültige Ingaav-Aard »%s«.
+workflow.dispatch.warn_input_limit = Blots de eersten %d Ingaven worden wiesen.
+need_approval_desc = Warkwiesen vun eenem Haalvörslag ut eener Gabel mutten eerst tostimmt worden.
+variables = Variaabeln
+variables.management = Variaabeln verwalten
+variables.none = Dat gifft noch keene Variaabeln.
+variables.deletion = Variaabel wegdoon
+variables.description = Variaabeln worden an wisse Aktioonen övergeven un könen anners nich lesen worden.
+variables.id_not_exist = Variaabel mit ID %d gifft dat nich.
+variables.edit = Variaabel bewarken
+variables.deletion.failed = Kunn Variaabel nich wegdoon.
+variables.deletion.success = De Variaabel is wegdaan worden.
+variables.creation.failed = Kunn Variaabel nich hentofögen.
+variables.creation.success = De Variaabel »%s« is hentoföögt worden.
+variables.update.success = De Variaabel is bewarkt worden.
+workflow.disable = Warkwies utknipsen
+variables.creation = Variaabel hentofögen
+variables.update.failed = Kunn Variaabel nich bewarken.
+status.blocked = Blockeert
+runners.delete_runner_notice = Wenn eene Upgaav up deesem Loper löppt, word se ofbroken un as fehlslagen markeert. Dat kann Bau-Warkwiesen stören.
+runners.last_online = Tolest verbunnen
+runners.update_runner = Ännerns vernejen
+workflow.disable_success = Warkwies »%s« is utknipst worden.
+runs.no_job_without_needs = De Warkwies mutt tominnst eene Upgaav sünner Ofhangen enthollen.
+workflow.dispatch.success = Warkwies-Utföhren is vörmarkt worden.
+variables.deletion.description = Eene Variaabel wegtodoon is för all Tieden un kann nich torüggnohmen worden. Wiedermaken?
+unit.desc = Verwalt integreerte CI-/CD-Affolgens mit Forgejo-Aktioonen.
+runs.no_workflows.quick_start = Weetst du nich, wo man mit Forgejo-Aktioonen begünnt? Kiek de fixe Inföhren an.
+runs.no_workflows.documentation = För mehr Informationen över Forgejo-Aktioonen, kiek de Dokumenteren an.
+
+[projects]
+deleted.display_name = Lösket Projekt
+type-1.display_name = Enkelt Projekt
+type-2.display_name = Repositoriums-Projekt
+type-3.display_name = Verenigungs-Projekt
+
+[git.filemode]
+changed_filemode = %[1]s → %[2]s
+directory = Verteeknis
+normal_file = Normaale Datei
+executable_file = Utföhrbaare Datei
+symbolic_link = Symbolisk Verwies
+submodule = Unnermoduul
+
+[markup]
+filepreview.lines = Riegen %[1]d bit %[2]d in %[3]s
+filepreview.truncated = Vörschau is ofsneden worden
+filepreview.line = Rieg %[1]d in %[2]s
+
+[translation_meta]
+test = Moin!
\ No newline at end of file
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
index 4f21d812da..99269c3ff0 100644
--- a/options/locale/locale_pt-BR.ini
+++ b/options/locale/locale_pt-BR.ini
@@ -4,7 +4,7 @@ dashboard=Painel
 explore=Explorar
 help=Ajuda
 logo=Logotipo
-sign_in=Entrar
+sign_in=Iniciar sessão
 sign_in_with_provider=Entrar com %s
 sign_in_or=ou
 sign_out=Sair
@@ -12,7 +12,7 @@ sign_up=Cadastrar
 link_account=Vincular conta
 register=Cadastrar
 version=Versão
-powered_by=Desenvolvido por %s
+powered_by=Oferecido por %s
 page=Página
 template=Template
 language=Idioma
@@ -33,7 +33,7 @@ access_token=Token de acesso
 re_type=Confirmar senha
 captcha=CAPTCHA
 twofa=Autenticação de dois fatores
-twofa_scratch=Código de backup da autenticação de dois fatores
+twofa_scratch=Código de uso único da autenticação de dois fatores
 passcode=Senha
 
 webauthn_insert_key=Insira sua chave de segurança
@@ -61,7 +61,7 @@ new_org=Nova organização
 new_project=Novo projeto
 new_project_column=Nova coluna
 manage_org=Gerenciar organizações
-admin_panel=Administração geral
+admin_panel=Administração do site
 account_settings=Configurações da conta
 settings=Configurações
 your_profile=Perfil
@@ -76,7 +76,7 @@ forks=Forks
 
 activities=Atividades
 pull_requests=Pull requests
-issues=Issues
+issues=Problemas
 milestones=Marcos
 
 ok=OK
@@ -496,7 +496,7 @@ activate_email.text=Por favor clique no link a seguir para verificar o seu ender
 register_notify=Boas vindas a %s
 register_notify.title=%[1]s, bem-vindo(a) a %[2]s
 register_notify.text_1=este é o seu e-mail de confirmação de registro para %s!
-register_notify.text_2=Você pode fazer login em sua conta utilizando o usuário: %s
+register_notify.text_2=Você pode iniciar a sessão com o usuário: %s
 register_notify.text_3=Se outra pessoa criou esta conta para você, é preciso definir a sua senha primeiro.
 
 reset_password=Recuperar sua conta
@@ -706,7 +706,7 @@ follow_blocked_user = Você não pode seguir este usuário porque você o bloque
 block_user.detail_3 = Vocês não poderão adicionar um ao outro como colaboradores de um repositório.
 block_user.detail = Note que bloquear um usuário tem outros efeitos, tais como:
 followers_one = %d seguidor
-following_one = %d seguindo
+following_one = seguindo %d
 block_user.detail_1 = Vocês deixarão de seguir um ao outro e não poderão mais seguir um ao outro.
 following.title.few = seguindo
 following.title.one = seguindo
@@ -2820,8 +2820,8 @@ release.asset_name = Nome do Recurso
 release.asset_external_url = URL Externa
 release.hide_archive_links_helper = Esconder automaticamente arquivos de código fonte gerados para esse release. Por exemplo, se você estiver enviando os seus manualmente.
 branch.delete_desc = Apagar um branch é permanente. Ainda que o branch apagado possa continuar a existir por um breve período antes de ser realmente apagado, isso NÃO PODE ser desfeito na maioria dos casos. Continuar?
-release.add_external_asset = Adicionar Recurso Externo
-release.invalid_external_url = URL Externa Inválida: "%s"
+release.add_external_asset = Adicionar componente externo
+release.invalid_external_url = URL externo inválido: "%s"
 release.deletion_desc = Eliminar um release apenas o remove do Forgejo. Isso não irá afetar a tag no Git, o conteúdo do seu repositório ou o histórico. Continuar?
 issues.all_title = Tudo
 issues.new.assign_to_me = Designar a mim
@@ -2904,7 +2904,7 @@ teams.leave.detail=Você tem certeza que quer sair da equipe "%s"?
 teams.can_create_org_repo=Criar repositórios
 teams.can_create_org_repo_helper=Membros podem criar novos repositórios na organização. O criador terá acesso administrativo ao novo repositório.
 teams.none_access=Sem acesso
-teams.none_access_helper=Os membros não podem ver ou fazer qualquer outra ação nesta unidade.
+teams.none_access_helper=A opção "sem acesso" só tem efeito em repositórios privados.
 teams.general_access=Acesso personalizado
 teams.general_access_helper=As permissões dos membros serão decididas pela tabela de permissões abaixo.
 teams.read_access=Leitura
@@ -2927,7 +2927,7 @@ teams.delete_team_desc=A exclusão de uma equipe revoga o acesso ao repositório
 teams.delete_team_success=A equipe foi excluída.
 teams.read_permission_desc=Essa equipe concede acesso para Leitura: membros podem ver e clonar os repositórios da equipe.
 teams.write_permission_desc=Esta equipe concede acesso para escrita: Membros podem ler e fazer push para os repositórios da equipe.
-teams.admin_permission_desc=Esta equipe concede acesso de Administrador: Membros podem ler, fazer push e adicionar outros colaboradores para os repositórios da equipe.
+teams.admin_permission_desc=Esta equipe concede acesso de Administrador: membros podem ler, fazer push e adicionar outros colaboradores em repositórios da equipe.
 teams.create_repo_permission_desc=Além disso, esta equipe concede permissão de Criar repositório: membros podem criar novos repositórios na organização.
 teams.repositories=Repositórios da equipe
 teams.search_repo_placeholder=Pesquisar repositório...
@@ -2935,7 +2935,7 @@ teams.remove_all_repos_title=Remover todos os repositórios da equipe
 teams.remove_all_repos_desc=Isto irá remover todos os repositórios da equipe.
 teams.add_all_repos_title=Adicionar todos os repositórios
 teams.add_all_repos_desc=Isto irá adicionar todos os repositórios da organização à equipe.
-teams.add_nonexistent_repo=O repositório que você está tentando adicionar não existe. Crie-o antes de adicioná-lo.
+teams.add_nonexistent_repo=O repositório que você está tentando adicionar não existe, por favor crie-o primeiro.
 teams.add_duplicate_users=Usuário já é um membro da equipe.
 teams.repos.none=Nenhum repositório pode ser acessado por essa equipe.
 teams.members.none=Nenhum membro nesta equipe.
@@ -3003,9 +3003,9 @@ dashboard.archive_cleanup=Apagar arquivos antigos de repositório
 dashboard.deleted_branches_cleanup=Realizar limpeza de branches apagados
 dashboard.update_migration_poster_id=Sincronizar os IDs do remetente da migração
 dashboard.git_gc_repos=Coleta de lixo em todos os repositórios
-dashboard.resync_all_sshkeys=Atualizar o arquivo '.ssh/authorized_keys' com as chaves SSH do Forgejo.
-dashboard.resync_all_sshprincipals=Atualizar o arquivo '.ssh/authorized_principals' com os diretores do Forgejo SSH.
-dashboard.resync_all_hooks=Ressincronizar hooks pre-receive, update e post-receive de todos os repositórios.
+dashboard.resync_all_sshkeys=Atualizar o arquivo ".ssh/authorized_keys" com as chaves SSH do Forgejo.
+dashboard.resync_all_sshprincipals=Atualizar o arquivo ".ssh/authorized_principals" com os principals SSH do Forgejo.
+dashboard.resync_all_hooks=Ressincronizar hooks pre-receive, update e post-receive de todos os repositórios
 dashboard.reinit_missing_repos=Reinicializar todos os repositórios Git perdidos cujos registros existem
 dashboard.sync_external_users=Sincronizar dados de usuário externo
 dashboard.cleanup_hook_task_table=Limpar tabela hook_task
@@ -3015,40 +3015,40 @@ dashboard.current_goroutine=Goroutines atuais
 dashboard.current_memory_usage=Uso de memória atual
 dashboard.total_memory_allocated=Total de memória alocada
 dashboard.memory_obtained=Memória obtida
-dashboard.pointer_lookup_times=Nº de consultas a ponteiros
+dashboard.pointer_lookup_times=Número de consultas a ponteiros
 dashboard.memory_allocate_times=Alocações de memória
 dashboard.memory_free_times=Liberações de memória
 dashboard.current_heap_usage=Uso atual da heap
 dashboard.heap_memory_obtained=Memória de heap obtida
-dashboard.heap_memory_idle=Memória da heap ociosa
-dashboard.heap_memory_in_use=Memória da heap em uso
-dashboard.heap_memory_released=Memória da heap liberada
+dashboard.heap_memory_idle=Memória de heap ociosa
+dashboard.heap_memory_in_use=Memória de heap em uso
+dashboard.heap_memory_released=Memória de heap liberada
 dashboard.heap_objects=Objetos na heap
 dashboard.bootstrap_stack_usage=Uso de pilha bootstrap
 dashboard.stack_memory_obtained=Memória de pilha obtida
-dashboard.mspan_structures_usage=Uso de estruturas de MSpan
-dashboard.mspan_structures_obtained=Estruturas de MSpan obtidas
-dashboard.mcache_structures_usage=Uso de estruturas de MCache
-dashboard.mcache_structures_obtained=Estruturas de MCache obtidas
-dashboard.profiling_bucket_hash_table_obtained=Perfil obtido da Bucket Hash Table
+dashboard.mspan_structures_usage=Uso de estruturas MSpan
+dashboard.mspan_structures_obtained=Estruturas MSpan obtidas
+dashboard.mcache_structures_usage=Uso de estruturas MCache
+dashboard.mcache_structures_obtained=Estruturas MCache obtidas
+dashboard.profiling_bucket_hash_table_obtained=Hash table de profiling bucket obtida
 dashboard.gc_metadata_obtained=Metadados do GC obtidos
 dashboard.other_system_allocation_obtained=Outra alocação de sistema obtida
 dashboard.next_gc_recycle=Próxima reciclagem do GC
-dashboard.last_gc_time=Desde da ultima vez do GC
+dashboard.last_gc_time=Tempo desde última GC
 dashboard.total_gc_time=Pausa total do GC
-dashboard.total_gc_pause=Pausa total do GC
-dashboard.last_gc_pause=Última pausa do GC
+dashboard.total_gc_pause=Pausa total de GC
+dashboard.last_gc_pause=Última pausa de GC
 dashboard.gc_times=Número de execuções do GC
-dashboard.delete_old_actions=Excluir todas as ações antigas do banco de dados
-dashboard.delete_old_actions.started=A exclusão de todas as ações antigas do banco de dados foi iniciada.
+dashboard.delete_old_actions=Excluir todas as atividades antigas do banco de dados
+dashboard.delete_old_actions.started=A exclusão de todas as atividades antigas do banco de dados foi iniciada.
 dashboard.update_checker=Verificador de atualização
 dashboard.delete_old_system_notices=Excluir todos os avisos de sistema antigos do banco de dados
 dashboard.gc_lfs=Coletar lixos dos meta-objetos LFS
-dashboard.stop_zombie_tasks=Parar tarefas zumbi
-dashboard.stop_endless_tasks=Parar tarefas infinitas
-dashboard.cancel_abandoned_jobs=Cancelar trabalhos abandonados
+dashboard.stop_zombie_tasks=Parar tarefas de actions zumbi
+dashboard.stop_endless_tasks=Parar tarefas infinitas de actions
+dashboard.cancel_abandoned_jobs=Cancelar trabalhos abandonados de actions
 
-users.user_manage_panel=Gerenciamento de conta de usuário
+users.user_manage_panel=Gerenciar contas de usuário
 users.new_account=Criar conta de usuário
 users.name=Nome de usuário
 users.full_name=Nome completo
@@ -3060,8 +3060,8 @@ users.2fa=2FA
 users.repos=Repositórios
 users.created=Criado
 users.last_login=Último acesso
-users.never_login=Nunca acessado
-users.send_register_notify=Enviar notificação de cadastro de usuário
+users.never_login=Nunca entrou
+users.send_register_notify=Notificar sobre cadastros via e-mail
 users.new_success=Usuário "%s" criado.
 users.edit=Editar
 users.auth_source=Fonte de autenticação
@@ -3076,17 +3076,17 @@ users.is_activated=Conta ativada
 users.prohibit_login=Conta suspensa
 users.is_admin=Conta de administrador
 users.is_restricted=Conta restrita
-users.allow_git_hook=Pode criar hooks Git
-users.allow_git_hook_tooltip=Hooks Git são executados como o usuário do SO que executa Forgejo e terá o mesmo nível de acesso ao servidor. Como resultado, os usuários com esse privilégio especial de Hook do Git podem acessar e modificar todos os repositórios do Forgejo, bem como o banco de dados usado pelo Forgejo. Por conseguinte, podem também obter privilégios de administrador do Forgejo.
+users.allow_git_hook=Pode criar hooks do Git
+users.allow_git_hook_tooltip=Hooks do Git são executados como o usuário do SO que executa Forgejo e terão o mesmo nível de acesso ao servidor. Como resultado, usuários com esse privilégio especial de hooks do Git podem acessar e modificar todos os repositórios do Forgejo, bem como o banco de dados usado pelo Forgejo. Por isso, eles também podem obter privilégios de administrador do Forgejo.
 users.allow_import_local=Pode importar repositórios locais
 users.allow_create_organization=Pode criar organizações
 users.update_profile=Atualizar conta de usuário
 users.delete_account=Excluir conta de usuário
-users.cannot_delete_self=Você não pode excluir você mesmo
+users.cannot_delete_self=Você não pode excluir a si mesmo
 users.still_own_repo=Este usuário ainda possui um ou mais repositórios. Exclua ou transfira esses repositórios primeiro.
 users.still_has_org=Este usuário é membro de uma organização. Remova o usuário de qualquer organização primeiro.
 users.purge=Eliminar usuário
-users.purge_help=Exclua forçosamente o usuário e quaisquer repositórios, organizações e pacotes pertencentes ao usuário. Todos os comentários também serão excluídos.
+users.purge_help=Exclua forçosamente o usuário e quaisquer repositórios, organizações e pacotes pertencentes ao usuário. Todos os comentários e issues criados por esse usuário também serão excluídos.
 users.still_own_packages=Este usuário é dono de um ou mais pacotes. Exclua estes pacotes antes de continuar.
 users.deletion_success=A conta de usuário foi excluída.
 users.reset_2fa=Reinicializar 2FA
@@ -3124,7 +3124,7 @@ orgs.new_orga=Nova organização
 
 repos.repo_manage_panel=Gerenciar repositórios
 repos.unadopted=Repositórios não adotados
-repos.unadopted.no_more=Não foram encontrados mais repositórios não adotados
+repos.unadopted.no_more=Não foram encontrados repositórios não adotados
 repos.owner=Proprietário(a)
 repos.name=Nome
 repos.private=Privado
@@ -3178,20 +3178,20 @@ auths.attribute_username_placeholder=Deixe em branco para usar o nome de usuári
 auths.attribute_name=Atributo primeiro nome
 auths.attribute_surname=Atributo sobrenome
 auths.attribute_mail=Atributo e-mail
-auths.attribute_ssh_public_key=Atributo de chave SSH pública
+auths.attribute_ssh_public_key=Atributo chave SSH pública
 auths.attribute_avatar=Atributo avatar
-auths.attributes_in_bind=Buscar os atributos no contexto de Bind DN
+auths.attributes_in_bind=Obter os atributos no contexto de bind DN
 auths.allow_deactivate_all=Permitir que um resultado de pesquisa vazio para desativar todos os usuários
 auths.use_paged_search=Usar pesquisa paginada
 auths.search_page_size=Tamanho da página
 auths.filter=Filtro de usuário
 auths.admin_filter=Filtro de administrador
 auths.restricted_filter=Filtro restrito
-auths.restricted_filter_helper=Deixe em branco para não definir nenhum usuário como restrito. Use um asterisco ('*') para definir todos os usuários que não correspondem ao Filtro de administrador como restritos.
+auths.restricted_filter_helper=Deixe em branco para não definir nenhum usuário como restrito. Use um asterisco ("*") para definir todos os usuários que não correspondem ao filtro Administrador como restritos.
 auths.verify_group_membership=Verificar associação ao grupo no LDAP (deixe o filtro vazio para ignorar)
-auths.group_search_base=Grupo de Pesquisa DN Base
-auths.group_attribute_list_users=Atributo do Grupo que Contém a Lista de Usuários
-auths.user_attribute_in_group=Atributo do Usuário Listado em Grupo
+auths.group_search_base=DN Base para pesquisa de grupos
+auths.group_attribute_list_users=Atributo do grupo que contém a lista de usuário
+auths.user_attribute_in_group=Atributo de usuário listado no grupo
 auths.map_group_to_team=Mapear grupos LDAP para Organizações (deixe o campo vazio para pular)
 auths.map_group_to_team_removal=Remover usuários de equipes sincronizadas se o usuário não pertence ao grupo LDAP correspondente
 auths.enable_ldap_groups=Habilitar grupos LDAP
@@ -3223,14 +3223,14 @@ auths.skip_local_two_fa=Ignorar autenticação em duas etapas local
 auths.skip_local_two_fa_helper=Deixar desligado significa que os usuários locais com 2FA ligada ainda terão que fazer login com 2FA
 auths.oauth2_tenant=Locatário
 auths.oauth2_scopes=Escopos adicionais
-auths.oauth2_required_claim_name=Nome do Claim Obrigatorio
+auths.oauth2_required_claim_name=Nome obrigatório do claim
 auths.oauth2_required_claim_name_helper=Defina este nome para permitir o login desta fonte apenas para usuários que tenham um claim com este nome
-auths.oauth2_required_claim_value=Valor do Claim Obrigatorio
+auths.oauth2_required_claim_value=Valor obrigatório do claim
 auths.oauth2_required_claim_value_helper=Defina este valor para permitir o login desta fonte apenas para usuários que tenham um claim com este nome e valor
 auths.oauth2_group_claim_name=Nome do claim que fornece os nomes dos grupos para esta fonte. (Opcional)
-auths.oauth2_admin_group=Valor do Claim de Grupo para os usuários administradores. (Opcional - requer nome do claim acima)
-auths.oauth2_restricted_group=Valor do Claim de Grupo para os usuários restritos. (Opcional - requer nome do claim acima)
-auths.oauth2_map_group_to_team=Mapear grupos para Organizações. (Opcional - requer nome do claim acima)
+auths.oauth2_admin_group=Valor do claim de grupo para os usuários administradores. (Opcional - requer nome do claim acima)
+auths.oauth2_restricted_group=Valor do claim de grupo para os usuários restritos. (Opcional - requer nome do claim acima)
+auths.oauth2_map_group_to_team=Mapear grupos do claim a equipes da organização. (Opcional - requer nome do claim acima)
 auths.oauth2_map_group_to_team_removal=Remover usuários de equipes sincronizadas se o usuário não pertence ao grupo correspondente.
 auths.enable_auto_register=Habilitar cadastro automático
 auths.sspi_auto_create_users=Criar usuários automaticamente
@@ -3265,7 +3265,7 @@ auths.new_success=A fonte de autenticação "%s" foi adicionada.
 auths.update_success=A fonte de autenticação foi atualizada.
 auths.update=Atualizar fonte de autenticação
 auths.delete=Excluir fonte de autenticação
-auths.delete_auth_title=Excluir a Fonte de Autenticação
+auths.delete_auth_title=Excluir fonte de autenticação
 auths.delete_auth_desc=A exclusão de uma fonte de autenticação impede que os usuários a usem para acessar. Continuar?
 auths.still_in_used=A fonte de autenticação ainda está em uso. Converta ou exclua todos os usuários que usam essa fonte de autenticação primeiro.
 auths.deletion_success=A fonte de autenticação foi excluída.
@@ -3278,19 +3278,19 @@ config.server_config=Configuração do servidor
 config.app_name=Nome do servidor
 config.app_ver=Versão do Forgejo
 config.app_url=URL base
-config.custom_conf=Caminho do Arquivo de Configuração
-config.custom_file_root_path=Caminho raiz para arquivo personalizado
+config.custom_conf=Localização do arquivo de configuração
+config.custom_file_root_path=Localização raiz dos arquivos personalizados
 config.domain=Domínio do servidor
 config.offline_mode=Modo local
-config.disable_router_log=Desabilitar o Log do roteador
-config.run_user=Executar como nome de usuário
+config.disable_router_log=Desabilitar log do roteador
+config.run_user=Executar como este usuário
 config.run_mode=Modo de execução
 config.git_version=Versão do Git
-config.repo_root_path=Caminho raiz do repositório
-config.lfs_root_path=Caminho raiz do LFS
+config.repo_root_path=Localização raiz do repositório
+config.lfs_root_path=Localização raiz de LFS
 config.log_file_root_path=Localização do log
 config.script_type=Tipo de script
-config.reverse_auth_user=Usuário de autenticação reversa
+config.reverse_auth_user=Usuário de autenticação do proxy reverso
 
 config.ssh_config=Configuração de SSH
 config.ssh_enabled=Habilitado
@@ -3299,15 +3299,15 @@ config.ssh_domain=Domínio do servidor SSH
 config.ssh_port=Porta
 config.ssh_listen_port=Porta de escuta
 config.ssh_root_path=Caminho raiz
-config.ssh_key_test_path=Caminho da chave de teste
-config.ssh_keygen_path=Caminho do keygen ('ssh-keygen')
+config.ssh_key_test_path=Localização de teste para chave
+config.ssh_keygen_path=Localização do gerador de chaves ("ssh-keygen")
 config.ssh_minimum_key_size_check=Verificar tamanho mínimo da chave
 config.ssh_minimum_key_sizes=Tamanhos mínimos da chave
 
 config.lfs_config=Configuração de LFS
 config.lfs_enabled=Habilitado
-config.lfs_content_path=Caminho do conteúdo LFS
-config.lfs_http_auth_expiry=Expiração da autenticação HTTP LFS
+config.lfs_content_path=Localização do conteúdo LFS
+config.lfs_http_auth_expiry=Tempo de expiração da autenticação HTTP de LFS
 
 config.db_config=Configuração do banco de dados
 config.db_type=Tipo
@@ -3321,23 +3321,23 @@ config.db_path=Caminho
 config.service_config=Configuração do serviço
 config.register_email_confirm=Exigir confirmação de e-mail para se cadastrar
 config.disable_register=Desabilitar autocadastro
-config.allow_only_internal_registration=Permitir Registro Somente Através do Próprio Forgejo
-config.allow_only_external_registration=Permitir cadastro somente por meio de serviços externos
-config.enable_openid_signup=Habilitar o auto-cadastro via OpenID
+config.allow_only_internal_registration=Permitir cadastro somente através do próprio Forgejo
+config.allow_only_external_registration=Permitir cadastro somente através de serviços externos
+config.enable_openid_signup=Habilitar autocadastro via OpenID
 config.enable_openid_signin=Habilitar acesso via OpenID
 config.show_registration_button=Mostrar botão de cadastro
-config.require_sign_in_view=Exigir acesso do usuário para a visualização de páginas
-config.mail_notify=Habilitar notificações de e-mail
+config.require_sign_in_view=Exigir cadastro para visualização de páginas
+config.mail_notify=Habilitar notificações via e-mail
 config.enable_captcha=Habilitar o CAPTCHA
-config.active_code_lives=Ativar Code Lives
-config.reset_password_code_lives=Tempo de expiração do código de recuperação de conta
+config.active_code_lives=Tempo de expiração do código de ativação
+config.reset_password_code_lives=Tempo de expiração do código de recuperação
 config.default_keep_email_private=Ocultar endereços de e-mail por padrão
 config.default_allow_create_organization=Permitir a criação de organizações por padrão
-config.enable_timetracking=Habilitar Cronômetro
-config.default_enable_timetracking=Habilitar o Cronômetro por Padrão
+config.enable_timetracking=Habilitar estatísticas de tempo
+config.default_enable_timetracking=Habilitar estatísticas de tempo por padrão
 config.allow_dots_in_usernames = Permitir pontos em nomes de usuário. Esta opção não afeta contas já existentes.
-config.default_allow_only_contributors_to_track_time=Permitir que apenas os colaboradores acompanhem o contador de tempo
-config.no_reply_address=Ocultar domínio de e-mail
+config.default_allow_only_contributors_to_track_time=Permitir que apenas os colaboradores usem as estatísticas de tempo
+config.no_reply_address=Domínio do email oculto
 config.default_visibility_organization=Visibilidade padrão para novas organizações
 config.default_enable_dependencies=Habilitar dependências de issue por padrão
 
@@ -3372,13 +3372,13 @@ config.cache_config=Configuração de cache
 config.cache_adapter=Adaptador de cache
 config.cache_interval=Intervalo de cache
 config.cache_conn=Conexão de cache
-config.cache_item_ttl=Item de cache TTL
+config.cache_item_ttl=TTL do item de cache
 
 config.session_config=Configuração de sessão
 config.session_provider=Provedor de sessão
 config.provider_config=Configuração do provedor
 config.cookie_name=Nome do cookie
-config.gc_interval_time=Tempo de Intervalo do GC
+config.gc_interval_time=Tempo de intervalo do GC
 config.session_life_time=Tempo de vida da sessão
 config.https_only=Apenas HTTPS
 config.cookie_life_time=Tempo de vida do cookie
@@ -3386,25 +3386,25 @@ config.cookie_life_time=Tempo de vida do cookie
 config.picture_config=Configuração de imagem e avatar
 config.picture_service=Serviço de imagens
 config.disable_gravatar=Desabilitar o gravatar
-config.enable_federated_avatar=Habilitar avatares federativos
+config.enable_federated_avatar=Habilitar avatares federados
 
 config.git_config=Configuração do Git
-config.git_disable_diff_highlight=Desabilitar realce de mudanças no diff
-config.git_max_diff_lines=Máximo de linhas mostradas no diff (para um único arquivo)
-config.git_max_diff_line_characters=Máximo de caracteres mostrados no diff (para uma única linha)
-config.git_max_diff_files=Máximo de arquivos a serem mostrados no diff
+config.git_disable_diff_highlight=Desabilitar realce de sintaxe em diffs
+config.git_max_diff_lines=Máximo de linhas por arquivo em diffs
+config.git_max_diff_line_characters=Máximo de caracteres por linha em diffs
+config.git_max_diff_files=Máximo de arquivos de diff exibidos
 config.git_gc_args=Argumentos do GC
 config.git_migrate_timeout=Tempo limite de migração
-config.git_mirror_timeout=Tempo limite de atualização de espelhamento
-config.git_clone_timeout=Tempo limite para operação de clone
-config.git_pull_timeout=Tempo limite para operação de pull
-config.git_gc_timeout=Tempo limite para execução do GC
+config.git_mirror_timeout=Tempo limite para atualização de espelhos
+config.git_clone_timeout=Tempo limite para operações de clonagem
+config.git_pull_timeout=Tempo limite para operações de pull
+config.git_gc_timeout=Tempo limite para operação de GC
 
 config.log_config=Configuração de log
 config.logger_name_fmt=Logger: %s
 config.disabled_logger=Desabilitado
-config.access_log_mode=Modo log Access
-config.access_log_template=Modelo do registro de acesso
+config.access_log_mode=Modo do log de acesso
+config.access_log_template=Modelo do log de acesso
 config.xorm_log_sql=Log SQL
 
 config.set_setting_failed=Falha ao definir configuração %s
@@ -3435,10 +3435,10 @@ monitor.queue=Fila: %s
 monitor.queue.name=Nome
 monitor.queue.type=Tipo
 monitor.queue.exemplar=Tipo de modelo
-monitor.queue.numberworkers=Número de executores
-monitor.queue.maxnumberworkers=Número máximo de executores
-monitor.queue.numberinqueue=Número na Fila
-monitor.queue.settings.title=Configurações do conjunto
+monitor.queue.numberworkers=Número de workers
+monitor.queue.maxnumberworkers=Número máximo de workers
+monitor.queue.numberinqueue=Número na fila
+monitor.queue.settings.title=Configurações do pool
 monitor.queue.settings.maxnumberworkers=Número máximo de executores
 monitor.queue.settings.maxnumberworkers.placeholder=Atualmente %[1]d
 monitor.queue.settings.maxnumberworkers.error=Número máximo de executores deve ser um número
@@ -3448,10 +3448,10 @@ monitor.queue.settings.remove_all_items=Remover tudo
 monitor.queue.settings.remove_all_items_done=Todos os itens da fila foram removidos.
 
 notices.system_notice_list=Avisos do sistema
-notices.view_detail_header=Ver detalhes do aviso
+notices.view_detail_header=Detalhes do aviso
 notices.operations=Operações
-notices.select_all=Marcar todos
-notices.deselect_all=Desmarcar todos
+notices.select_all=Selecionar tudo
+notices.deselect_all=Desselecionar tudo
 notices.inverse_selection=Inverter seleção
 notices.delete_selected=Excluir seleção
 notices.delete_all=Excluir todos os avisos
@@ -3464,12 +3464,12 @@ notices.delete_success=Os avisos do sistema foram excluídos.
 identity_access = Identidade e acesso
 settings = Configurações de administrador
 users.bot = Robô
-dashboard.start_schedule_tasks = Iniciar tarefas programadas
+dashboard.start_schedule_tasks = Iniciar tarefas de actions programadas
 users.reserved = Reservado
 emails.change_email_text = Tem certeza de que deseja atualizar este endereço de e-mail?
 self_check = Autoverificação
 auths.tip.gitea = Registre um novo aplicativo OAuth2. A documentação pode ser encontrada em %s/
-dashboard.sync_tag.started = Sincronização de etiquetas iniciada
+dashboard.sync_tag.started = Sincronização de tags iniciada
 self_check.no_problem_found = Por enquanto não há algum problema.
 config_settings = Configurações
 config_summary = Resumo
@@ -3487,11 +3487,11 @@ monitor.queue.activeworkers = Processos ativos
 systemhooks.desc = Os webhooks fazem automaticamente solicitações HTTP POST para um servidor quando certos eventos Forgejo são acionados. Os webhooks definidos aqui atuarão em todos os repositórios do sistema, então, considere quaisquer implicações de desempenho que isso possa ter. Leia mais no guia de webhooks.
 defaulthooks.desc = Os webhooks fazem automaticamente solicitações HTTP POST para um servidor quando certos eventos Forgejo são acionados. Os webhooks definidos aqui são padrões e serão copiados para todos os novos repositórios. Leia mais no guia de webhooks.
 self_check.database_fix_mysql = Para usuários do MySQL/MariaDB, você pode usar o comando "gitea doctor convert" para corrigir os problemas de ordenamento, ou também pode corrigir o problema usando "ALTER ... COLLATE ..." SQLs manualmente.
-monitor.queue.settings.desc = Os pools crescem dinamicamente em resposta ao bloqueio da fila de trabalhadores.
+monitor.queue.settings.desc = Os pools crescem dinamicamente quando as filas de seus workers ficam bloqueadas.
 config.cache_test_succeeded = Teste de cache bem-sucedido, obteve uma resposta em %s.
 self_check.database_inconsistent_collation_columns = O banco de dados está usando o ordenamento %s, mas essas colunas estão usando ordenamentos incompatíveis. Isso pode causar alguns problemas inesperados.
 dashboard.rebuild_issue_indexer = Reconstruir indexador de problemas
-monitor.queue.review_add = Revisar / adicionar trabalhadores
+monitor.queue.review_add = Revisar / adicionar workers
 assets = Ativos de código
 config.open_with_editor_app_help = Os editores "Abrir com" para o menu clone. Se deixado em branco, o padrão será usado. Expanda para ver o padrão.
 config.cache_test_slow = Teste de cache bem-sucedido, mas a resposta é lenta: %s.
@@ -3539,7 +3539,7 @@ mirror_sync_create=sincronizou a nova referência %[3]s para
 mirror_sync_delete=referência excluída e sincronizada %[2]s em %[3]s do espelhamento
 approve_pull_request=`aprovou %[3]s#%[2]s`
 reject_pull_request=`sugeriu modificações para %[3]s#%[2]s`
-publish_release=`lançou a versão  "%[4]s"  em %[3]s`
+publish_release=`lançou o release  "%[4]s"  em %[3]s`
 review_dismissed=`descartou a revisão de %[4]s para %[3]s#%[2]s`
 review_dismissed_reason=Motivo:
 create_branch=criou o branch %[3]s em %[4]s
@@ -3593,9 +3593,9 @@ error.generate_hash=Falha ao gerar hash de commit
 error.no_committer_account=Nenhuma conta vinculada ao e-mail do autor do commit
 error.no_gpg_keys_found=Nenhuma chave conhecida encontrada para esta assinatura no banco de dados
 error.not_signed_commit=Não é um commit assinado
-error.failed_retrieval_gpg_keys=Falha em obter qualquer chave anexada à conta do autor do commit
-error.probable_bad_signature=AVISO! Embora exista uma chave com este ID no banco de dados, ela não verifica este commit! Este commit é SUSPEITO.
-error.probable_bad_default_signature=AVISO! Embora a chave padrão tenha este ID, ela não verifica este commit! Este commit é SUSPEITO.
+error.failed_retrieval_gpg_keys=Falha ao obter qualquer chave anexada à conta do autor do commit
+error.probable_bad_signature=ATENÇÃO! Embora exista uma chave com este ID no banco de dados, ela não verifica este commit! Este commit é SUSPEITO.
+error.probable_bad_default_signature=ATENÇÃO! Embora a chave padrão tenha este ID, ela não verifica este commit! Este commit é SUSPEITO.
 
 [units]
 unit=Unidade
@@ -3622,9 +3622,9 @@ dependencies=Dependências
 keywords=Palavras-chave
 details=Detalhes
 details.author=Autor
-details.project_site=Site do Projeto
-details.repository_site=Site do Repositório
-details.documentation_site=Site da Documentação
+details.project_site=Site do projeto
+details.repository_site=Site do repositório
+details.documentation_site=Site da documentação
 details.license=Licença
 assets=Recursos
 versions=Versões
@@ -3719,17 +3719,17 @@ settings.delete.description=A exclusão de um pacote é permanente e não pode s
 settings.delete.notice=Você está prestes a excluir %s (%s). Esta operação é irreversível, tem certeza?
 settings.delete.success=O pacote foi excluído.
 settings.delete.error=Falha ao excluir o pacote.
-owner.settings.cargo.title=Índice do Registro Cargo
+owner.settings.cargo.title=Índice do registro Cargo
 owner.settings.cargo.initialize=Inicializar índice
 owner.settings.cargo.initialize.error=Falha ao inicializar índice Cargo: %v
 owner.settings.cargo.initialize.success=O índice Cargo foi criado com sucesso.
 owner.settings.cargo.rebuild=Reconstruir índice
 owner.settings.cargo.rebuild.error=Falha ao reconstruir índice Cargo: %v
 owner.settings.cargo.rebuild.success=O índice Cargo foi reconstruído com sucesso.
-owner.settings.cleanuprules.title=Gerenciar Regras de Limpeza
-owner.settings.cleanuprules.add=Adicionar Regra de Limpeza
-owner.settings.cleanuprules.edit=Editar Regra de Limpeza
-owner.settings.cleanuprules.preview=Pré-visualizar Regra de Limpeza
+owner.settings.cleanuprules.title=Regras de limpeza
+owner.settings.cleanuprules.add=Adicionar regra de limpeza
+owner.settings.cleanuprules.edit=Editar regra de limpeza
+owner.settings.cleanuprules.preview=Pré-visualizar regra de limpeza
 owner.settings.cleanuprules.preview.overview=%d pacotes agendados para serem removidos.
 owner.settings.cleanuprules.preview.none=A regra de limpeza não corresponde a nenhum pacote.
 owner.settings.cleanuprules.enabled=Habilitado
@@ -3792,7 +3792,7 @@ management=Gerenciar segredos
 [actions]
 actions=Ações
 
-unit.desc=Gerenciar ações
+unit.desc=Gerenciar pipelines integradas de CI/CD com Forgejo Actions.
 
 status.unknown=Desconhecido
 status.waiting=Aguardando
@@ -3804,8 +3804,8 @@ status.skipped=Ignorado
 status.blocked=Bloqueado
 
 runners=Runners
-runners.runner_manage_panel=Gerenciamento de Runners
-runners.new=Criar novo Runner
+runners.runner_manage_panel=Gerenciar runners
+runners.new=Criar novo runner
 runners.new_notice=Como iniciar um runner
 runners.status=Estado
 runners.id=ID
@@ -3839,7 +3839,7 @@ runners.status.offline=Offline
 runners.version=Versão
 runners.reset_registration_token_success=Token de registro de runner redefinido com sucesso
 
-runs.all_workflows=Todos os Workflows
+runs.all_workflows=Todos os workflows
 runs.commit=Commit
 runs.pushed_by=push feito por
 runs.invalid_workflow_helper=O arquivo de configuração do workflow é inválido. Por favor, verifique seu arquivo de configuração: %s
@@ -3855,7 +3855,7 @@ runners.reset_registration_token = Resetar token de registro
 runs.scheduled = Programadas
 variables.creation = Adicionar variável
 variables.deletion = Remover variável
-variables.management = Gerenciamento de variáveis
+variables.management = Gerenciar variáveis
 runs.actors_no_select = Todos os atores
 variables.none = Ainda não há variáveis.
 variables.update.failed = Falha ao editar a variável.
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
index 531daf2126..b4e6051c93 100644
--- a/options/locale/locale_uk-UA.ini
+++ b/options/locale/locale_uk-UA.ini
@@ -564,8 +564,8 @@ SSPISeparatorReplacement=Розділювач
 SSPIDefaultLanguage=Типова мова
 
 require_error=` не може бути пустим.`
-alpha_dash_error=` повинен містити тільки літерно-цифрові символи, дефіс ('-') та підкреслення ('_'). `
-alpha_dash_dot_error=` повинен містити тільки літерно-цифрові символи, дефіс ('-') , підкреслення ('_') та точки ('.'). `
+alpha_dash_error=` повинен містити тільки літерно-цифрові символи, дефіс («-») та підкреслення («_»).`
+alpha_dash_dot_error=` повинен містити тільки літерно-цифрові символи, дефіс («-») , підкреслення («_») та крапки («.»).`
 git_ref_name_error=` повинен бути правильним посилальним ім'ям Git.`
 size_error=` повинен бути розмір %s.`
 min_size_error=` повинен бути принаймні %s символів.`
@@ -738,7 +738,7 @@ gpg_helper= Потрібна допомога?  Перегля
 add_new_key=Додати SSH ключ
 add_new_gpg_key=Додати GPG ключ
 key_content_ssh_placeholder=Починається з «ssh-ed25519», «ssh-rsa», «ecdsa-sha2-nistp256», «ecdsa-sha2-nistp384», «ecdsa-sha2-nistp521», «sk-ecdsa-sha2-nistp256@openssh.com» або «sk-ssh-ed25519@openssh.com»
-key_content_gpg_placeholder=Починається з '-----BEGIN PGP PUBLIC KEY BLOCK-----'
+key_content_gpg_placeholder=Починається з «-----BEGIN PGP PUBLIC KEY BLOCK-----»
 add_new_principal=Додати користувача
 ssh_key_been_used=Цей SSH ключ вже був додано до сервера.
 ssh_key_name_used=Ключ SSH з таким ім'ям вже існує у вашому обліковому записі.
@@ -756,7 +756,7 @@ gpg_token=Токен
 gpg_token_help=Ви можете створити підпис за допомогою:
 gpg_token_code=echo "%s" | gpg -a --default-key %s --detach-sig
 gpg_token_signature=Текстовий (armored) підпис GPG
-key_signature_gpg_placeholder=`Починається з "-----BEGIN PGP SIGNATURE-----"`
+key_signature_gpg_placeholder=Починається з «-----BEGIN PGP SIGNATURE-----»
 ssh_key_verified=Перевірений ключ
 ssh_key_verify=Підтвердити
 ssh_token_required=Вам потрібно надати підпис для нижчевказаного токена
@@ -1102,8 +1102,8 @@ file_permalink=Постійне посилання
 file_too_large=Цей файл завеликий щоб бути показаним.
 
 file_copy_permalink=Копіювати постійне посилання
-video_not_supported_in_browser=Ваш браузер не підтримує тег 'video' HTML5.
-audio_not_supported_in_browser=Ваш браузер не підтримує тег HTML5 'audio'.
+video_not_supported_in_browser=Ваш браузер не підтримує тег HTML5 «video».
+audio_not_supported_in_browser=Ваш браузер не підтримує тег HTML5 «audio».
 stored_lfs=Збережено з Git LFS
 symbolic_link=Символічне посилання
 commit_graph=Графік комітів
@@ -1620,7 +1620,7 @@ wiki.delete_page_button=Видалити сторінку
 wiki.page_already_exists=Вікі-сторінка з таким самим ім'ям вже існує.
 wiki.pages=Сторінки
 wiki.last_updated=Останні оновлення %s
-wiki.page_name_desc=Введіть назву вікі-сторінки. Деякі із спеціальних імен: 'Home', '_Sidebar' та '_Footer'.
+wiki.page_name_desc=Введіть назву вікі-сторінки. Деякі зі спеціальних імен: «Home», «_Sidebar» та «_Footer».
 
 activity=Активність
 activity.period.filter_label=Період:
@@ -1942,7 +1942,7 @@ settings.protect_whitelist_teams=Команди, учасники яких мо
 settings.protect_whitelist_search_teams=Пошук команд…
 settings.protect_merge_whitelist_committers=Обмежити право на прийняття Pull Request'ів в цю гілку списком
 settings.protect_merge_whitelist_committers_desc=Ви можете додавати користувачів або цілі команди в 'білий' список цієї гілки. Тільки присутні в списку зможуть приймати запити на злиття. В іншому випадку будь-хто з правами запису до головного репозиторію буде володіти такою можливістю.
-settings.protect_merge_whitelist_users=Користувачі з правом на прийняття Pull Request'ів в цю гілку:
+settings.protect_merge_whitelist_users=Користувачі з правом на прийняття Pull Request'ів в цю гілку
 settings.protect_merge_whitelist_teams=Команди, яким дозволено злиття
 settings.protect_check_status_contexts=Увімкнути перевірку стану
 settings.protect_check_status_contexts_desc=Вимагати успішного проходження перевірок стану перед злиттям. Оберіть перевірки стану, які слід провести для гілок, перед їх об'єднанням з гілкою, що відповідає цьому правилу. Коли цей пункт увімкнено, коміти спершу надсилаються до іншої гілки, а потім зливаються або надсилаються безпосередньо до гілки, яка відповідає цьому правилу після успішного проходження перевірок стану. Якщо не вибрано контекст, останній коміт має успішно проходити перевірки, незалежно від контексту.
@@ -2010,7 +2010,7 @@ settings.lfs_invalid_lock_directory=Не можливо заблокувати 
 settings.lfs_lock_already_exists=Блокування вже використовується: %s
 settings.lfs_lock=Блокувати
 settings.lfs_lock_path=Шлях до файлу для блокування...
-settings.lfs_locks_no_locks=Відсутнє блокування
+settings.lfs_locks_no_locks=Немає блокувань
 settings.lfs_lock_file_no_exist=Заблокований файл не існує у гілці за замовчуванням
 settings.lfs_force_unlock=Примусове розблокування
 settings.lfs_pointers.found=Знайдено %d посилань на blob - %d пов'язаних, %d непов'язаних (%d відсутні у сховищі)
@@ -2188,6 +2188,12 @@ issues.role.contributor = Дописувач
 activity.navbar.contributors = Дописувачі
 settings.protected_branch.save_rule = Зберегти правило
 release.tags_for = Теги %s
+editor.file_is_a_symlink = `«%s» — символьне посилання. Символьні посилання не можна редагувати у вебредакторі`
+settings.sourcehut_builds.secrets = Секрети
+settings.web_hook_name_feishu_only = Feishu
+settings.web_hook_name_gogs = Gogs
+settings.web_hook_name_dingtalk = DingTalk
+settings.web_hook_name_feishu = Feishu / Lark Suite
 
 [graphs]
 contributors.what = внески
@@ -2345,8 +2351,8 @@ dashboard.archive_cleanup=Видалити старі архіви репози
 dashboard.deleted_branches_cleanup=Прибрати видалені гілки
 dashboard.update_migration_poster_id=Оновити мігровані ID авторів
 dashboard.git_gc_repos=Виконати очистку сміття для всіх репозиторіїв
-dashboard.resync_all_sshkeys=Оновити файл '.ssh/authorized_keys' з SSH ключами Forgejo.
-dashboard.resync_all_sshprincipals=Оновіть файл '.ssh/authorized_princтipals' з SSH даними користувача Forgejo.
+dashboard.resync_all_sshkeys=Оновити файл «.ssh/authorized_keys» з SSH-ключами Forgejo.
+dashboard.resync_all_sshprincipals=Оновити файл «.ssh/authorized_principals» з SSH даними користувача Forgejo.
 dashboard.resync_all_hooks=Пересинхронізувати перед-прийнятні, оновлюючі та пост-прийнятні хуки в усіх репозиторіях
 dashboard.reinit_missing_repos=Переініціалізувати усі репозитрії git-файли яких втрачено
 dashboard.sync_external_users=Синхронізувати дані зовнішніх користувачів
@@ -2383,7 +2389,7 @@ dashboard.gc_times=Кількість запусків збирача смітт
 dashboard.delete_old_actions=Видалити всі старі дії з бази даних
 dashboard.delete_old_actions.started=Видалення всіх старі дії з бази даних розпочато.
 
-users.user_manage_panel=Керування обліковими записами користувачів
+users.user_manage_panel=Керування обліковими записами
 users.new_account=Створити обліковий запис
 users.name=Ім'я кристувача
 users.full_name=Повне ім'я
@@ -2403,18 +2409,18 @@ users.auth_login_name=Логін для авторизації
 users.password_helper=Залиште пароль порожнім, щоб не змінювати його.
 users.update_profile_success=Обліковий запис користувача було оновлено.
 users.edit_account=Редагувати обліковий запис
-users.max_repo_creation=Максимальне число репозиторіїв
+users.max_repo_creation=Максимальна кількість репозиторіїв
 users.max_repo_creation_desc=(Введіть -1, щоб використовувати глобальний ліміт за замовчуванням.)
 users.is_activated=Обліковий запис користувача увімкнено
 users.prohibit_login=Вимкнути вхід
-users.is_admin=Адміністратор
+users.is_admin=Обліковий запис адміністратора
 users.is_restricted=Обмежений
 users.allow_git_hook=Може створювати Git хуки
 users.allow_git_hook_tooltip=Git хуки виконуються від імені користувача OS сервісу Forgejo і мають однаковий рівень доступу до хоста. Як результат, користувачі з доступом до Git-хуків можуть отримати доступ і змінювати всі репозиторії Forgejo, а також базу даних, що використовуються в Forgejo. Отже, вони також здатні отримати права адміністратора Forgejo.
 users.allow_import_local=Може імпортувати локальні репозиторії
 users.allow_create_organization=Може створювати організації
 users.update_profile=Оновити обліковий запис
-users.delete_account=Видалити цей обліковий запис
+users.delete_account=Видалити обліковий запис
 users.still_own_repo=Ваш обліковий запис все ще володіє одним або кількома репозиторіями, спочатку вам потрібно видалити або передати їх.
 users.still_has_org=Цей обліковий запис все ще є учасником однієї або декількох організацій. Для продовження, покиньте або видаліть організації.
 users.deletion_success=Обліковий запис користувача було видалено.
@@ -2429,8 +2435,8 @@ users.list_status_filter.is_restricted=З обмеженнями
 users.list_status_filter.not_restricted=Без обмежень
 users.list_status_filter.is_prohibit_login=Вхід заборонено
 users.list_status_filter.not_prohibit_login=Вхід дозволено
-users.list_status_filter.is_2fa_enabled=2FA увімкнена
-users.list_status_filter.not_2fa_enabled=2FA вимкнена
+users.list_status_filter.is_2fa_enabled=2FA увімкнено
+users.list_status_filter.not_2fa_enabled=2FA вимкнено
 
 emails.email_manage_panel=Управління поштою користувача
 emails.primary=Головний
@@ -2476,12 +2482,12 @@ systemhooks=Системні вебхуки
 systemhooks.add_webhook=Додати системний вебхук
 systemhooks.update_webhook=Оновити системний вебхук
 
-auths.auth_manage_panel=Керування джерелом автентифікації
+auths.auth_manage_panel=Керування джерелами автентифікації
 auths.new=Додати джерело автентифікації
 auths.name=Ім'я
 auths.type=Тип
 auths.enabled=Увімкнено
-auths.syncenabled=Увімкнути синхронізацію користувача
+auths.syncenabled=Увімкнути синхронізацію користувачів
 auths.updated=Оновлено
 auths.auth_type=Тип автентифікації
 auths.auth_name=Назва автентифікації
@@ -2509,13 +2515,13 @@ auths.restricted_filter=Обмежуючий фільтр
 auths.restricted_filter_helper=Залиште пустим, щоб не встановлювати обмеження на жодного з користувачів. Використовуйте зірочку ('*') щоб встановити обмеження на всіх користувачів, які не відповідають фільтру Адміністратора.
 auths.group_search_base=Пошукова база груп DN
 auths.group_attribute_list_users=Атрибут групи зі списком користувачів
-auths.user_attribute_in_group=Атрибути користувача в групі
+auths.user_attribute_in_group=Атрибут користувача в групі
 auths.ms_ad_sa=Атрибути пошуку MS AD
 auths.smtp_auth=Тип автентифікації SMTP
-auths.smtphost=SMTP хост
-auths.smtpport=SMTP порт
+auths.smtphost=Адреса SMTP
+auths.smtpport=Порт SMTP
 auths.allowed_domains=Дозволені домени
-auths.allowed_domains_helper=Залиште порожнім, щоб дозволити всі домени. Розділіть кілька доменів за допомогою коми (',').
+auths.allowed_domains_helper=Залиште порожнім, щоб дозволити всі домени. Розділяйте кілька доменів за допомогою коми («,»).
 auths.skip_tls_verify=Пропустити перевірку TLS
 auths.force_smtps=Примусово використовувати SMTPS
 auths.force_smtps_helper=SMTPS завжди використовується на порту 465. Встановіть цей прапорець для примусового використання SMTPS на інших портах. (В іншому випадку STARTTLS буде використовуватися для інших портів, якщо хост його підтримує.)
@@ -2549,7 +2555,7 @@ auths.sspi_separator_replacement_helper=Символ, який замінює р
 auths.sspi_default_language=Типова мова користувача
 auths.sspi_default_language_helper=Типова мова для користувачів, які створюються автоматично при SSPI-автентифікації. Залиште не вказаним, якщо надаєте перевагу автоматичному визначенню мови.
 auths.tips=Поради
-auths.tips.oauth2.general=OAuth2 автентифікація
+auths.tips.oauth2.general=Автентифікація OAuth2
 auths.tip.oauth2_provider=Постачальник OAuth2
 auths.tip.bitbucket=Створіть OAuth URI на сторінці %s
 auths.tip.nextcloud=`Зареєструйте нового споживача OAuth у вашому екземплярі за допомогою наступного меню "Налаштування -> Безпека -> клієнт OAuth 2.0"`
@@ -2564,7 +2570,7 @@ auths.tip.discord=Зареєструйте новий додаток на %s
 auths.tip.yandex=`Створіть нову програму в %s. Виберіть наступні дозволи з "Yandex. assport API": "Доступ до адреси електронної пошти", "Доступ до аватара" і "Доступ до імені користувача, імені та прізвища, статі"`
 auths.tip.mastodon=Введіть URL спеціального екземпляра для екземпляра mastodon, який ви хочете автентифікувати за допомогою (або використовувати за замовчуванням)
 auths.edit=Редагувати джерело автентифікації
-auths.activated=Ця аутентифікація активована
+auths.activated=Це джерело авторизації активоване
 auths.update_success=Параметри аутентифікації оновлені.
 auths.update=Оновити джерело автентифікації
 auths.delete=Видалити джерело автентифікації
@@ -2575,7 +2581,7 @@ auths.deletion_success=Канал аутентифікації успішно з
 auths.login_source_of_type_exist=Джерело автентифікації такого типу вже наявне.
 
 config.server_config=Конфігурація сервера
-config.app_name=Назва сайту
+config.app_name=Назва екземпляра
 config.app_ver=Версія Forgejo
 config.app_url=Базова URL-адреса
 config.custom_conf=Шлях до файлу конфігурації
@@ -2583,11 +2589,11 @@ config.custom_file_root_path=Шлях до файлу користувача
 config.domain=Домен сервера
 config.offline_mode=Локальний режим
 config.disable_router_log=Вимкнути логування роутеру
-config.run_user=Запуск від імені Користувача
+config.run_user=Користувач, від якого запустити
 config.run_mode=Режим виконання
 config.git_version=Версія Git
 config.repo_root_path=Кореневий шлях репозиторія
-config.lfs_root_path=Кореневої шлях LFS
+config.lfs_root_path=Кореневий шлях LFS
 config.log_file_root_path=Шлях до лог файлу
 config.script_type=Тип скрипта
 config.reverse_auth_user=Ім'я користувача для авторизації на reverse proxy
@@ -2595,18 +2601,18 @@ config.reverse_auth_user=Ім'я користувача для авториза
 config.ssh_config=Конфігурація SSH
 config.ssh_enabled=Увімкнено
 config.ssh_start_builtin_server=Використовувати вбудований сервер
-config.ssh_domain=Домен SSH сервера
+config.ssh_domain=Домен сервера SSH
 config.ssh_port=Порт
 config.ssh_listen_port=Порт, що прослуховується
 config.ssh_root_path=Шлях до кореня
 config.ssh_key_test_path=Шлях до тестового ключа
-config.ssh_keygen_path=Шлях до генератора ключів ('ssh-keygen')
-config.ssh_minimum_key_size_check=Мінімальний розмір ключа перевірки
+config.ssh_keygen_path=Шлях до генератора ключів («ssh-keygen»)
+config.ssh_minimum_key_size_check=Перевірка мінімального розміру ключа
 config.ssh_minimum_key_sizes=Мінімальні розміри ключів
 
 config.lfs_config=Конфігурація LFS
 config.lfs_enabled=Увімкнено
-config.lfs_content_path=Шлях до контенту LFS
+config.lfs_content_path=Шлях до вмісту LFS
 config.lfs_http_auth_expiry=Термін дії LFS HTTP-автентифікації
 
 config.db_config=Конфігурація бази даних
@@ -2619,18 +2625,18 @@ config.db_ssl_mode=SSL
 config.db_path=Шлях
 
 config.service_config=Конфігурація сервісу
-config.register_email_confirm=Потрібно підтвердити електронну пошту для реєстрації
+config.register_email_confirm=Вимагати підтвердити електронну пошту для реєстрації
 config.disable_register=Вимкнути самостійну реєстрацію
 config.allow_only_internal_registration=Дозволити реєстрацію тільки через Forgejo
 config.allow_only_external_registration=Дозволити реєстрацію тільки через сторонні сервіси
 config.enable_openid_signup=Увімкнути самостійну реєстрацію за допомогою OpenID
 config.enable_openid_signin=Увімкнути реєстрацію за допомогою OpenID
-config.show_registration_button=`Показувати кнопку "Реєстрація"`
-config.require_sign_in_view=Вимагати авторизації для перегляду сторінок
+config.show_registration_button=Показувати кнопку «Реєстрація»
+config.require_sign_in_view=Вимагати авторизації для перегляду вмісту
 config.mail_notify=Увімкнути сповіщення електронною поштою
 config.enable_captcha=Увімкнути CAPTCHA
-config.active_code_lives=Час актуальності кода підтвердження
-config.reset_password_code_lives=Відновлення часу закінчення терміну дії коду облікового запису
+config.active_code_lives=Термін дії коду активації
+config.reset_password_code_lives=Термін дії коду відновлення облікового запису
 config.default_keep_email_private=Приховати адресу електронної пошти за замовчуванням
 config.default_allow_create_organization=Дозволити створення організацій за замовчуванням
 config.enable_timetracking=Увімкнути відстеження часу
@@ -2672,14 +2678,14 @@ config.cookie_name=Ім'я файлу cookie
 config.gc_interval_time=Інтервал запуску збирача сміття (GC)
 config.session_life_time=Час життя сесії
 config.https_only=Тільки HTTPS
-config.cookie_life_time=Час життя cookie-файлу
+config.cookie_life_time=Час життя файлу cookie
 
-config.picture_config=Налаштування фотографії або аватари
+config.picture_config=Налаштування фотографії або аватара
 config.picture_service=Сервіс зображень
 config.disable_gravatar=Вимкнути Gravatar
-config.enable_federated_avatar=Увімкнути зовнішні аватари
+config.enable_federated_avatar=Увімкнути федеровані аватари
 
-config.git_config=Конфігурація git
+config.git_config=Конфігурація Git
 config.git_disable_diff_highlight=Вимкнути підсвітку синтаксису diff
 config.git_max_diff_lines=Максимум рядків на diff (на один файл)
 config.git_max_diff_line_characters=Максимум символів на diff (на одну строку)
@@ -2756,6 +2762,8 @@ users.purge_help = Примусово видалити користувача і
 dashboard.cleanup_packages = Очистити непридатні пакунки
 monitor.last_execution_result = Результат
 repos.lfs_size = Розмір LFS
+config.allow_dots_in_usernames = Дозволити використання крапки в іменах користувачів. Не впливає на існуючі облікові записи.
+config.mailer_enable_helo = Увімкнути HELO
 
 
 [action]
@@ -2919,6 +2927,16 @@ filter.no_result = Ваш фільтр не видав жодних резуль
 dependency.id = ID
 
 [secrets]
+deletion = Видалити секрет
+creation.success = Секрет «%s» додано.
+creation.failed = Не вдалося додати секрет.
+management = Керування секретами
+deletion.success = Секрет видалено.
+deletion.failed = Не вдалося видалити секрет.
+deletion.description = Видалення секрету є остаточним і його неможливо скасувати. Продовжити?
+creation = Додати секрет
+none = Секретів ще немає.
+creation.name_placeholder = без урахування регістру, тільки літерно-цифрові символи або підкреслення, не може починатися з GITEA_ або GITHUB_
 
 [actions]
 
@@ -2934,11 +2952,33 @@ runners.status.active=Активний
 
 runs.commit=Коміт
 variables.update.failed = Не вдалося змінити змінну.
-variables.update.success = Змінна була змінена.
+variables.update.success = Змінну змінено.
 variables.creation = Додати змінну
 variables.none = Змінних ще немає.
 variables.deletion = Видалити змінну
 variables = Змінні
+runs.scheduled = Заплановано
+actions = Дії
+variables.deletion.success = Змінну видалено.
+runners.id = ID
+runners.update_runner = Оновити зміни
+variables.creation.failed = Не вдалося додати змінну.
+variables.deletion.failed = Не вдалося видалити змінну.
+status.waiting = Очікує
+variables.creation.success = Змінну «%s» додано.
+runners.labels = Мітки
+status.unknown = Невідомо
+runners.task_list.no_tasks = Завдань поки що немає.
+runners.version = Версія
+status.blocked = Заблоковано
+status.cancelled = Скасовано
+variables.description = Змінні передаються певним діям і не можуть бути прочитані інакше.
+variables.deletion.description = Видалення змінної є остаточним і його неможливо скасувати. Продовжити?
+variables.management = Керування змінними
+variables.id_not_exist = Змінної з ідентифікатором %d не існує.
+variables.edit = Редагувати змінну
+runs.expire_log_message = Журнали очищено, тому що вони були занадто старі.
+runs.empty_commit_message = (порожнє повідомлення коміта)
 
 
 
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 8ba40a51f2..8112bae5f8 100644
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -2740,7 +2740,7 @@ desc.sha256 = SHA256
 settings.ignore_stale_approvals = 忽略过时的批准
 settings.ignore_stale_approvals_desc = 不将旧的提交（陈旧的评审）计入已批准的合并请求数量。注：如过期的评审已被取消，则无需设置。
 settings.archive.mirrors_unavailable = 不能镜像已归档的仓库。
-settings.wiki_rename_branch_main_notices_2 = 这将预先重命名 %s 的仓库百科的内部分支。 现存的检出方式需要更新。
+settings.wiki_rename_branch_main_notices_2 = 这将永久重命名 %s 的仓库百科的内部分支。现存的检出方式需要更新。
 settings.wiki_branch_rename_failure = 无法标准化仓库百科的分支名称。
 settings.add_collaborator_blocked_our = 因仓库所有者已将其拉黑，不能添加该用户为协作者。
 settings.add_collaborator_blocked_them = 因该用户已将仓库所有者拉黑，不能添加该用户为协作者。

From 7d779a7859834d42d2feddb247e1a6e1346e720c Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Wed, 16 Oct 2024 21:03:27 +0200
Subject: [PATCH 166/443] unecessary container image layer duplication

container images grew by 100MB when

RUN ln /app/gitea/gitea /app/gitea/forgejo-cli

was added because hard links are not preserved.

Use symbolic links instead.

https://tauri.earth/@AliveDevil/113318561067465279
---
 Dockerfile          | 2 +-
 Dockerfile.rootless | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 01ab36b711..668a5da25e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -103,6 +103,6 @@ CMD ["/bin/s6-svscan", "/etc/s6"]
 COPY --from=build-env /tmp/local /
 RUN cd /usr/local/bin ; ln -s gitea forgejo
 COPY --from=build-env /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea
-RUN ln /app/gitea/gitea /app/gitea/forgejo-cli
+RUN ln -s /app/gitea/gitea /app/gitea/forgejo-cli
 COPY --from=build-env /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini
 COPY --from=build-env /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete /etc/profile.d/gitea_bash_autocomplete.sh
diff --git a/Dockerfile.rootless b/Dockerfile.rootless
index d2f5f71524..32d4966535 100644
--- a/Dockerfile.rootless
+++ b/Dockerfile.rootless
@@ -90,7 +90,7 @@ RUN chown git:git /var/lib/gitea /etc/gitea
 COPY --from=build-env /tmp/local /
 RUN cd /usr/local/bin ; ln -s gitea forgejo
 COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea
-RUN ln /app/gitea/gitea /app/gitea/forgejo-cli
+RUN ln -s /app/gitea/gitea /app/gitea/forgejo-cli
 COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini
 COPY --from=build-env /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete /etc/profile.d/gitea_bash_autocomplete.sh
 

From a99bb2c61a7941980bf612680f1b96a27e98570e Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Wed, 16 Oct 2024 22:04:26 +0200
Subject: [PATCH 167/443] Dockerfile: use alpine:3.20 instead of
 golang:1.23-alpine3.20

Runtime does not need golang.
---
 Dockerfile          | 2 +-
 Dockerfile.rootless | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 668a5da25e..05c4f33e05 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,7 +51,7 @@ RUN chmod 755 /tmp/local/usr/bin/entrypoint \
               /go/src/code.gitea.io/gitea/environment-to-ini
 RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete
 
-FROM code.forgejo.org/oci/golang:1.23-alpine3.20
+FROM code.forgejo.org/oci/alpine:3.20
 ARG RELEASE_VERSION
 LABEL maintainer="contact@forgejo.org" \
       org.opencontainers.image.authors="Forgejo" \
diff --git a/Dockerfile.rootless b/Dockerfile.rootless
index 32d4966535..cc6820664a 100644
--- a/Dockerfile.rootless
+++ b/Dockerfile.rootless
@@ -49,7 +49,7 @@ RUN chmod 755 /tmp/local/usr/local/bin/docker-entrypoint.sh \
               /go/src/code.gitea.io/gitea/environment-to-ini
 RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete
 
-FROM code.forgejo.org/oci/golang:1.23-alpine3.20
+FROM code.forgejo.org/oci/alpine:3.20
 LABEL maintainer="contact@forgejo.org" \
       org.opencontainers.image.authors="Forgejo" \
       org.opencontainers.image.url="https://forgejo.org" \

From 6283a4b187b74b00bcb4a7d941af49065db05bd1 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Thu, 17 Oct 2024 00:02:56 +0000
Subject: [PATCH 168/443] Update dependency @primer/octicons to v19.12.0

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ed24324ec7..bb337de6cf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
         "@github/relative-time-element": "4.4.3",
         "@github/text-expander-element": "2.7.2",
         "@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
-        "@primer/octicons": "19.9.0",
+        "@primer/octicons": "19.12.0",
         "ansi_up": "6.0.2",
         "asciinema-player": "3.8.0",
         "chart.js": "4.4.4",
@@ -3658,9 +3658,9 @@
       }
     },
     "node_modules/@primer/octicons": {
-      "version": "19.9.0",
-      "resolved": "https://registry.npmjs.org/@primer/octicons/-/octicons-19.9.0.tgz",
-      "integrity": "sha512-uAZa9cMgWkzbEsZnYWB7tg0vt7QprubD7ljtprz2fBJ8CjyqoxFRRsFvH4UiJdjK/3o87ODgDkhiflyJXDh+Lg==",
+      "version": "19.12.0",
+      "resolved": "https://registry.npmjs.org/@primer/octicons/-/octicons-19.12.0.tgz",
+      "integrity": "sha512-VX2/Iu43ZfQaX9OoCNJrzrLBF5BicG3hVY/Nx6slP/YJVZlVwWUiZzjF9hg9lNlLfii5gjl/gAGf/5YZ3Yz78A==",
       "license": "MIT",
       "dependencies": {
         "object-assign": "^4.1.1"
diff --git a/package.json b/package.json
index 162e05eb26..bbc52c9589 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "@github/relative-time-element": "4.4.3",
     "@github/text-expander-element": "2.7.2",
     "@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
-    "@primer/octicons": "19.9.0",
+    "@primer/octicons": "19.12.0",
     "ansi_up": "6.0.2",
     "asciinema-player": "3.8.0",
     "chart.js": "4.4.4",

From 1a7a9055e4fa0024810cf1a7f7cfc77a7b5e7532 Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Thu, 17 Oct 2024 06:14:31 +0200
Subject: [PATCH 169/443] forgejo-cli is now a symlink and cannot be used for
 sanity checks

It could be used but then `cp --dereference` would need to be used instead in
the forgejo-build-publish action.

+ docker cp forgejo-amd64:/app/gitea/forgejo-cli forgejo-9.0-test-linux-amd64
+ chmod +x forgejo-9.0-test-linux-amd64
chmod: cannot operate on dangling symlink 'forgejo-9.0-test-linux-amd64'
---
 .forgejo/testdata/build-release/Dockerfile | 2 +-
 .forgejo/workflows/build-release.yml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.forgejo/testdata/build-release/Dockerfile b/.forgejo/testdata/build-release/Dockerfile
index 9c44dedddd..4ef67d34e0 100644
--- a/.forgejo/testdata/build-release/Dockerfile
+++ b/.forgejo/testdata/build-release/Dockerfile
@@ -3,4 +3,4 @@ ARG RELEASE_VERSION=unkown
 LABEL maintainer="contact@forgejo.org" \
       org.opencontainers.image.version="${RELEASE_VERSION}"
 RUN mkdir -p /app/gitea
-RUN ( echo '#!/bin/sh' ; echo "echo forgejo v$RELEASE_VERSION" ) > /app/gitea/forgejo-cli ; chmod +x /app/gitea/forgejo-cli
+RUN ( echo '#!/bin/sh' ; echo "echo forgejo v$RELEASE_VERSION" ) > /app/gitea/gitea ; chmod +x /app/gitea/gitea
diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml
index 4c2905ba4f..177e0ba8b5 100644
--- a/.forgejo/workflows/build-release.yml
+++ b/.forgejo/workflows/build-release.yml
@@ -170,7 +170,7 @@ jobs:
           platforms: linux/amd64,linux/arm64,linux/arm/v6
           release-notes: "${{ steps.release-notes.outputs.value }}"
           binary-name: forgejo
-          binary-path: /app/gitea/forgejo-cli
+          binary-path: /app/gitea/gitea
           override: "${{ steps.release-info.outputs.override }}"
           verify-labels: "maintainer=contact@forgejo.org,org.opencontainers.image.version=${{ steps.release-info.outputs.version }}"
           verbose: ${{ vars.VERBOSE || secrets.VERBOSE || 'false' }}

From 54c8ac3e39fe81f8a9d7ea63c9f1594cccc3220d Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Thu, 17 Oct 2024 06:18:14 +0200
Subject: [PATCH 170/443] vars.SKIP_END_TO_END optionally skip tests when
 building a release

The end-to-end tests will always fail when more than one release is
broken. When trying to fix one, the other will get in the way and vice
versa. The only way to get out of this deadlock is to replace all
broken releases but one by doing the following on forgejo-integration:

* set SKIP_END_TO_END to true in the actions vars tab
* pushing a commit to the corresponding branch, fixing the problem
---
 .forgejo/workflows/build-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml
index 177e0ba8b5..e894d4c7e9 100644
--- a/.forgejo/workflows/build-release.yml
+++ b/.forgejo/workflows/build-release.yml
@@ -194,7 +194,7 @@ jobs:
           verbose: ${{ vars.VERBOSE || secrets.VERBOSE || 'false' }}
 
       - name: end-to-end tests
-        if: ${{ secrets.TOKEN != '' && vars.ROLE == 'forgejo-integration' }}
+        if: ${{ secrets.TOKEN != '' && vars.ROLE == 'forgejo-integration' && vars.SKIP_END_TO_END != 'true' }}
         uses: https://code.forgejo.org/actions/cascading-pr@v2
         with:
           origin-url: ${{ env.GITHUB_SERVER_URL }}

From a28e077e4dcdd9df976c624eb7e48b8373e3a419 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Thu, 17 Oct 2024 06:06:32 +0000
Subject: [PATCH 171/443] Update dependency @playwright/test to v1.48.1

---
 package-lock.json | 24 ++++++++++++------------
 package.json      |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ed24324ec7..dede6b5f90 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -62,7 +62,7 @@
       "devDependencies": {
         "@axe-core/playwright": "4.10.0",
         "@eslint-community/eslint-plugin-eslint-comments": "4.4.0",
-        "@playwright/test": "1.48.0",
+        "@playwright/test": "1.48.1",
         "@stoplight/spectral-cli": "6.13.1",
         "@stylistic/eslint-plugin-js": "2.9.0",
         "@stylistic/stylelint-plugin": "3.1.1",
@@ -3632,13 +3632,13 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.48.0",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.48.0.tgz",
-      "integrity": "sha512-W5lhqPUVPqhtc/ySvZI5Q8X2ztBOUgZ8LbAFy0JQgrXZs2xaILrUcNO3rQjwbLPfGK13+rZsDa1FpG+tqYkT5w==",
+      "version": "1.48.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.48.1.tgz",
+      "integrity": "sha512-s9RtWoxkOLmRJdw3oFvhFbs9OJS0BzrLUc8Hf6l2UdCNd1rqeEyD4BhCJkvzeEoD1FsK4mirsWwGerhVmYKtZg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.48.0"
+        "playwright": "1.48.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -12891,13 +12891,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.48.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.48.0.tgz",
-      "integrity": "sha512-qPqFaMEHuY/ug8o0uteYJSRfMGFikhUysk8ZvAtfKmUK3kc/6oNl/y3EczF8OFGYIi/Ex2HspMfzYArk6+XQSA==",
+      "version": "1.48.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.48.1.tgz",
+      "integrity": "sha512-j8CiHW/V6HxmbntOfyB4+T/uk08tBy6ph0MpBXwuoofkSnLmlfdYNNkFTYD6ofzzlSqLA1fwH4vwvVFvJgLN0w==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.48.0"
+        "playwright-core": "1.48.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -12910,9 +12910,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.48.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.48.0.tgz",
-      "integrity": "sha512-RBvzjM9rdpP7UUFrQzRwR8L/xR4HyC1QXMzGYTbf1vjw25/ya9NRAVnXi/0fvFopjebvyPzsmoK58xxeEOaVvA==",
+      "version": "1.48.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.48.1.tgz",
+      "integrity": "sha512-Yw/t4VAFX/bBr1OzwCuOMZkY1Cnb4z/doAFSwf4huqAGWmf9eMNjmK7NiOljCdLmxeRYcGPPmcDgU0zOlzP0YA==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
diff --git a/package.json b/package.json
index 162e05eb26..bba82ba8cb 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
   "devDependencies": {
     "@axe-core/playwright": "4.10.0",
     "@eslint-community/eslint-plugin-eslint-comments": "4.4.0",
-    "@playwright/test": "1.48.0",
+    "@playwright/test": "1.48.1",
     "@stoplight/spectral-cli": "6.13.1",
     "@stylistic/eslint-plugin-js": "2.9.0",
     "@stylistic/stylelint-plugin": "3.1.1",

From 663416f09706a5bb0ce3724f70492cac8bff24ec Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Thu, 17 Oct 2024 08:47:35 +0200
Subject: [PATCH 172/443] Update SVGs

---
 public/assets/img/svg/octicon-accessibility-inset.svg | 2 +-
 public/assets/img/svg/octicon-ai-model.svg            | 1 +
 public/assets/img/svg/octicon-bookmark-filled.svg     | 1 +
 public/assets/img/svg/octicon-bookmark-slash-fill.svg | 1 +
 public/assets/img/svg/octicon-file-media.svg          | 1 +
 public/assets/img/svg/octicon-home-fill.svg           | 1 +
 public/assets/img/svg/octicon-tab.svg                 | 1 +
 public/assets/img/svg/octicon-thumbsdown.svg          | 2 +-
 public/assets/img/svg/octicon-thumbsup.svg            | 2 +-
 9 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 public/assets/img/svg/octicon-ai-model.svg
 create mode 100644 public/assets/img/svg/octicon-bookmark-filled.svg
 create mode 100644 public/assets/img/svg/octicon-bookmark-slash-fill.svg
 create mode 100644 public/assets/img/svg/octicon-file-media.svg
 create mode 100644 public/assets/img/svg/octicon-home-fill.svg
 create mode 100644 public/assets/img/svg/octicon-tab.svg

diff --git a/public/assets/img/svg/octicon-accessibility-inset.svg b/public/assets/img/svg/octicon-accessibility-inset.svg
index 2a728a9cf7..1ace41537d 100644
--- a/public/assets/img/svg/octicon-accessibility-inset.svg
+++ b/public/assets/img/svg/octicon-accessibility-inset.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/assets/img/svg/octicon-ai-model.svg b/public/assets/img/svg/octicon-ai-model.svg
new file mode 100644
index 0000000000..57d127bfaa
--- /dev/null
+++ b/public/assets/img/svg/octicon-ai-model.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/assets/img/svg/octicon-bookmark-filled.svg b/public/assets/img/svg/octicon-bookmark-filled.svg
new file mode 100644
index 0000000000..3ac73a5113
--- /dev/null
+++ b/public/assets/img/svg/octicon-bookmark-filled.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/assets/img/svg/octicon-bookmark-slash-fill.svg b/public/assets/img/svg/octicon-bookmark-slash-fill.svg
new file mode 100644
index 0000000000..bce2a0f0fe
--- /dev/null
+++ b/public/assets/img/svg/octicon-bookmark-slash-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/assets/img/svg/octicon-file-media.svg b/public/assets/img/svg/octicon-file-media.svg
new file mode 100644
index 0000000000..6ee50b4d3e
--- /dev/null
+++ b/public/assets/img/svg/octicon-file-media.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/assets/img/svg/octicon-home-fill.svg b/public/assets/img/svg/octicon-home-fill.svg
new file mode 100644
index 0000000000..c030a0fddf
--- /dev/null
+++ b/public/assets/img/svg/octicon-home-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/assets/img/svg/octicon-tab.svg b/public/assets/img/svg/octicon-tab.svg
new file mode 100644
index 0000000000..71de3e1c35
--- /dev/null
+++ b/public/assets/img/svg/octicon-tab.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/assets/img/svg/octicon-thumbsdown.svg b/public/assets/img/svg/octicon-thumbsdown.svg
index f64457ec51..76a6c072b7 100644
--- a/public/assets/img/svg/octicon-thumbsdown.svg
+++ b/public/assets/img/svg/octicon-thumbsdown.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/assets/img/svg/octicon-thumbsup.svg b/public/assets/img/svg/octicon-thumbsup.svg
index 1afc4ba99b..64f5cf9d71 100644
--- a/public/assets/img/svg/octicon-thumbsup.svg
+++ b/public/assets/img/svg/octicon-thumbsup.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file

From a857007d65a5f8303cafe6f7b5c2e77cc703f3ce Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Thu, 17 Oct 2024 09:13:48 +0200
Subject: [PATCH 173/443] fix: Add server logging for OAuth server errors

Although an error was presented to the user about that there's an
internal server error, the error itself is never logged.

Relevant: https://codeberg.org/Codeberg/Community/issues/1675
---
 routers/web/auth/oauth.go | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go
index 0626157dd8..ee08b514b1 100644
--- a/routers/web/auth/oauth.go
+++ b/routers/web/auth/oauth.go
@@ -527,7 +527,7 @@ func AuthorizeOAuth(ctx *context.Context) {
 
 	grant, err := app.GetGrantByUserID(ctx, ctx.Doer.ID)
 	if err != nil {
-		handleServerError(ctx, form.State, form.RedirectURI)
+		handleServerError(ctx, form.State, form.RedirectURI, err)
 		return
 	}
 
@@ -536,12 +536,12 @@ func AuthorizeOAuth(ctx *context.Context) {
 	if app.ConfidentialClient && grant != nil {
 		code, err := grant.GenerateNewAuthorizationCode(ctx, form.RedirectURI, form.CodeChallenge, form.CodeChallengeMethod)
 		if err != nil {
-			handleServerError(ctx, form.State, form.RedirectURI)
+			handleServerError(ctx, form.State, form.RedirectURI, err)
 			return
 		}
 		redirect, err := code.GenerateRedirectURI(form.State)
 		if err != nil {
-			handleServerError(ctx, form.State, form.RedirectURI)
+			handleServerError(ctx, form.State, form.RedirectURI, err)
 			return
 		}
 		// Update nonce to reflect the new session
@@ -570,19 +570,19 @@ func AuthorizeOAuth(ctx *context.Context) {
 	// TODO document SESSION <=> FORM
 	err = ctx.Session.Set("client_id", app.ClientID)
 	if err != nil {
-		handleServerError(ctx, form.State, form.RedirectURI)
+		handleServerError(ctx, form.State, form.RedirectURI, err)
 		log.Error(err.Error())
 		return
 	}
 	err = ctx.Session.Set("redirect_uri", form.RedirectURI)
 	if err != nil {
-		handleServerError(ctx, form.State, form.RedirectURI)
+		handleServerError(ctx, form.State, form.RedirectURI, err)
 		log.Error(err.Error())
 		return
 	}
 	err = ctx.Session.Set("state", form.State)
 	if err != nil {
-		handleServerError(ctx, form.State, form.RedirectURI)
+		handleServerError(ctx, form.State, form.RedirectURI, err)
 		log.Error(err.Error())
 		return
 	}
@@ -619,7 +619,7 @@ func GrantApplicationOAuth(ctx *context.Context) {
 	}
 	grant, err := app.GetGrantByUserID(ctx, ctx.Doer.ID)
 	if err != nil {
-		handleServerError(ctx, form.State, form.RedirectURI)
+		handleServerError(ctx, form.State, form.RedirectURI, err)
 		return
 	}
 	if grant == nil {
@@ -654,12 +654,12 @@ func GrantApplicationOAuth(ctx *context.Context) {
 
 	code, err := grant.GenerateNewAuthorizationCode(ctx, form.RedirectURI, codeChallenge, codeChallengeMethod)
 	if err != nil {
-		handleServerError(ctx, form.State, form.RedirectURI)
+		handleServerError(ctx, form.State, form.RedirectURI, err)
 		return
 	}
 	redirect, err := code.GenerateRedirectURI(form.State)
 	if err != nil {
-		handleServerError(ctx, form.State, form.RedirectURI)
+		handleServerError(ctx, form.State, form.RedirectURI, err)
 		return
 	}
 	ctx.Redirect(redirect.String(), http.StatusSeeOther)
@@ -888,7 +888,8 @@ func handleAccessTokenError(ctx *context.Context, acErr AccessTokenError) {
 	ctx.JSON(http.StatusBadRequest, acErr)
 }
 
-func handleServerError(ctx *context.Context, state, redirectURI string) {
+func handleServerError(ctx *context.Context, state, redirectURI string, err error) {
+	log.Error("OAuth server error: %v", err)
 	handleAuthorizeError(ctx, AuthorizeError{
 		ErrorCode:        ErrorCodeServerError,
 		ErrorDescription: "A server error occurred",

From 19ca0394865495597a71df0bad9f93370af45092 Mon Sep 17 00:00:00 2001
From: 0ko <0ko@noreply.codeberg.org>
Date: Thu, 17 Oct 2024 13:24:41 +0000
Subject: [PATCH 174/443] feat(ui): set your_repositories as the default filter
 for org dashboards (#5593)

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5593
Reviewed-by: Michael Kriese 
Reviewed-by: Otto 
Reviewed-by: Shiny Nematoda 
---
 routers/web/user/home.go        | 24 +++++++++++++++++++-----
 tests/integration/issue_test.go | 17 +++++++++++++++++
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/routers/web/user/home.go b/routers/web/user/home.go
index 4b249e9696..c59dcf5c25 100644
--- a/routers/web/user/home.go
+++ b/routers/web/user/home.go
@@ -380,9 +380,11 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) {
 	}
 
 	var (
-		viewType   string
-		sortType   = ctx.FormString("sort")
-		filterMode int
+		viewType          string
+		sortType          = ctx.FormString("sort")
+		filterMode        int
+		defaultFilterMode int
+		defaultViewType   string
 	)
 
 	// Default to recently updated, unlike repository issues list
@@ -403,6 +405,18 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) {
 
 	// TODO: distinguish during routing
 
+	// Default to created_by on /pulls and /issues
+	// because it is most relevant to the user in the global context
+	if ctx.Org == nil || ctx.Org.Organization == nil {
+		defaultFilterMode = issues_model.FilterModeCreate
+		defaultViewType = "created_by"
+	} else {
+		// Default to your_repositories on /org/*/pulls and /org/*/issues
+		// because it is the most relevant to the user in the context of an org
+		defaultFilterMode = issues_model.FilterModeYourRepositories
+		defaultViewType = "your_repositories"
+	}
+
 	viewType = ctx.FormString("type")
 	switch viewType {
 	case "assigned":
@@ -418,8 +432,8 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) {
 	case "created_by":
 		fallthrough
 	default:
-		filterMode = issues_model.FilterModeCreate
-		viewType = "created_by"
+		filterMode = defaultFilterMode
+		viewType = defaultViewType
 	}
 
 	// --------------------------------------------------------------------------
diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go
index 781f9abd1a..4c0a64ad70 100644
--- a/tests/integration/issue_test.go
+++ b/tests/integration/issue_test.go
@@ -1302,6 +1302,23 @@ func TestIssueUserDashboard(t *testing.T) {
 	}
 }
 
+func TestIssueOrgDashboard(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+	session := loginUser(t, user.Name)
+
+	// assert 'your_repositories' is the default filter for org dashboards
+	const sel = ".dashboard .ui.list-header.dropdown .ui.menu a.active.item[href^='?type=your_repositories']"
+
+	for _, path := range []string{"/org/org3/issues", "/org/org3/pulls"} {
+		req := NewRequest(t, "GET", path)
+		resp := session.MakeRequest(t, req, http.StatusOK)
+		htmlDoc := NewHTMLParser(t, resp.Body)
+		htmlDoc.AssertElement(t, sel, true)
+	}
+}
+
 func TestIssueCount(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 

From d01393efd382927cfb78b9342dc6b446c658e322 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Thu, 17 Oct 2024 22:03:13 +0000
Subject: [PATCH 175/443] Update github.com/google/pprof digest to 017d972

---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 9175ee9891..bb49d16631 100644
--- a/go.mod
+++ b/go.mod
@@ -54,7 +54,7 @@ require (
 	github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85
 	github.com/golang-jwt/jwt/v5 v5.2.1
 	github.com/google/go-github/v64 v64.0.0
-	github.com/google/pprof v0.0.0-20240528025155-186aa0362fba
+	github.com/google/pprof v0.0.0-20241017200806-017d972448fc
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/feeds v1.2.0
 	github.com/gorilla/sessions v1.2.2
diff --git a/go.sum b/go.sum
index 66b5bcee2f..8fdd88b6dd 100644
--- a/go.sum
+++ b/go.sum
@@ -360,8 +360,8 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
-github.com/google/pprof v0.0.0-20240528025155-186aa0362fba h1:ql1qNgCyOB7iAEk8JTNM+zJrgIbnyCKX/wdlyPufP5g=
-github.com/google/pprof v0.0.0-20240528025155-186aa0362fba/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
+github.com/google/pprof v0.0.0-20241017200806-017d972448fc h1:NGyrhhFhwvRAZg02jnYVg3GBQy0qGBKmFQJwaPmpmxs=
+github.com/google/pprof v0.0.0-20241017200806-017d972448fc/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

From dad18d985aab71157ccc6108927d42e7d66a8f44 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Fri, 18 Oct 2024 00:05:06 +0000
Subject: [PATCH 176/443] Update module github.com/go-enry/go-enry/v2 to v2.9.1

---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index bb49d16631..0ea002b395 100644
--- a/go.mod
+++ b/go.mod
@@ -41,7 +41,7 @@ require (
 	github.com/go-chi/chi/v5 v5.1.0
 	github.com/go-chi/cors v1.2.1
 	github.com/go-co-op/gocron v1.37.0
-	github.com/go-enry/go-enry/v2 v2.8.9
+	github.com/go-enry/go-enry/v2 v2.9.1
 	github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e
 	github.com/go-git/go-git/v5 v5.11.0
 	github.com/go-ldap/ldap/v3 v3.4.6
diff --git a/go.sum b/go.sum
index 8fdd88b6dd..a838e09fbc 100644
--- a/go.sum
+++ b/go.sum
@@ -242,8 +242,8 @@ github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
 github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
 github.com/go-co-op/gocron v1.37.0 h1:ZYDJGtQ4OMhTLKOKMIch+/CY70Brbb1dGdooLEhh7b0=
 github.com/go-co-op/gocron v1.37.0/go.mod h1:3L/n6BkO7ABj+TrfSVXLRzsP26zmikL4ISkLQ0O8iNY=
-github.com/go-enry/go-enry/v2 v2.8.9 h1:vskZIABoxInDd5sHY49t+C/VgF8RWxRdRMoH5AdLqQU=
-github.com/go-enry/go-enry/v2 v2.8.9/go.mod h1:9yrj4ES1YrbNb1Wb7/PWYr2bpaCXUGRt0uafN0ISyG8=
+github.com/go-enry/go-enry/v2 v2.9.1 h1:G9iDteJ/Mc0F4Di5NeQknf83R2OkRbwY9cAYmcqVG6U=
+github.com/go-enry/go-enry/v2 v2.9.1/go.mod h1:9yrj4ES1YrbNb1Wb7/PWYr2bpaCXUGRt0uafN0ISyG8=
 github.com/go-enry/go-oniguruma v1.2.1 h1:k8aAMuJfMrqm/56SG2lV9Cfti6tC4x8673aHCcBk+eo=
 github.com/go-enry/go-oniguruma v1.2.1/go.mod h1:bWDhYP+S6xZQgiRL7wlTScFYBe023B6ilRZbCAD5Hf4=
 github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw=

From fcd1d3ed662967487164074bc9edb63085b875eb Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Fri, 18 Oct 2024 09:39:42 +0200
Subject: [PATCH 177/443] chore(release-notes): Update module
 github.com/go-enry/go-enry/v2 to v2.9.1

---
 release-notes/5601.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 release-notes/5601.md

diff --git a/release-notes/5601.md b/release-notes/5601.md
new file mode 100644
index 0000000000..9a186e880f
--- /dev/null
+++ b/release-notes/5601.md
@@ -0,0 +1,2 @@
+feat: Language detection in the repository learned about the following languages: [Java Template Engine](https://github.com/github-linguist/linguist/pull/6610), [Noir](https://github.com/github-linguist/linguist/pull/6432), [Cylc](https://github.com/github-linguist/linguist/pull/6832), [iCalendar](https://github.com/github-linguist/linguist/pull/6940), [vCard (aka. VCF: Virtual Contact File) and Variant Call Format (VCF)](https://github.com/github-linguist/linguist/pull/6941), [B4X](https://github.com/github-linguist/linguist/pull/6965), [Carbon](https://github.com/github-linguist/linguist/pull/7011), [LiveCode Script](https://github.com/github-linguist/linguist/pull/6833), [Dune (OCaml build system)](https://github.com/github-linguist/linguist/pull/6814).
+feat: The following extensions or filenames in a repository are associated with the matching language: [deno.lock](https://github.com/github-linguist/linguist/pull/6885), [uv.lock](https://github.com/github-linguist/linguist/pull/7006), [HOSTS.TXT](https://github.com/github-linguist/linguist/pull/7014), [.peggy](https://github.com/github-linguist/linguist/pull/7017), [.resource](https://github.com/github-linguist/linguist/pull/6500).

From dc5de38db01229c57c03c4c4bf0611089420a3a5 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Sat, 19 Oct 2024 00:03:40 +0000
Subject: [PATCH 178/443] Update code.forgejo.org/go-chi/session digest to
 2a99226

---
 go.mod | 4 ++--
 go.sum | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index 0ea002b395..f6f0512369 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@ require (
 	code.forgejo.org/forgejo/reply v1.0.2
 	code.forgejo.org/go-chi/cache v0.0.0-20240912103640-dcb08fba860d
 	code.forgejo.org/go-chi/captcha v0.0.0-20240905153133-df43b9250ed5
-	code.forgejo.org/go-chi/session v0.0.0-20240905153124-557e3de77cd2
+	code.forgejo.org/go-chi/session v0.0.0-20241017103059-2a992261fc26
 	code.gitea.io/actions-proto-go v0.4.0
 	code.gitea.io/gitea-vet v0.2.3
 	code.gitea.io/sdk/gitea v0.17.1
@@ -84,7 +84,7 @@ require (
 	github.com/opencontainers/image-spec v1.1.0
 	github.com/pquerna/otp v1.4.0
 	github.com/prometheus/client_golang v1.18.0
-	github.com/redis/go-redis/v9 v9.6.2
+	github.com/redis/go-redis/v9 v9.7.0
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/santhosh-tekuri/jsonschema/v6 v6.0.1
 	github.com/sassoftware/go-rpmutils v0.4.0
diff --git a/go.sum b/go.sum
index a838e09fbc..89e96325f1 100644
--- a/go.sum
+++ b/go.sum
@@ -14,8 +14,8 @@ code.forgejo.org/go-chi/cache v0.0.0-20240912103640-dcb08fba860d h1:nOu/2GX571t4
 code.forgejo.org/go-chi/cache v0.0.0-20240912103640-dcb08fba860d/go.mod h1:OVlZ/TqDYJ+RUJ+R+J+OLxtlyjo3pbjBeK7LAWAB+Vk=
 code.forgejo.org/go-chi/captcha v0.0.0-20240905153133-df43b9250ed5 h1:A7P1liXCpJBHEJ5KIDsF0ujnQ8FQ/aX1UixTW0vGrDQ=
 code.forgejo.org/go-chi/captcha v0.0.0-20240905153133-df43b9250ed5/go.mod h1:YLOsiln/arX3egGtxG4QNp49G2CIqP9pqD2VL56obLc=
-code.forgejo.org/go-chi/session v0.0.0-20240905153124-557e3de77cd2 h1:Ht2myT1qf4YbLcO/W3pQaWTn6PPdKz0tM5tnqMOz/Cg=
-code.forgejo.org/go-chi/session v0.0.0-20240905153124-557e3de77cd2/go.mod h1:oJs2Q5P5I7bzJGsgHt6fVzh2jlIr/9SLAvz/ZXb87BI=
+code.forgejo.org/go-chi/session v0.0.0-20241017103059-2a992261fc26 h1:6XCLWu8A0nPM862Uh68kQmxsBsaQNfPPFwYjzG8M8QE=
+code.forgejo.org/go-chi/session v0.0.0-20241017103059-2a992261fc26/go.mod h1:lS76JFHZqGXYJTBHqwZ910UG046hIXAaYIN6J0Lf8sI=
 code.gitea.io/actions-proto-go v0.4.0 h1:OsPBPhodXuQnsspG1sQ4eRE1PeoZyofd7+i73zCwnsU=
 code.gitea.io/actions-proto-go v0.4.0/go.mod h1:mn7Wkqz6JbnTOHQpot3yDeHx+O5C9EGhMEE+htvHBas=
 code.gitea.io/gitea-vet v0.2.3 h1:gdFmm6WOTM65rE8FUBTRzeQZYzXePKSSB1+r574hWwI=
@@ -578,8 +578,8 @@ github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqSc
 github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ=
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
-github.com/redis/go-redis/v9 v9.6.2 h1:w0uvkRbc9KpgD98zcvo5IrVUsn0lXpRMuhNgiHDJzdk=
-github.com/redis/go-redis/v9 v9.6.2/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA=
+github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E=
+github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rhysd/actionlint v1.6.27 h1:xxwe8YmveBcC8lydW6GoHMGmB6H/MTqUU60F2p10wjw=

From 453b07706a7a86c75fcfda21502eb9dccc2b28e5 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Sat, 19 Oct 2024 12:03:54 +0000
Subject: [PATCH 179/443] Update module github.com/prometheus/client_golang to
 v1.20.5

---
 go.mod |  9 +++++----
 go.sum | 20 ++++++++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/go.mod b/go.mod
index f6f0512369..f6758082bb 100644
--- a/go.mod
+++ b/go.mod
@@ -83,7 +83,7 @@ require (
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.1.0
 	github.com/pquerna/otp v1.4.0
-	github.com/prometheus/client_golang v1.18.0
+	github.com/prometheus/client_golang v1.20.5
 	github.com/redis/go-redis/v9 v9.7.0
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/santhosh-tekuri/jsonschema/v6 v6.0.1
@@ -233,6 +233,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450 // indirect
 	github.com/mschoch/smat v0.2.0 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/nwaples/rardecode v1.1.3 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
@@ -243,9 +244,9 @@ require (
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_model v0.5.0 // indirect
-	github.com/prometheus/common v0.46.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.55.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/rhysd/actionlint v1.6.27 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
diff --git a/go.sum b/go.sum
index 89e96325f1..6760f4bce7 100644
--- a/go.sum
+++ b/go.sum
@@ -464,6 +464,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
@@ -521,6 +523,8 @@ github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
 github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
 github.com/msteinert/pam v1.2.0 h1:mYfjlvN2KYs2Pb9G6nb/1f/nPfAttT/Jee5Sq9r3bGE=
 github.com/msteinert/pam v1.2.0/go.mod h1:d2n0DCUK8rGecChV3JzvmsDjOY4R7AYbsNxAT+ftQl0=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4=
 github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
 github.com/niklasfasching/go-org v1.7.0 h1:vyMdcMWWTe/XmANk19F4k8XGBYg0GQ/gJGMimOjGMek=
@@ -570,14 +574,14 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pquerna/otp v1.4.0 h1:wZvl1TIVxKRThZIBiwOOHOGP/1+nZyWBil9Y2XNEDzg=
 github.com/pquerna/otp v1.4.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg=
-github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
-github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
-github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
-github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
-github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqScV0Y=
-github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ=
-github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
-github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
+github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
+github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
+github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
+github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
+github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
+github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
+github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E=
 github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=

From 74403d1f0fc7da1f6a13cee870fe92b7dce75dee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorben=20G=C3=BCnther?= 
Date: Tue, 24 Sep 2024 22:55:30 +0200
Subject: [PATCH 180/443] mail issue: Display issue type in email header

Currently notification emails for Pull Requests or Issues are
indistinguishable at first glance. This adds the type ("PR" or "Issue")
before the index number.
---
 services/mailer/mail_issue.go |  5 ++++-
 services/mailer/mail_test.go  | 14 +++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/services/mailer/mail_issue.go b/services/mailer/mail_issue.go
index fab3315be2..1bb6fdc7a3 100644
--- a/services/mailer/mail_issue.go
+++ b/services/mailer/mail_issue.go
@@ -19,7 +19,10 @@ import (
 )
 
 func fallbackMailSubject(issue *issues_model.Issue) string {
-	return fmt.Sprintf("[%s] %s (#%d)", issue.Repo.FullName(), issue.Title, issue.Index)
+	if issue.IsPull {
+		return fmt.Sprintf("[%s] %s (PR #%d)", issue.Repo.FullName(), issue.Title, issue.Index)
+	}
+	return fmt.Sprintf("[%s] %s (Issue #%d)", issue.Repo.FullName(), issue.Title, issue.Index)
 }
 
 type mailCommentContext struct {
diff --git a/services/mailer/mail_test.go b/services/mailer/mail_test.go
index 1a9bbc9f16..b2768a2bad 100644
--- a/services/mailer/mail_test.go
+++ b/services/mailer/mail_test.go
@@ -138,7 +138,7 @@ func TestComposeIssueMessage(t *testing.T) {
 	references := gomailMsg.GetHeader("References")
 
 	assert.Len(t, mailto, 1, "exactly one recipient is expected in the To field")
-	assert.Equal(t, "[user2/repo1] issue1 (#1)", subject[0])
+	assert.Equal(t, "[user2/repo1] issue1 (Issue #1)", subject[0])
 	assert.Equal(t, "", inReplyTo[0], "In-Reply-To header doesn't match")
 	assert.Equal(t, "", references[0], "References header doesn't match")
 	assert.Equal(t, "", messageID[0], "Message-ID header doesn't match")
@@ -293,7 +293,7 @@ func TestTemplateSelection(t *testing.T) {
 		Issue:   issue, Doer: doer, ActionType: activities_model.ActionCloseIssue,
 		Content: "test body", Comment: comment,
 	}, recipients, false, "TestTemplateSelection")
-	expect(t, msg, "Re: [user2/repo1] issue1 (#1)", "issue/close/body")
+	expect(t, msg, "Re: [user2/repo1] issue1 (Issue #1)", "issue/close/body")
 }
 
 func TestTemplateServices(t *testing.T) {
@@ -338,7 +338,7 @@ func TestTemplateServices(t *testing.T) {
 	expect(t, issue, comment, doer, activities_model.ActionCommentIssue, true,
 		"{{.FallbackSubject}}",
 		"//{{.SubjectPrefix}}//",
-		"Re: [user2/repo1] issue1 (#1)",
+		"Re: [user2/repo1] issue1 (Issue #1)",
 		"//Re: //")
 }
 
@@ -538,3 +538,11 @@ func TestFromDisplayName(t *testing.T) {
 		assert.EqualValues(t, "Mister X (by Code IT on [code.it])", fromDisplayName(&user_model.User{FullName: "Mister X", Name: "tmp"}))
 	})
 }
+
+func TestFallbackSubjectType(t *testing.T) {
+	_, _, issue, _ := prepareMailerTest(t)
+	assert.Contains(t, fallbackMailSubject(issue), "Issue")
+	_, _, pr, _ := prepareMailerTest(t)
+	pr.IsPull = true
+	assert.Contains(t, fallbackMailSubject(pr), "PR")
+}

From 8c8b31f304ae0d8dfc942b21d3b4da862e73122e Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Sat, 19 Oct 2024 22:01:35 +0200
Subject: [PATCH 181/443] fix: Don't double escape delete branch text

- Don't double escape the 'Delete branch "$BRANCH"' text. `Locale.Tr`
escapes the argument already and Vue does too by default.
- Let Vue escape the text and add a unit test ensuring that it escapes.
- Resolves #5582
---
 templates/repo/issue/view_content/pull.tmpl   |  2 +-
 .../components/PullRequestMergeForm.test.js   | 34 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 web_src/js/components/PullRequestMergeForm.test.js

diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index ca3c6f82e8..bbbb8bf720 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -214,7 +214,7 @@
 							const mergeForm = {
 								'baseLink': {{.Link}},
 								'textCancel': {{ctx.Locale.Tr "cancel"}},
-								'textDeleteBranch': {{ctx.Locale.Tr "repo.branch.delete" .HeadTarget}},
+								'textDeleteBranch': {{ctx.Locale.TrString "repo.branch.delete" .HeadTarget}},
 								'textAutoMergeButtonWhenSucceed': {{ctx.Locale.Tr "repo.pulls.auto_merge_button_when_succeed"}},
 								'textAutoMergeWhenSucceed': {{ctx.Locale.Tr "repo.pulls.auto_merge_when_succeed"}},
 								'textAutoMergeCancelSchedule': {{ctx.Locale.Tr "repo.pulls.auto_merge_cancel_schedule"}},
diff --git a/web_src/js/components/PullRequestMergeForm.test.js b/web_src/js/components/PullRequestMergeForm.test.js
new file mode 100644
index 0000000000..7b856e0b88
--- /dev/null
+++ b/web_src/js/components/PullRequestMergeForm.test.js
@@ -0,0 +1,34 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+import {flushPromises, mount} from '@vue/test-utils';
+import PullRequestMergeForm from './PullRequestMergeForm.vue';
+
+async function renderMergeForm(branchName) {
+  window.config.pageData.pullRequestMergeForm = {
+    textDeleteBranch: `Delete branch "${branchName}"`,
+    textDoMerge: 'Merge',
+    defaultMergeStyle: 'merge',
+    isPullBranchDeletable: true,
+    canMergeNow: true,
+    mergeStyles: [{
+      'name': 'merge',
+      'allowed': true,
+      'textDoMerge': 'Merge',
+      'mergeTitleFieldText': 'Merge PR',
+      'mergeMessageFieldText': 'Description',
+      'hideAutoMerge': 'Hide this message',
+    }],
+  };
+  const mergeform = mount(PullRequestMergeForm);
+  mergeform.get('.merge-button').trigger('click');
+  await flushPromises();
+  return mergeform;
+}
+
+test('renders escaped branch name', async () => {
+  let mergeform = await renderMergeForm('evil');
+  expect(mergeform.get('label[for="delete-branch-after-merge"]').text()).toBe('Delete branch "evil"');
+
+  mergeform = await renderMergeForm('');
+  expect(mergeform.get('label[for="delete-branch-after-merge"]').text()).toBe('Delete branch ""');
+});

From 0b92d6e0badaa8ad490256b770064fdcf5990cdf Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Sat, 19 Oct 2024 22:40:08 +0200
Subject: [PATCH 182/443] feat: Create temporary user helper function

- Add a helper function that creates and log into a temporary user. So
it doesn't affect other users and tests and the test can more easily be
retried with a 'fresh' state instead of a broken state.
- Adjust the Webauthn test to make use of this.
- Relevant: #5291, #5394
---
 tests/e2e/utils_e2e.js         | 21 +++++++++++++++++++++
 tests/e2e/webauthn.test.e2e.js | 12 ++++--------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/tests/e2e/utils_e2e.js b/tests/e2e/utils_e2e.js
index 98d762fbcc..6afbe43b86 100644
--- a/tests/e2e/utils_e2e.js
+++ b/tests/e2e/utils_e2e.js
@@ -80,3 +80,24 @@ export async function save_visual(page) {
     });
   }
 }
+
+// Create a temporary user and login to that user and store session info.
+// This should ideally run on a per test basis.
+export async function create_temp_user(browser, workerInfo, request) {
+  const username = globalThis.crypto.randomUUID();
+  const newUser = await request.post(`/api/v1/admin/users`, {
+    headers: {
+      'Content-Type': 'application/json',
+      'Authorization': `Basic ${btoa(`user1:${LOGIN_PASSWORD}`)}`,
+    },
+    data: {
+      username,
+      email: `${username}@host.invalid`,
+      password: LOGIN_PASSWORD,
+      must_change_password: false,
+    },
+  });
+  expect(newUser.ok()).toBeTruthy();
+
+  return {context: await login_user(browser, workerInfo, username), username};
+}
diff --git a/tests/e2e/webauthn.test.e2e.js b/tests/e2e/webauthn.test.e2e.js
index f98cd47126..1f645ffea2 100644
--- a/tests/e2e/webauthn.test.e2e.js
+++ b/tests/e2e/webauthn.test.e2e.js
@@ -9,15 +9,11 @@
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test, login_user, load_logged_in_context} from './utils_e2e.js';
+import {test, create_temp_user} from './utils_e2e.js';
 
-test.beforeAll(async ({browser}, workerInfo) => {
-  await login_user(browser, workerInfo, 'user40');
-});
-
-test('WebAuthn register & login flow', async ({browser}, workerInfo) => {
+test('WebAuthn register & login flow', async ({browser, request}, workerInfo) => {
   test.skip(workerInfo.project.name !== 'chromium', 'Uses Chrome protocol');
-  const context = await load_logged_in_context(browser, workerInfo, 'user40');
+  const {context, username} = await create_temp_user(browser, workerInfo, request);
   const page = await context.newPage();
 
   // Register a security key.
@@ -51,7 +47,7 @@ test('WebAuthn register & login flow', async ({browser}, workerInfo) => {
   response = await page.goto('/user/login');
   await expect(response?.status()).toBe(200);
 
-  await page.getByLabel('Username or email address').fill('user40');
+  await page.getByLabel('Username or email address').fill(username);
   await page.getByLabel('Password').fill('password');
   await page.getByRole('button', {name: 'Sign in'}).click();
   await page.waitForURL(`${workerInfo.project.use.baseURL}/user/webauthn`);

From df38c41c7a55035a8fe04a500d7fa0cfadc62ef1 Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Sat, 19 Oct 2024 14:11:38 +0200
Subject: [PATCH 183/443] fix: Add `recentupdated` as recognized sort option

- Add `recentupdated` to the `OrderByMap`.
- Add integration testing for organization and user repository sorting.
- Resolves #5612
- Regression from 12e23ee19916f4ca3f10916be8bb8666fd0d6f58 where the
`recentupdated` case was not added to the map, but was handled
seperately as a fallback. The regression came into affect when
5a0bc357992dad725b0163105f8b6464ec130a21 also relied on this map but
didn't handle the `recentupdated` case.
---
 models/fixtures/repository.yml              | 14 +++++++++++-
 models/organization/org_test.go             |  8 +++----
 models/repo/search.go                       |  1 +
 tests/integration/last_updated_time_test.go |  3 +--
 tests/integration/org_test.go               |  1 +
 tests/integration/user_test.go              | 24 +++++++++++++++++++++
 6 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/models/fixtures/repository.yml b/models/fixtures/repository.yml
index f783d58187..51f526f889 100644
--- a/models/fixtures/repository.yml
+++ b/models/fixtures/repository.yml
@@ -91,6 +91,8 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  created_unix: 1700000001
+  updated_unix: 1700000001
 
 -
   id: 4
@@ -152,6 +154,8 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  created_unix: 1700000002
+  updated_unix: 1700000002
 
 -
   id: 6
@@ -182,6 +186,8 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  created_unix: 1710000001
+  updated_unix: 1710000001
 
 -
   id: 7
@@ -212,6 +218,8 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  created_unix: 1710000003
+  updated_unix: 1710000003
 
 -
   id: 8
@@ -242,6 +250,8 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  created_unix: 1710000002
+  updated_unix: 1710000002
 
 -
   id: 9
@@ -968,6 +978,8 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  created_unix: 1700000003
+  updated_unix: 1700000003
 
 -
   id: 33
@@ -1811,4 +1823,4 @@
   template_id: 0
   size: 0
   is_fsck_enabled: true
-  close_issues_via_commit_in_any_branch: false
\ No newline at end of file
+  close_issues_via_commit_in_any_branch: false
diff --git a/models/organization/org_test.go b/models/organization/org_test.go
index fa4c512189..39ccc2d466 100644
--- a/models/organization/org_test.go
+++ b/models/organization/org_test.go
@@ -299,8 +299,8 @@ func TestAccessibleReposEnv_RepoIDs(t *testing.T) {
 		require.NoError(t, err)
 		assert.Equal(t, expectedRepoIDs, repoIDs)
 	}
-	testSuccess(2, []int64{3, 5, 32})
-	testSuccess(4, []int64{3, 32})
+	testSuccess(2, []int64{32, 5, 3})
+	testSuccess(4, []int64{32, 3})
 }
 
 func TestAccessibleReposEnv_Repos(t *testing.T) {
@@ -318,8 +318,8 @@ func TestAccessibleReposEnv_Repos(t *testing.T) {
 		}
 		assert.Equal(t, expectedRepos, repos)
 	}
-	testSuccess(2, []int64{3, 5, 32})
-	testSuccess(4, []int64{3, 32})
+	testSuccess(2, []int64{32, 5, 3})
+	testSuccess(4, []int64{32, 3})
 }
 
 func TestAccessibleReposEnv_MirrorRepos(t *testing.T) {
diff --git a/models/repo/search.go b/models/repo/search.go
index a73d9fc215..ffb8e26745 100644
--- a/models/repo/search.go
+++ b/models/repo/search.go
@@ -36,6 +36,7 @@ var OrderByMap = map[string]map[string]db.SearchOrderBy{
 var OrderByFlatMap = map[string]db.SearchOrderBy{
 	"newest":                OrderByMap["desc"]["created"],
 	"oldest":                OrderByMap["asc"]["created"],
+	"recentupdate":          OrderByMap["desc"]["updated"],
 	"leastupdate":           OrderByMap["asc"]["updated"],
 	"reversealphabetically": OrderByMap["desc"]["alpha"],
 	"alphabetically":        OrderByMap["asc"]["alpha"],
diff --git a/tests/integration/last_updated_time_test.go b/tests/integration/last_updated_time_test.go
index e7bf3a4a07..54c0eeb629 100644
--- a/tests/integration/last_updated_time_test.go
+++ b/tests/integration/last_updated_time_test.go
@@ -16,11 +16,10 @@ func TestRepoLastUpdatedTime(t *testing.T) {
 		user := "user2"
 		session := loginUser(t, user)
 
-		req := NewRequest(t, "GET", path.Join("explore", "repos"))
+		req := NewRequest(t, "GET", "/explore/repos?q=repo1")
 		resp := session.MakeRequest(t, req, http.StatusOK)
 		doc := NewHTMLParser(t, resp.Body)
 		node := doc.doc.Find(".flex-item-body").First()
-
 		{
 			buf := ""
 			findTextNonNested(t, node, &buf)
diff --git a/tests/integration/org_test.go b/tests/integration/org_test.go
index 912ad0ca0b..74579d7d51 100644
--- a/tests/integration/org_test.go
+++ b/tests/integration/org_test.go
@@ -28,6 +28,7 @@ func TestOrgRepos(t *testing.T) {
 		users = []string{"user1", "user2"}
 		cases = map[string][]string{
 			"alphabetically":        {"repo21", "repo3", "repo5"},
+			"recentupdate":          {"repo21", "repo5", "repo3"},
 			"reversealphabetically": {"repo5", "repo3", "repo21"},
 		}
 	)
diff --git a/tests/integration/user_test.go b/tests/integration/user_test.go
index 73976b9a35..5f803b032d 100644
--- a/tests/integration/user_test.go
+++ b/tests/integration/user_test.go
@@ -819,3 +819,27 @@ func TestUserTOTPEnrolled(t *testing.T) {
 		assert.True(t, called)
 	})
 }
+
+func TestUserRepos(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	cases := map[string][]string{
+		"alphabetically":        {"repo6", "repo7", "repo8"},
+		"recentupdate":          {"repo7", "repo8", "repo6"},
+		"reversealphabetically": {"repo8", "repo7", "repo6"},
+	}
+
+	session := loginUser(t, "user10")
+	for sortBy, repos := range cases {
+		req := NewRequest(t, "GET", "/user10?sort="+sortBy)
+		resp := session.MakeRequest(t, req, http.StatusOK)
+
+		htmlDoc := NewHTMLParser(t, resp.Body)
+
+		sel := htmlDoc.doc.Find("a.name")
+		assert.Len(t, repos, len(sel.Nodes))
+		for i := 0; i < len(repos); i++ {
+			assert.EqualValues(t, repos[i], strings.TrimSpace(sel.Eq(i).Text()))
+		}
+	}
+}

From 89446e60a6e7ec3441f0c480164c09851ae54ce7 Mon Sep 17 00:00:00 2001
From: Zettat123 
Date: Mon, 14 Oct 2024 03:58:13 +0800
Subject: [PATCH 184/443] Support migrating GitHub/GitLab PR draft status
 (#32242)

Resolve #32196

(cherry picked from commit 74664b08a004393ce013e872e47901f52645b65a)
---
 modules/migration/pullrequest.go      | 1 +
 services/migrations/gitea_uploader.go | 7 ++++++-
 services/migrations/github.go         | 1 +
 services/migrations/gitlab.go         | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/migration/pullrequest.go b/modules/migration/pullrequest.go
index 1435991bd2..fbfdff0315 100644
--- a/modules/migration/pullrequest.go
+++ b/modules/migration/pullrequest.go
@@ -37,6 +37,7 @@ type PullRequest struct {
 	ForeignIndex   int64
 	Context        DownloaderContext `yaml:"-"`
 	EnsuredSafe    bool              `yaml:"ensured_safe"`
+	IsDraft        bool              `yaml:"is_draft"`
 }
 
 func (p *PullRequest) GetLocalIndex() int64          { return p.Number }
diff --git a/services/migrations/gitea_uploader.go b/services/migrations/gitea_uploader.go
index 3ba4ca203b..2076348535 100644
--- a/services/migrations/gitea_uploader.go
+++ b/services/migrations/gitea_uploader.go
@@ -760,10 +760,15 @@ func (g *GiteaLocalUploader) newPullRequest(pr *base.PullRequest) (*issues_model
 		pr.Updated = pr.Created
 	}
 
+	prTitle := pr.Title
+	if pr.IsDraft && !issues_model.HasWorkInProgressPrefix(pr.Title) {
+		prTitle = fmt.Sprintf("%s %s", setting.Repository.PullRequest.WorkInProgressPrefixes[0], pr.Title)
+	}
+
 	issue := issues_model.Issue{
 		RepoID:      g.repo.ID,
 		Repo:        g.repo,
-		Title:       pr.Title,
+		Title:       prTitle,
 		Index:       pr.Number,
 		Content:     pr.Content,
 		MilestoneID: milestoneID,
diff --git a/services/migrations/github.go b/services/migrations/github.go
index 44553e1802..3b127438d0 100644
--- a/services/migrations/github.go
+++ b/services/migrations/github.go
@@ -737,6 +737,7 @@ func (g *GithubDownloaderV3) GetPullRequests(page, perPage int) ([]*base.PullReq
 			PatchURL:     pr.GetPatchURL(), // see below for SECURITY related issues here
 			Reactions:    reactions,
 			ForeignIndex: int64(*pr.Number),
+			IsDraft:      pr.GetDraft(),
 		})
 
 		// SECURITY: Ensure that the PR is safe
diff --git a/services/migrations/gitlab.go b/services/migrations/gitlab.go
index 1639a34862..da56d2a175 100644
--- a/services/migrations/gitlab.go
+++ b/services/migrations/gitlab.go
@@ -723,6 +723,7 @@ func (g *GitlabDownloader) GetPullRequests(page, perPage int) ([]*base.PullReque
 			PatchURL:     pr.WebURL + ".patch",
 			ForeignIndex: int64(pr.IID),
 			Context:      gitlabIssueContext{IsMergeRequest: true},
+			IsDraft:      pr.Draft,
 		})
 
 		// SECURITY: Ensure that the PR is safe

From e8700cee612f0aa769dc6929772d9b04c6c21807 Mon Sep 17 00:00:00 2001
From: Zettat123 
Date: Mon, 14 Oct 2024 04:28:32 +0800
Subject: [PATCH 185/443] Update scheduled tasks even if changes are pushed by
 "ActionsUser" (#32246)

Fix #32219

---------

Co-authored-by: delvh 
(cherry picked from commit 81aec6d621a3ea0dfb02d3b4d20b9be77c30c6ab)
---
 services/actions/notifier_helper.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/services/actions/notifier_helper.go b/services/actions/notifier_helper.go
index c4bf6955ee..0a1dbb162d 100644
--- a/services/actions/notifier_helper.go
+++ b/services/actions/notifier_helper.go
@@ -119,11 +119,20 @@ func (input *notifyInput) Notify(ctx context.Context) {
 }
 
 func notify(ctx context.Context, input *notifyInput) error {
+	shouldDetectSchedules := input.Event == webhook_module.HookEventPush && input.Ref.BranchName() == input.Repo.DefaultBranch
 	if input.Doer.IsActions() {
 		// avoiding triggering cyclically, for example:
 		// a comment of an issue will trigger the runner to add a new comment as reply,
 		// and the new comment will trigger the runner again.
 		log.Debug("ignore executing %v for event %v whose doer is %v", getMethod(ctx), input.Event, input.Doer.Name)
+
+		// we should update schedule tasks in this case, because
+		//   1. schedule tasks cannot be triggered by other events, so cyclic triggering will not occur
+		//   2. some schedule tasks may update the repo periodically, so the refs of schedule tasks need to be updated
+		if shouldDetectSchedules {
+			return DetectAndHandleSchedules(ctx, input.Repo)
+		}
+
 		return nil
 	}
 	if input.Repo.IsEmpty || input.Repo.IsArchived {
@@ -182,7 +191,6 @@ func notify(ctx context.Context, input *notifyInput) error {
 
 	var detectedWorkflows []*actions_module.DetectedWorkflow
 	actionsConfig := input.Repo.MustGetUnit(ctx, unit_model.TypeActions).ActionsConfig()
-	shouldDetectSchedules := input.Event == webhook_module.HookEventPush && input.Ref.BranchName() == input.Repo.DefaultBranch
 	workflows, schedules, err := actions_module.DetectWorkflows(gitRepo, commit,
 		input.Event,
 		input.Payload,

From 3aaf6f72d6585b26ea7697d790ff0cb290430522 Mon Sep 17 00:00:00 2001
From: a1012112796 <1012112796@qq.com>
Date: Tue, 15 Oct 2024 05:23:20 +0800
Subject: [PATCH 186/443] make `show stats` work when only one file changed
 (#32244)

fix https://github.com/go-gitea/gitea/issues/32226

in https://github.com/go-gitea/gitea/pull/27775 , it do some changes to
only show diff file tree when more than one file changed. But looks it
also break the `diff-file-list` logic, which looks not expected change.
so try fix it.

/cc @silverwind

example view:

![image](https://github.com/user-attachments/assets/281e9c4f-a269-4d36-94eb-a132058aea87)

Signed-off-by: a1012112796 <1012112796@qq.com>
(cherry picked from commit c4b2808b896dd86323c6a0d119c8cf24752d4d8a)
Signed-off-by: Gergely Nagy 

Conflicts:
	- web_src/js/features/repo-diff-filetree.js
	  web_src/js/features/repo-diff.js
	  Conflicts resolved by manually applying the changes.
---
 web_src/js/features/repo-diff-filetree.js | 2 ++
 web_src/js/features/repo-diff.js          | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/web_src/js/features/repo-diff-filetree.js b/web_src/js/features/repo-diff-filetree.js
index 5dd2c42e74..52d7cf030d 100644
--- a/web_src/js/features/repo-diff-filetree.js
+++ b/web_src/js/features/repo-diff-filetree.js
@@ -8,7 +8,9 @@ export function initDiffFileTree() {
 
   const fileTreeView = createApp(DiffFileTree);
   fileTreeView.mount(el);
+}
 
+export function initDiffFileList() {
   const fileListElement = document.getElementById('diff-file-list');
   if (!fileListElement) return;
 
diff --git a/web_src/js/features/repo-diff.js b/web_src/js/features/repo-diff.js
index e5723af046..1c06933e89 100644
--- a/web_src/js/features/repo-diff.js
+++ b/web_src/js/features/repo-diff.js
@@ -1,7 +1,7 @@
 import $ from 'jquery';
 import {initCompReactionSelector} from './comp/ReactionSelector.js';
 import {initRepoIssueContentHistory} from './repo-issue-content.js';
-import {initDiffFileTree} from './repo-diff-filetree.js';
+import {initDiffFileTree, initDiffFileList} from './repo-diff-filetree.js';
 import {initDiffCommitSelect} from './repo-diff-commitselect.js';
 import {validateTextareaNonEmpty} from './comp/ComboMarkdownEditor.js';
 import {initViewedCheckboxListenerFor, countAndUpdateViewedFiles, initExpandAndCollapseFilesButton} from './pull-view-file.js';
@@ -223,6 +223,7 @@ export function initRepoDiffView() {
   initRepoDiffConversationForm();
   if (!$('#diff-file-list').length) return;
   initDiffFileTree();
+  initDiffFileList();
   initDiffCommitSelect();
   initRepoDiffShowMore();
   initRepoDiffReviewButton();

From c3741d7fb0114691da73f00ae0ac9dced87e884d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=88=E7=AC=91=E9=A3=8E=E7=94=9F=E9=97=B4?=
 
Date: Wed, 16 Oct 2024 17:10:05 +0800
Subject: [PATCH 187/443] Support requested_reviewers data in comment webhook
 events (#26178)

close #25833

Currently, the information for "requested_reviewers" is only included in
the webhook event for reviews. I would like to suggest adding this
information to the webhook event for "PullRequest comment" as well, as
they both pertain to the "PullRequest" event.

Also, The reviewer information for the Pull Request is not displayed
when it is approved or rejected.

(cherry picked from commit d50ed0abf731a10741831d4b6dd54791e3e567ec)
---
 modules/structs/hook.go      | 15 ++++----
 services/webhook/notifier.go | 74 ++++++++++++++++++++----------------
 2 files changed, 50 insertions(+), 39 deletions(-)

diff --git a/modules/structs/hook.go b/modules/structs/hook.go
index b7f8861b76..56afed6ee6 100644
--- a/modules/structs/hook.go
+++ b/modules/structs/hook.go
@@ -221,13 +221,14 @@ const (
 
 // IssueCommentPayload represents a payload information of issue comment event.
 type IssueCommentPayload struct {
-	Action     HookIssueCommentAction `json:"action"`
-	Issue      *Issue                 `json:"issue"`
-	Comment    *Comment               `json:"comment"`
-	Changes    *ChangesPayload        `json:"changes,omitempty"`
-	Repository *Repository            `json:"repository"`
-	Sender     *User                  `json:"sender"`
-	IsPull     bool                   `json:"is_pull"`
+	Action      HookIssueCommentAction `json:"action"`
+	Issue       *Issue                 `json:"issue"`
+	PullRequest *PullRequest           `json:"pull_request,omitempty"`
+	Comment     *Comment               `json:"comment"`
+	Changes     *ChangesPayload        `json:"changes,omitempty"`
+	Repository  *Repository            `json:"repository"`
+	Sender      *User                  `json:"sender"`
+	IsPull      bool                   `json:"is_pull"`
 }
 
 // JSONPayload implements Payload
diff --git a/services/webhook/notifier.go b/services/webhook/notifier.go
index a9b3422653..8bfd03024f 100644
--- a/services/webhook/notifier.go
+++ b/services/webhook/notifier.go
@@ -59,7 +59,7 @@ func (m *webhookNotifier) IssueClearLabels(ctx context.Context, doer *user_model
 		err = PrepareWebhooks(ctx, EventSource{Repository: issue.Repo}, webhook_module.HookEventPullRequestLabel, &api.PullRequestPayload{
 			Action:      api.HookIssueLabelCleared,
 			Index:       issue.Index,
-			PullRequest: convert.ToAPIPullRequest(ctx, issue.PullRequest, nil),
+			PullRequest: convert.ToAPIPullRequest(ctx, issue.PullRequest, doer),
 			Repository:  convert.ToRepo(ctx, issue.Repo, permission),
 			Sender:      convert.ToUser(ctx, doer, nil),
 		})
@@ -150,7 +150,7 @@ func (m *webhookNotifier) IssueChangeAssignee(ctx context.Context, doer *user_mo
 		}
 		apiPullRequest := &api.PullRequestPayload{
 			Index:       issue.Index,
-			PullRequest: convert.ToAPIPullRequest(ctx, issue.PullRequest, nil),
+			PullRequest: convert.ToAPIPullRequest(ctx, issue.PullRequest, doer),
 			Repository:  convert.ToRepo(ctx, issue.Repo, permission),
 			Sender:      convert.ToUser(ctx, doer, nil),
 		}
@@ -201,7 +201,7 @@ func (m *webhookNotifier) IssueChangeTitle(ctx context.Context, doer *user_model
 					From: oldTitle,
 				},
 			},
-			PullRequest: convert.ToAPIPullRequest(ctx, issue.PullRequest, nil),
+			PullRequest: convert.ToAPIPullRequest(ctx, issue.PullRequest, doer),
 			Repository:  convert.ToRepo(ctx, issue.Repo, permission),
 			Sender:      convert.ToUser(ctx, doer, nil),
 		})
@@ -236,7 +236,7 @@ func (m *webhookNotifier) IssueChangeStatus(ctx context.Context, doer *user_mode
 		// Merge pull request calls issue.changeStatus so we need to handle separately.
 		apiPullRequest := &api.PullRequestPayload{
 			Index:       issue.Index,
-			PullRequest: convert.ToAPIPullRequest(ctx, issue.PullRequest, nil),
+			PullRequest: convert.ToAPIPullRequest(ctx, issue.PullRequest, doer),
 			Repository:  convert.ToRepo(ctx, issue.Repo, permission),
 			Sender:      convert.ToUser(ctx, doer, nil),
 			CommitID:    commitID,
@@ -307,7 +307,7 @@ func (m *webhookNotifier) NewPullRequest(ctx context.Context, pull *issues_model
 	if err := PrepareWebhooks(ctx, EventSource{Repository: pull.Issue.Repo}, webhook_module.HookEventPullRequest, &api.PullRequestPayload{
 		Action:      api.HookIssueOpened,
 		Index:       pull.Issue.Index,
-		PullRequest: convert.ToAPIPullRequest(ctx, pull, nil),
+		PullRequest: convert.ToAPIPullRequest(ctx, pull, pull.Issue.Poster),
 		Repository:  convert.ToRepo(ctx, pull.Issue.Repo, permission),
 		Sender:      convert.ToUser(ctx, pull.Issue.Poster, nil),
 	}); err != nil {
@@ -336,7 +336,7 @@ func (m *webhookNotifier) IssueChangeContent(ctx context.Context, doer *user_mod
 					From: oldContent,
 				},
 			},
-			PullRequest: convert.ToAPIPullRequest(ctx, issue.PullRequest, nil),
+			PullRequest: convert.ToAPIPullRequest(ctx, issue.PullRequest, doer),
 			Repository:  convert.ToRepo(ctx, issue.Repo, permission),
 			Sender:      convert.ToUser(ctx, doer, nil),
 		})
@@ -375,17 +375,20 @@ func (m *webhookNotifier) UpdateComment(ctx context.Context, doer *user_model.Us
 	}
 
 	var eventType webhook_module.HookEventType
+	var pullRequest *api.PullRequest
 	if c.Issue.IsPull {
 		eventType = webhook_module.HookEventPullRequestComment
+		pullRequest = convert.ToAPIPullRequest(ctx, c.Issue.PullRequest, doer)
 	} else {
 		eventType = webhook_module.HookEventIssueComment
 	}
 
 	permission, _ := access_model.GetUserRepoPermission(ctx, c.Issue.Repo, doer)
 	if err := PrepareWebhooks(ctx, EventSource{Repository: c.Issue.Repo}, eventType, &api.IssueCommentPayload{
-		Action:  api.HookIssueCommentEdited,
-		Issue:   convert.ToAPIIssue(ctx, doer, c.Issue),
-		Comment: convert.ToAPIComment(ctx, c.Issue.Repo, c),
+		Action:      api.HookIssueCommentEdited,
+		Issue:       convert.ToAPIIssue(ctx, doer, c.Issue),
+		PullRequest: pullRequest,
+		Comment:     convert.ToAPIComment(ctx, c.Issue.Repo, c),
 		Changes: &api.ChangesPayload{
 			Body: &api.ChangesFromPayload{
 				From: oldContent,
@@ -403,20 +406,23 @@ func (m *webhookNotifier) CreateIssueComment(ctx context.Context, doer *user_mod
 	issue *issues_model.Issue, comment *issues_model.Comment, mentions []*user_model.User,
 ) {
 	var eventType webhook_module.HookEventType
+	var pullRequest *api.PullRequest
 	if issue.IsPull {
 		eventType = webhook_module.HookEventPullRequestComment
+		pullRequest = convert.ToAPIPullRequest(ctx, issue.PullRequest, doer)
 	} else {
 		eventType = webhook_module.HookEventIssueComment
 	}
 
 	permission, _ := access_model.GetUserRepoPermission(ctx, repo, doer)
 	if err := PrepareWebhooks(ctx, EventSource{Repository: issue.Repo}, eventType, &api.IssueCommentPayload{
-		Action:     api.HookIssueCommentCreated,
-		Issue:      convert.ToAPIIssue(ctx, doer, issue),
-		Comment:    convert.ToAPIComment(ctx, repo, comment),
-		Repository: convert.ToRepo(ctx, repo, permission),
-		Sender:     convert.ToUser(ctx, doer, nil),
-		IsPull:     issue.IsPull,
+		Action:      api.HookIssueCommentCreated,
+		Issue:       convert.ToAPIIssue(ctx, doer, issue),
+		PullRequest: pullRequest,
+		Comment:     convert.ToAPIComment(ctx, repo, comment),
+		Repository:  convert.ToRepo(ctx, repo, permission),
+		Sender:      convert.ToUser(ctx, doer, nil),
+		IsPull:      issue.IsPull,
 	}); err != nil {
 		log.Error("PrepareWebhooks [comment_id: %d]: %v", comment.ID, err)
 	}
@@ -440,20 +446,23 @@ func (m *webhookNotifier) DeleteComment(ctx context.Context, doer *user_model.Us
 	}
 
 	var eventType webhook_module.HookEventType
+	var pullRequest *api.PullRequest
 	if comment.Issue.IsPull {
 		eventType = webhook_module.HookEventPullRequestComment
+		pullRequest = convert.ToAPIPullRequest(ctx, comment.Issue.PullRequest, doer)
 	} else {
 		eventType = webhook_module.HookEventIssueComment
 	}
 
 	permission, _ := access_model.GetUserRepoPermission(ctx, comment.Issue.Repo, doer)
 	if err := PrepareWebhooks(ctx, EventSource{Repository: comment.Issue.Repo}, eventType, &api.IssueCommentPayload{
-		Action:     api.HookIssueCommentDeleted,
-		Issue:      convert.ToAPIIssue(ctx, doer, comment.Issue),
-		Comment:    convert.ToAPIComment(ctx, comment.Issue.Repo, comment),
-		Repository: convert.ToRepo(ctx, comment.Issue.Repo, permission),
-		Sender:     convert.ToUser(ctx, doer, nil),
-		IsPull:     comment.Issue.IsPull,
+		Action:      api.HookIssueCommentDeleted,
+		Issue:       convert.ToAPIIssue(ctx, doer, comment.Issue),
+		PullRequest: pullRequest,
+		Comment:     convert.ToAPIComment(ctx, comment.Issue.Repo, comment),
+		Repository:  convert.ToRepo(ctx, comment.Issue.Repo, permission),
+		Sender:      convert.ToUser(ctx, doer, nil),
+		IsPull:      comment.Issue.IsPull,
 	}); err != nil {
 		log.Error("PrepareWebhooks [comment_id: %d]: %v", comment.ID, err)
 	}
@@ -525,7 +534,7 @@ func (m *webhookNotifier) IssueChangeLabels(ctx context.Context, doer *user_mode
 		err = PrepareWebhooks(ctx, EventSource{Repository: issue.Repo}, webhook_module.HookEventPullRequestLabel, &api.PullRequestPayload{
 			Action:      api.HookIssueLabelUpdated,
 			Index:       issue.Index,
-			PullRequest: convert.ToAPIPullRequest(ctx, issue.PullRequest, nil),
+			PullRequest: convert.ToAPIPullRequest(ctx, issue.PullRequest, doer),
 			Repository:  convert.ToRepo(ctx, issue.Repo, access_model.Permission{AccessMode: perm.AccessModeOwner}),
 			Sender:      convert.ToUser(ctx, doer, nil),
 		})
@@ -567,7 +576,7 @@ func (m *webhookNotifier) IssueChangeMilestone(ctx context.Context, doer *user_m
 		err = PrepareWebhooks(ctx, EventSource{Repository: issue.Repo}, webhook_module.HookEventPullRequestMilestone, &api.PullRequestPayload{
 			Action:      hookAction,
 			Index:       issue.Index,
-			PullRequest: convert.ToAPIPullRequest(ctx, issue.PullRequest, nil),
+			PullRequest: convert.ToAPIPullRequest(ctx, issue.PullRequest, doer),
 			Repository:  convert.ToRepo(ctx, issue.Repo, permission),
 			Sender:      convert.ToUser(ctx, doer, nil),
 		})
@@ -640,7 +649,7 @@ func (*webhookNotifier) MergePullRequest(ctx context.Context, doer *user_model.U
 	// Merge pull request calls issue.changeStatus so we need to handle separately.
 	apiPullRequest := &api.PullRequestPayload{
 		Index:       pr.Issue.Index,
-		PullRequest: convert.ToAPIPullRequest(ctx, pr, nil),
+		PullRequest: convert.ToAPIPullRequest(ctx, pr, doer),
 		Repository:  convert.ToRepo(ctx, pr.Issue.Repo, permission),
 		Sender:      convert.ToUser(ctx, doer, nil),
 		Action:      api.HookIssueClosed,
@@ -668,7 +677,7 @@ func (m *webhookNotifier) PullRequestChangeTargetBranch(ctx context.Context, doe
 				From: oldBranch,
 			},
 		},
-		PullRequest: convert.ToAPIPullRequest(ctx, pr, nil),
+		PullRequest: convert.ToAPIPullRequest(ctx, pr, doer),
 		Repository:  convert.ToRepo(ctx, issue.Repo, mode),
 		Sender:      convert.ToUser(ctx, doer, nil),
 	}); err != nil {
@@ -703,11 +712,12 @@ func (m *webhookNotifier) PullRequestReview(ctx context.Context, pr *issues_mode
 		return
 	}
 	if err := PrepareWebhooks(ctx, EventSource{Repository: review.Issue.Repo}, reviewHookType, &api.PullRequestPayload{
-		Action:      api.HookIssueReviewed,
-		Index:       review.Issue.Index,
-		PullRequest: convert.ToAPIPullRequest(ctx, pr, nil),
-		Repository:  convert.ToRepo(ctx, review.Issue.Repo, permission),
-		Sender:      convert.ToUser(ctx, review.Reviewer, nil),
+		Action:            api.HookIssueReviewed,
+		Index:             review.Issue.Index,
+		PullRequest:       convert.ToAPIPullRequest(ctx, pr, review.Reviewer),
+		RequestedReviewer: convert.ToUser(ctx, review.Reviewer, nil),
+		Repository:        convert.ToRepo(ctx, review.Issue.Repo, permission),
+		Sender:            convert.ToUser(ctx, review.Reviewer, nil),
 		Review: &api.ReviewPayload{
 			Type:    string(reviewHookType),
 			Content: review.Content,
@@ -729,7 +739,7 @@ func (m *webhookNotifier) PullRequestReviewRequest(ctx context.Context, doer *us
 	}
 	apiPullRequest := &api.PullRequestPayload{
 		Index:             issue.Index,
-		PullRequest:       convert.ToAPIPullRequest(ctx, issue.PullRequest, nil),
+		PullRequest:       convert.ToAPIPullRequest(ctx, issue.PullRequest, doer),
 		RequestedReviewer: convert.ToUser(ctx, reviewer, nil),
 		Repository:        convert.ToRepo(ctx, issue.Repo, permission),
 		Sender:            convert.ToUser(ctx, doer, nil),
@@ -773,7 +783,7 @@ func (m *webhookNotifier) PullRequestSynchronized(ctx context.Context, doer *use
 	if err := PrepareWebhooks(ctx, EventSource{Repository: pr.Issue.Repo}, webhook_module.HookEventPullRequestSync, &api.PullRequestPayload{
 		Action:      api.HookIssueSynchronized,
 		Index:       pr.Issue.Index,
-		PullRequest: convert.ToAPIPullRequest(ctx, pr, nil),
+		PullRequest: convert.ToAPIPullRequest(ctx, pr, doer),
 		Repository:  convert.ToRepo(ctx, pr.Issue.Repo, access_model.Permission{AccessMode: perm.AccessModeOwner}),
 		Sender:      convert.ToUser(ctx, doer, nil),
 	}); err != nil {

From c163bf6fb55c922ab0cf552b47475fc8fc8b99d9 Mon Sep 17 00:00:00 2001
From: cloudchamb3r 
Date: Wed, 16 Oct 2024 21:39:47 +0900
Subject: [PATCH 188/443] Fix null errors on conversation holder (#32258)
 (#32266)

fix #32258

Errors in the issue was due to unhandled null check. so i fixed it.

### Detailed description for Issue & Fix
To reproduce that issue, the comment must be deleted on Conversation
tab.
#### Before Delete
image

#### After Delete (AS-IS)
image

gitea already have remove logic for `timeline-item-group`, but because
of null ref exception the later logic that removes `timeline-item-group`
could be not be called correctly.

(cherry picked from commit 603fca1e27bc29c1e700cc1bd284eb619d2436c8)
---
 web_src/js/features/repo-issue.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js
index c4bd70b71d..0b0c1ff9bc 100644
--- a/web_src/js/features/repo-issue.js
+++ b/web_src/js/features/repo-issue.js
@@ -209,14 +209,17 @@ export function initRepoIssueCommentDelete() {
           const path = conversationHolder.getAttribute('data-path');
           const side = conversationHolder.getAttribute('data-side');
           const idx = conversationHolder.getAttribute('data-idx');
-          const lineType = conversationHolder.closest('tr').getAttribute('data-line-type');
+          const lineType = conversationHolder.closest('tr')?.getAttribute('data-line-type');
 
-          if (lineType === 'same') {
-            document.querySelector(`[data-path="${path}"] .add-code-comment[data-idx="${idx}"]`).classList.remove('tw-invisible');
-          } else {
-            document.querySelector(`[data-path="${path}"] .add-code-comment[data-side="${side}"][data-idx="${idx}"]`).classList.remove('tw-invisible');
+          // the conversation holder could appear either on the "Conversation" page, or the "Files Changed" page
+          // on the Conversation page, there is no parent "tr", so no need to do anything for "add-code-comment"
+          if (lineType) {
+            if (lineType === 'same') {
+              document.querySelector(`[data-path="${path}"] .add-code-comment[data-idx="${idx}"]`).classList.remove('tw-invisible');
+            } else {
+              document.querySelector(`[data-path="${path}"] .add-code-comment[data-side="${side}"][data-idx="${idx}"]`).classList.remove('tw-invisible');
+            }
           }
-
           conversationHolder.remove();
         }
 

From f3f386545ee97b91f1aaac4142480e70a443c655 Mon Sep 17 00:00:00 2001
From: Zettat123 
Date: Thu, 17 Oct 2024 17:05:38 +0800
Subject: [PATCH 189/443] Always update expiration time when creating an
 artifact (#32281)

Fix #32256

(cherry picked from commit 9116665e9c1c01d882c919fb3058f7fdb695350e)
---
 models/actions/artifact.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/models/actions/artifact.go b/models/actions/artifact.go
index 3d0a288e62..0bc66ba24e 100644
--- a/models/actions/artifact.go
+++ b/models/actions/artifact.go
@@ -69,7 +69,7 @@ func CreateArtifact(ctx context.Context, t *ActionTask, artifactName, artifactPa
 			OwnerID:      t.OwnerID,
 			CommitSHA:    t.CommitSHA,
 			Status:       int64(ArtifactStatusUploadPending),
-			ExpiredUnix:  timeutil.TimeStamp(time.Now().Unix() + 3600*24*expiredDays),
+			ExpiredUnix:  timeutil.TimeStamp(time.Now().Unix() + timeutil.Day*expiredDays),
 		}
 		if _, err := db.GetEngine(ctx).Insert(artifact); err != nil {
 			return nil, err
@@ -78,6 +78,13 @@ func CreateArtifact(ctx context.Context, t *ActionTask, artifactName, artifactPa
 	} else if err != nil {
 		return nil, err
 	}
+
+	if _, err := db.GetEngine(ctx).ID(artifact.ID).Cols("expired_unix").Update(&ActionArtifact{
+		ExpiredUnix: timeutil.TimeStamp(time.Now().Unix() + timeutil.Day*expiredDays),
+	}); err != nil {
+		return nil, err
+	}
+
 	return artifact, nil
 }
 

From f4c2c401ecdc8498c43af34827c545a27c9e11fb Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sat, 19 Oct 2024 22:11:56 +0200
Subject: [PATCH 190/443] API: enhance SearchIssues swagger docs (#32208)

this will result in better api clients generated out of the openapi docs
... for SearchIssues

---
*Sponsored by Kithara Software GmbH*

(cherry picked from commit d638067d3cb0a7f69b4d899f65b9be4940bd3e41)
---
 routers/api/v1/repo/issue.go   | 51 +++++++++++++++++++-----------
 templates/swagger/v1_json.tmpl | 58 ++++++++++++++++++++++++----------
 2 files changed, 73 insertions(+), 36 deletions(-)

diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go
index 99cd9803c5..6221681875 100644
--- a/routers/api/v1/repo/issue.go
+++ b/routers/api/v1/repo/issue.go
@@ -41,80 +41,93 @@ func SearchIssues(ctx *context.APIContext) {
 	// parameters:
 	// - name: state
 	//   in: query
-	//   description: whether issue is open or closed
+	//   description: State of the issue
 	//   type: string
+	//   enum: [open, closed, all]
+	//   default: open
 	// - name: labels
 	//   in: query
-	//   description: comma separated list of labels. Fetch only issues that have any of this labels. Non existent labels are discarded
+	//   description: Comma-separated list of label names. Fetch only issues that have any of these labels. Non existent labels are discarded.
 	//   type: string
 	// - name: milestones
 	//   in: query
-	//   description: comma separated list of milestone names. Fetch only issues that have any of this milestones. Non existent are discarded
+	//   description: Comma-separated list of milestone names. Fetch only issues that have any of these milestones. Non existent milestones are discarded.
 	//   type: string
 	// - name: q
 	//   in: query
-	//   description: search string
+	//   description: Search string
 	//   type: string
 	// - name: priority_repo_id
 	//   in: query
-	//   description: repository to prioritize in the results
+	//   description: Repository ID to prioritize in the results
 	//   type: integer
 	//   format: int64
 	// - name: type
 	//   in: query
-	//   description: filter by type (issues / pulls) if set
+	//   description: Filter by issue type
 	//   type: string
+	//   enum: [issues, pulls]
 	// - name: since
 	//   in: query
-	//   description: Only show notifications updated after the given time. This is a timestamp in RFC 3339 format
+	//   description: Only show issues updated after the given time (RFC 3339 format)
 	//   type: string
 	//   format: date-time
-	//   required: false
 	// - name: before
 	//   in: query
-	//   description: Only show notifications updated before the given time. This is a timestamp in RFC 3339 format
+	//   description: Only show issues updated before the given time (RFC 3339 format)
 	//   type: string
 	//   format: date-time
-	//   required: false
 	// - name: assigned
 	//   in: query
-	//   description: filter (issues / pulls) assigned to you, default is false
+	//   description: Filter issues or pulls assigned to the authenticated user
 	//   type: boolean
+	//   default: false
 	// - name: created
 	//   in: query
-	//   description: filter (issues / pulls) created by you, default is false
+	//   description: Filter issues or pulls created by the authenticated user
 	//   type: boolean
+	//   default: false
 	// - name: mentioned
 	//   in: query
-	//   description: filter (issues / pulls) mentioning you, default is false
+	//   description: Filter issues or pulls mentioning the authenticated user
 	//   type: boolean
+	//   default: false
 	// - name: review_requested
 	//   in: query
-	//   description: filter pulls requesting your review, default is false
+	//   description: Filter pull requests where the authenticated user's review was requested
 	//   type: boolean
+	//   default: false
 	// - name: reviewed
 	//   in: query
-	//   description: filter pulls reviewed by you, default is false
+	//   description: Filter pull requests reviewed by the authenticated user
 	//   type: boolean
+	//   default: false
 	// - name: owner
 	//   in: query
-	//   description: filter by owner
+	//   description: Filter by repository owner
 	//   type: string
 	// - name: team
 	//   in: query
-	//   description: filter by team (requires organization owner parameter to be provided)
+	//   description: Filter by team (requires organization owner parameter)
 	//   type: string
 	// - name: page
 	//   in: query
-	//   description: page number of results to return (1-based)
+	//   description: Page number of results to return (1-based)
 	//   type: integer
+	//   minimum: 1
+	//   default: 1
 	// - name: limit
 	//   in: query
-	//   description: page size of results
+	//   description: Number of items per page
 	//   type: integer
+	//   minimum: 0
 	// responses:
 	//   "200":
 	//     "$ref": "#/responses/IssueList"
+	//   "400":
+	//     "$ref": "#/responses/error"
+	//   "422":
+	//     "$ref": "#/responses/validationError"
 
 	before, since, err := context.GetQueryBeforeSince(ctx.Base)
 	if err != nil {
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 783acd395e..dcf505cc7d 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -4196,107 +4196,125 @@
         "operationId": "issueSearchIssues",
         "parameters": [
           {
+            "enum": [
+              "open",
+              "closed",
+              "all"
+            ],
             "type": "string",
-            "description": "whether issue is open or closed",
+            "default": "open",
+            "description": "State of the issue",
             "name": "state",
             "in": "query"
           },
           {
             "type": "string",
-            "description": "comma separated list of labels. Fetch only issues that have any of this labels. Non existent labels are discarded",
+            "description": "Comma-separated list of label names. Fetch only issues that have any of these labels. Non existent labels are discarded.",
             "name": "labels",
             "in": "query"
           },
           {
             "type": "string",
-            "description": "comma separated list of milestone names. Fetch only issues that have any of this milestones. Non existent are discarded",
+            "description": "Comma-separated list of milestone names. Fetch only issues that have any of these milestones. Non existent milestones are discarded.",
             "name": "milestones",
             "in": "query"
           },
           {
             "type": "string",
-            "description": "search string",
+            "description": "Search string",
             "name": "q",
             "in": "query"
           },
           {
             "type": "integer",
             "format": "int64",
-            "description": "repository to prioritize in the results",
+            "description": "Repository ID to prioritize in the results",
             "name": "priority_repo_id",
             "in": "query"
           },
           {
+            "enum": [
+              "issues",
+              "pulls"
+            ],
             "type": "string",
-            "description": "filter by type (issues / pulls) if set",
+            "description": "Filter by issue type",
             "name": "type",
             "in": "query"
           },
           {
             "type": "string",
             "format": "date-time",
-            "description": "Only show notifications updated after the given time. This is a timestamp in RFC 3339 format",
+            "description": "Only show issues updated after the given time (RFC 3339 format)",
             "name": "since",
             "in": "query"
           },
           {
             "type": "string",
             "format": "date-time",
-            "description": "Only show notifications updated before the given time. This is a timestamp in RFC 3339 format",
+            "description": "Only show issues updated before the given time (RFC 3339 format)",
             "name": "before",
             "in": "query"
           },
           {
             "type": "boolean",
-            "description": "filter (issues / pulls) assigned to you, default is false",
+            "default": false,
+            "description": "Filter issues or pulls assigned to the authenticated user",
             "name": "assigned",
             "in": "query"
           },
           {
             "type": "boolean",
-            "description": "filter (issues / pulls) created by you, default is false",
+            "default": false,
+            "description": "Filter issues or pulls created by the authenticated user",
             "name": "created",
             "in": "query"
           },
           {
             "type": "boolean",
-            "description": "filter (issues / pulls) mentioning you, default is false",
+            "default": false,
+            "description": "Filter issues or pulls mentioning the authenticated user",
             "name": "mentioned",
             "in": "query"
           },
           {
             "type": "boolean",
-            "description": "filter pulls requesting your review, default is false",
+            "default": false,
+            "description": "Filter pull requests where the authenticated user's review was requested",
             "name": "review_requested",
             "in": "query"
           },
           {
             "type": "boolean",
-            "description": "filter pulls reviewed by you, default is false",
+            "default": false,
+            "description": "Filter pull requests reviewed by the authenticated user",
             "name": "reviewed",
             "in": "query"
           },
           {
             "type": "string",
-            "description": "filter by owner",
+            "description": "Filter by repository owner",
             "name": "owner",
             "in": "query"
           },
           {
             "type": "string",
-            "description": "filter by team (requires organization owner parameter to be provided)",
+            "description": "Filter by team (requires organization owner parameter)",
             "name": "team",
             "in": "query"
           },
           {
+            "minimum": 1,
             "type": "integer",
-            "description": "page number of results to return (1-based)",
+            "default": 1,
+            "description": "Page number of results to return (1-based)",
             "name": "page",
             "in": "query"
           },
           {
+            "minimum": 0,
             "type": "integer",
-            "description": "page size of results",
+            "description": "Number of items per page",
             "name": "limit",
             "in": "query"
           }
@@ -4304,6 +4322,12 @@
         "responses": {
           "200": {
             "$ref": "#/responses/IssueList"
+          },
+          "400": {
+            "$ref": "#/responses/error"
+          },
+          "422": {
+            "$ref": "#/responses/validationError"
           }
         }
       }

From 1b6ed6dc5b64b417d9579b32b67b9564b6fa5349 Mon Sep 17 00:00:00 2001
From: Otto Richter 
Date: Mon, 21 Oct 2024 00:11:33 +0200
Subject: [PATCH 191/443] fix(i18n): edit should not be lowercase here

This also propagated to translations and it looks a little odd in the tooltip
---
 options/locale/locale_en-US.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index d41c44eb26..7789139b2f 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2667,7 +2667,7 @@ release.draft = Draft
 release.prerelease = Pre-release
 release.stable = Stable
 release.compare = Compare
-release.edit = edit
+release.edit = Edit
 release.ahead.commits = %d commits
 release.ahead.target = to %s since this release
 tag.ahead.target = to %s since this tag

From f4be4e733c0d7f000d30bfe27ba809c0069d790a Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Mon, 21 Oct 2024 00:03:50 +0200
Subject: [PATCH 192/443] fix: Specify default value for
 `EXPLORE_DEFAULT_SORT`.

- This is another regression from
5a0bc357992dad725b0163105f8b6464ec130a21, where the default value was
changed to "alphabetically" because it relied on `ExploreDefaultSort`
providing a fallback value.
- Set the default value for `EXPLORE_DEFAULT_SORT` to `recentupdate`,
this was already the behavior explicitly for existing users of this setting
but with 5a0bc357992dad725b0163105f8b6464ec130a21 it didn't provide a
explicit fallback to `recentupdate`. So opting for a 'easy' fix, that
doesn't add boilerplate code to those instances.
---
 modules/setting/ui.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/setting/ui.go b/modules/setting/ui.go
index 056d670ba6..40f1812839 100644
--- a/modules/setting/ui.go
+++ b/modules/setting/ui.go
@@ -88,6 +88,7 @@ var UI = struct {
 	Reactions:               []string{`+1`, `-1`, `laugh`, `hooray`, `confused`, `heart`, `rocket`, `eyes`},
 	CustomEmojis:            []string{`git`, `gitea`, `codeberg`, `gitlab`, `github`, `gogs`, `forgejo`},
 	CustomEmojisMap:         map[string]string{"git": ":git:", "gitea": ":gitea:", "codeberg": ":codeberg:", "gitlab": ":gitlab:", "github": ":github:", "gogs": ":gogs:", "forgejo": ":forgejo:"},
+	ExploreDefaultSort:      "recentupdate",
 	PreferredTimestampTense: "mixed",
 
 	AmbiguousUnicodeDetection: true,

From 0055fdbdc46fc9b23c6a82de4787c408f14e9817 Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Mon, 21 Oct 2024 00:42:15 +0200
Subject: [PATCH 193/443] fix: correct SQL query for active issues

- The `OR` should be inside the `AND` condition to not 'bypass' the other
conditions.
- Added minimal unit test.
- Regression from 2675a24649af2fff34f5c7e416d6ff78591d8d9c
---
 models/activities/repo_activity.go      |  3 +--
 models/activities/repo_activity_test.go | 30 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 models/activities/repo_activity_test.go

diff --git a/models/activities/repo_activity.go b/models/activities/repo_activity.go
index 3ffad035b7..ffa709ad19 100644
--- a/models/activities/repo_activity.go
+++ b/models/activities/repo_activity.go
@@ -337,8 +337,7 @@ func newlyCreatedIssues(ctx context.Context, repoID int64, fromTime time.Time) *
 func activeIssues(ctx context.Context, repoID int64, fromTime time.Time) *xorm.Session {
 	sess := db.GetEngine(ctx).Where("issue.repo_id = ?", repoID).
 		And("issue.is_pull = ?", false).
-		And("issue.created_unix >= ?", fromTime.Unix()).
-		Or("issue.closed_unix >= ?", fromTime.Unix())
+		And("issue.created_unix >= ? OR issue.closed_unix >= ?", fromTime.Unix(), fromTime.Unix())
 
 	return sess
 }
diff --git a/models/activities/repo_activity_test.go b/models/activities/repo_activity_test.go
new file mode 100644
index 0000000000..06cd0e1e8a
--- /dev/null
+++ b/models/activities/repo_activity_test.go
@@ -0,0 +1,30 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package activities
+
+import (
+	"testing"
+	"time"
+
+	"code.gitea.io/gitea/models/db"
+	repo_model "code.gitea.io/gitea/models/repo"
+	"code.gitea.io/gitea/models/unittest"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestGetActivityStats(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+
+	stats, err := GetActivityStats(db.DefaultContext, repo, time.Unix(0, 0), true, true, true, true)
+	require.NoError(t, err)
+
+	assert.EqualValues(t, 2, stats.ActiveIssueCount())
+	assert.EqualValues(t, 2, stats.OpenedIssueCount())
+	assert.EqualValues(t, 0, stats.ClosedIssueCount())
+	assert.EqualValues(t, 3, stats.ActivePRCount())
+}

From 13762759fdf71a24bf14c921b7ad1536e0a1d1f5 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Mon, 21 Oct 2024 00:03:17 +0000
Subject: [PATCH 194/443] Update renovate to v38.128.6

---
 .forgejo/workflows/renovate.yml | 2 +-
 Makefile                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml
index 2a72436e00..9cea4aea31 100644
--- a/.forgejo/workflows/renovate.yml
+++ b/.forgejo/workflows/renovate.yml
@@ -23,7 +23,7 @@ jobs:
 
     runs-on: docker
     container:
-      image: code.forgejo.org/forgejo-contrib/renovate:38.121.0
+      image: code.forgejo.org/forgejo-contrib/renovate:38.128.6
 
     steps:
       - name: Load renovate repo cache
diff --git a/Makefile b/Makefile
index 9ba556862d..80a9756f9a 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1 # renovate: datasour
 DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.26.0 # renovate: datasource=go
 GOMOCK_PACKAGE ?= go.uber.org/mock/mockgen@v0.4.0 # renovate: datasource=go
 GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.16.2 # renovate: datasource=go
-RENOVATE_NPM_PACKAGE ?= renovate@38.121.0 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate
+RENOVATE_NPM_PACKAGE ?= renovate@38.128.6 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate
 
 ifeq ($(HAS_GO), yes)
 	CGO_EXTRA_CFLAGS := -DSQLITE_MAX_VARIABLE_NUMBER=32766

From 5beb1b56df62512e94d5d2d99f350f1393a66f29 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Mon, 21 Oct 2024 02:05:21 +0000
Subject: [PATCH 195/443] Lock file maintenance

---
 package-lock.json                  | 1436 ++++++++++++++--------------
 poetry.lock                        |    8 +-
 web_src/fomantic/package-lock.json |   42 +-
 3 files changed, 724 insertions(+), 762 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 967ceb71c7..cadfdbc6a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -172,12 +172,12 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
-      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz",
+      "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==",
       "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.24.7",
+        "@babel/highlight": "^7.25.7",
         "picocolors": "^1.0.0"
       },
       "engines": {
@@ -185,9 +185,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
-      "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.8.tgz",
+      "integrity": "sha512-ZsysZyXY4Tlx+Q53XdnOFmqwfB9QDTHYxaZYajWRoBLuLEAwI2UIbtxOjWh/cFaa9IKUlcB+DDuoskLuKu56JA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -275,58 +275,58 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
-      "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz",
+      "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.6",
+        "@babel/types": "^7.25.7",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
+        "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
-      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
+      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.7"
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz",
-      "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.7.tgz",
+      "integrity": "sha512-12xfNeKNH7jubQNm7PAkzlLwEmCs1tfuX3UjIw6vP6QXi+leKh6+LyC/+Ed4EIQermwd58wsyh070yjDHFlNGg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
-      "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz",
+      "integrity": "sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.25.2",
-        "@babel/helper-validator-option": "^7.24.8",
-        "browserslist": "^4.23.1",
+        "@babel/compat-data": "^7.25.7",
+        "@babel/helper-validator-option": "^7.25.7",
+        "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -345,18 +345,18 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz",
-      "integrity": "sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.7.tgz",
+      "integrity": "sha512-bD4WQhbkx80mAyj/WCm4ZHcF4rDxkoLFO6ph8/5/mQ3z4vAzltQXAmbc7GvVJx5H+lk5Mi5EmbTeox5nMGCsbw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-member-expression-to-functions": "^7.24.8",
-        "@babel/helper-optimise-call-expression": "^7.24.7",
-        "@babel/helper-replace-supers": "^7.25.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-        "@babel/traverse": "^7.25.4",
+        "@babel/helper-annotate-as-pure": "^7.25.7",
+        "@babel/helper-member-expression-to-functions": "^7.25.7",
+        "@babel/helper-optimise-call-expression": "^7.25.7",
+        "@babel/helper-replace-supers": "^7.25.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
+        "@babel/traverse": "^7.25.7",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -377,14 +377,14 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz",
-      "integrity": "sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.7.tgz",
+      "integrity": "sha512-byHhumTj/X47wJ6C6eLpK7wW/WBEcnUeb7D0FNc/jFQnQVw7DOso3Zz5u9x/zLrFVkHa89ZGDbkAa1D54NdrCQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "regexpu-core": "^5.3.1",
+        "@babel/helper-annotate-as-pure": "^7.25.7",
+        "regexpu-core": "^6.1.1",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -422,44 +422,44 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz",
-      "integrity": "sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.7.tgz",
+      "integrity": "sha512-O31Ssjd5K6lPbTX9AAYpSKrZmLeagt9uwschJd+Ixo6QiRyfpvgtVQp8qrDR9UNFjZ8+DO34ZkdrN+BnPXemeA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.24.8",
-        "@babel/types": "^7.24.8"
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
-      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.7.tgz",
+      "integrity": "sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
-      "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.7.tgz",
+      "integrity": "sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-simple-access": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "@babel/traverse": "^7.25.2"
+        "@babel/helper-module-imports": "^7.25.7",
+        "@babel/helper-simple-access": "^7.25.7",
+        "@babel/helper-validator-identifier": "^7.25.7",
+        "@babel/traverse": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -469,22 +469,22 @@
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz",
-      "integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.7.tgz",
+      "integrity": "sha512-VAwcwuYhv/AT+Vfr28c9y6SHzTan1ryqrydSTFGjU0uDJHw3uZ+PduI8plCLkRsDnqK2DMEDmwrOQRsK/Ykjng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.7"
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
-      "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.7.tgz",
+      "integrity": "sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -492,15 +492,15 @@
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz",
-      "integrity": "sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.7.tgz",
+      "integrity": "sha512-kRGE89hLnPfcz6fTrlNU+uhgcwv0mBE4Gv3P9Ke9kLVJYpi4AMVVEElXvB5CabrPZW4nCM8P8UyyjrzCM0O2sw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-wrap-function": "^7.25.0",
-        "@babel/traverse": "^7.25.0"
+        "@babel/helper-annotate-as-pure": "^7.25.7",
+        "@babel/helper-wrap-function": "^7.25.7",
+        "@babel/traverse": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -510,15 +510,15 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz",
-      "integrity": "sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.7.tgz",
+      "integrity": "sha512-iy8JhqlUW9PtZkd4pHM96v6BdJ66Ba9yWSE4z0W4TvSZwLBPkyDsiIU3ENe4SmrzRBs76F7rQXTy1lYC49n6Lw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.24.8",
-        "@babel/helper-optimise-call-expression": "^7.24.7",
-        "@babel/traverse": "^7.25.0"
+        "@babel/helper-member-expression-to-functions": "^7.25.7",
+        "@babel/helper-optimise-call-expression": "^7.25.7",
+        "@babel/traverse": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -528,55 +528,55 @@
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
-      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.7.tgz",
+      "integrity": "sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz",
-      "integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.7.tgz",
+      "integrity": "sha512-pPbNbchZBkPMD50K0p3JGcFMNLVUCuU/ABybm/PGNj4JiHrpmNyqqCphBk4i19xXtNV0JhldQJJtbSW5aUvbyA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
-      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz",
+      "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
-      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz",
+      "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
-      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz",
+      "integrity": "sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -584,41 +584,41 @@
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz",
-      "integrity": "sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.7.tgz",
+      "integrity": "sha512-MA0roW3JF2bD1ptAaJnvcabsVlNQShUaThyJbCDD4bCp8NEgiFvpoqRI2YS22hHlc2thjO/fTg2ShLMC3jygAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.0",
-        "@babel/types": "^7.25.0"
+        "@babel/template": "^7.25.7",
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz",
-      "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.7.tgz",
+      "integrity": "sha512-Sv6pASx7Esm38KQpF/U/OXLwPPrdGHNKoeblRxgZRLXnAtnkEe4ptJPDtAZM7fBLadbc1Q07kQpSiGQ0Jg6tRA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.25.0",
-        "@babel/types": "^7.25.6"
+        "@babel/template": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
-      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz",
+      "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.25.7",
         "chalk": "^2.4.2",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
@@ -699,12 +699,12 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
-      "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz",
+      "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.6"
+        "@babel/types": "^7.25.8"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -714,14 +714,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
-      "version": "7.25.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz",
-      "integrity": "sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.7.tgz",
+      "integrity": "sha512-UV9Lg53zyebzD1DwQoT9mzkEKa922LNUp5YkTJ6Uta0RbyXaQNUgcvSt7qIu1PpPzVb6rd10OVNTzkyBGeVmxQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/traverse": "^7.25.3"
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/traverse": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -731,13 +731,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz",
-      "integrity": "sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.7.tgz",
+      "integrity": "sha512-GDDWeVLNxRIkQTnJn2pDOM1pkCgYdSqPeT1a9vh9yIqu2uzzgw1zcqEb+IJOhy+dTBMlNdThrDIksr2o09qrrQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -747,13 +747,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz",
-      "integrity": "sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.7.tgz",
+      "integrity": "sha512-wxyWg2RYaSUYgmd9MR0FyRGyeOMQE/Uzr1wzd/g5cf5bwi9A4v6HFdDm7y1MgDtod/fLOSTZY6jDgV0xU9d5bA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -763,15 +763,15 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz",
-      "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.7.tgz",
+      "integrity": "sha512-Xwg6tZpLxc4iQjorYsyGMyfJE7nP5MV8t/Ka58BgiA7Jw0fRqQNcANlLfdJ/yvBt9z9LD2We+BEkT7vLqZRWng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-        "@babel/plugin-transform-optional-chaining": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
+        "@babel/plugin-transform-optional-chaining": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -781,14 +781,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz",
-      "integrity": "sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.7.tgz",
+      "integrity": "sha512-UVATLMidXrnH+GMUIuxq55nejlj02HP7F5ETyBONzP6G87fPBogG4CH6kxrSrdIuAjdwNO9VzyaYsrZPscWUrw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/traverse": "^7.25.0"
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/traverse": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -871,13 +871,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-decorators": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.24.7.tgz",
-      "integrity": "sha512-Ui4uLJJrRV1lb38zg1yYTmRKmiZLiftDEvZN2iq3kd9kUFU+PttmzTbAFC2ucRk/XJmtek6G23gPsuZbhrT8fQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.25.7.tgz",
+      "integrity": "sha512-oXduHo642ZhstLVYTe2z2GSJIruU0c/W3/Ghr6A5yGMsVrvdnxO1z+3pbTcT7f3/Clnt+1z8D/w1r1f1SHaCHw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -913,13 +913,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-flow": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.24.7.tgz",
-      "integrity": "sha512-9G8GYT/dxn/D1IIKOUBmGX0mnmj46mGH9NnZyJLwtCpgh5f7D2VbuKodb+2s9m1Yavh1s7ASQN8lf0eqrb1LTw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.25.7.tgz",
+      "integrity": "sha512-fyoj6/YdVtlv2ROig/J0fP7hh/wNO1MJGm1NR70Pg7jbkF+jOUL9joorqaCOQh06Y+LfgTagHzC8KqZ3MF782w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -929,13 +929,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.6.tgz",
-      "integrity": "sha512-aABl0jHw9bZ2karQ/uUD6XP4u0SG22SJrOHFoL6XB1R7dTovOP4TzTlsxOYC5yQ1pdscVK2JTUnF6QL3ARoAiQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.7.tgz",
+      "integrity": "sha512-ZvZQRmME0zfJnDQnVBKYzHxXT7lYBB3Revz1GuS7oLXWMgqUPX4G+DDbT30ICClht9WKV34QVrZhSw6WdklwZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -945,13 +945,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.6.tgz",
-      "integrity": "sha512-sXaDXaJN9SNLymBdlWFA+bjzBhFD617ZaFiY13dGt7TVslVvVgA6fkZOP7Ki3IGElC45lwHdOTrCtKZGVAWeLQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.7.tgz",
+      "integrity": "sha512-AqVo+dguCgmpi/3mYBdu9lkngOBlQ2w2vnNpa6gfiCxQZLzV4ZbhsXitJ2Yblkoe1VQwtHSaNmIaGll/26YWRw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -987,13 +987,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz",
-      "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.7.tgz",
+      "integrity": "sha512-ruZOnKO+ajVL/MVx+PwNBPOkrnXTXoWMtte1MBpegfCArhqOe3Bj52avVj1huLLxNKYKXYaSxZ2F+woK1ekXfw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1130,13 +1130,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz",
-      "integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.7.tgz",
+      "integrity": "sha512-EJN2mKxDwfOUCPxMO6MUI58RN3ganiRAG/MS/S3HfB6QFNjroAMelQo/gybyYq97WerCBAZoyrAoW8Tzdq2jWg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1146,16 +1146,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.4.tgz",
-      "integrity": "sha512-jz8cV2XDDTqjKPwVPJBIjORVEmSGYhdRa8e5k5+vN+uwcjSrSxUaebBRa4ko1jqNF2uxyg8G6XYk30Jv285xzg==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.8.tgz",
+      "integrity": "sha512-9ypqkozyzpG+HxlH4o4gdctalFGIjjdufzo7I2XPda0iBnZ6a+FO0rIEQcdSPXp02CkvGsII1exJhmROPQd5oA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/helper-remap-async-to-generator": "^7.25.0",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/traverse": "^7.25.4"
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-remap-async-to-generator": "^7.25.7",
+        "@babel/traverse": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1165,15 +1164,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz",
-      "integrity": "sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.7.tgz",
+      "integrity": "sha512-ZUCjAavsh5CESCmi/xCpX1qcCaAglzs/7tmuvoFnJgA1dM7gQplsguljoTg+Ru8WENpX89cQyAtWoaE0I3X3Pg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-remap-async-to-generator": "^7.24.7"
+        "@babel/helper-module-imports": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-remap-async-to-generator": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1183,13 +1182,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz",
-      "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.7.tgz",
+      "integrity": "sha512-xHttvIM9fvqW+0a3tZlYcZYSBpSWzGBFIt/sYG3tcdSzBB8ZeVgz2gBP7Df+sM0N1850jrviYSSeUuc+135dmQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1199,13 +1198,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz",
-      "integrity": "sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.7.tgz",
+      "integrity": "sha512-ZEPJSkVZaeTFG/m2PARwLZQ+OG0vFIhPlKHK/JdIMy8DbRJ/htz6LRrTFtdzxi9EHmcwbNPAKDnadpNSIW+Aow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1215,14 +1214,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.4.tgz",
-      "integrity": "sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.7.tgz",
+      "integrity": "sha512-mhyfEW4gufjIqYFo9krXHJ3ElbFLIze5IDp+wQTxoPd+mwFb1NxatNAwmv8Q8Iuxv7Zc+q8EkiMQwc9IhyGf4g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.4",
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-create-class-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1232,15 +1231,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz",
-      "integrity": "sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.25.8.tgz",
+      "integrity": "sha512-e82gl3TCorath6YLf9xUwFehVvjvfqFhdOo4+0iVIVju+6XOi5XHkqB3P2AXnSwoeTX0HBoXq5gJFtvotJzFnQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+        "@babel/helper-create-class-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1250,17 +1248,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz",
-      "integrity": "sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.7.tgz",
+      "integrity": "sha512-9j9rnl+YCQY0IGoeipXvnk3niWicIB6kCsWRGLwX241qSXpbA4MKxtp/EdvFxsc4zI5vqfLxzOd0twIJ7I99zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-compilation-targets": "^7.25.2",
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/helper-replace-supers": "^7.25.0",
-        "@babel/traverse": "^7.25.4",
+        "@babel/helper-annotate-as-pure": "^7.25.7",
+        "@babel/helper-compilation-targets": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-replace-supers": "^7.25.7",
+        "@babel/traverse": "^7.25.7",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1281,14 +1279,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz",
-      "integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.7.tgz",
+      "integrity": "sha512-QIv+imtM+EtNxg/XBKL3hiWjgdLjMOmZ+XzQwSgmBfKbfxUjBzGgVPklUuE55eq5/uVoh8gg3dqlrwR/jw3ZeA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/template": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/template": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1298,13 +1296,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz",
-      "integrity": "sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.7.tgz",
+      "integrity": "sha512-xKcfLTlJYUczdaM1+epcdh1UGewJqr9zATgrNHcLBcV2QmfvPPEixo/sK/syql9cEmbr7ulu5HMFG5vbbt/sEA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1314,14 +1312,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz",
-      "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.7.tgz",
+      "integrity": "sha512-kXzXMMRzAtJdDEgQBLF4oaiT6ZCU3oWHgpARnTKDAqPkDJ+bs3NrZb310YYevR5QlRo3Kn7dzzIdHbZm1VzJdQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1331,13 +1329,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz",
-      "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.7.tgz",
+      "integrity": "sha512-by+v2CjoL3aMnWDOyCIg+yxU9KXSRa9tN6MbqggH5xvymmr9p4AMjYkNlQy4brMceBnUyHZ9G8RnpvT8wP7Cfg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1347,14 +1345,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz",
-      "integrity": "sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.7.tgz",
+      "integrity": "sha512-HvS6JF66xSS5rNKXLqkk7L9c/jZ/cdIVIcoPVrnl8IsVpLggTjXs8OWekbLHs/VtYDDh5WXnQyeE3PPUGm22MA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.0",
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1364,14 +1362,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz",
-      "integrity": "sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.8.tgz",
+      "integrity": "sha512-gznWY+mr4ZQL/EWPcbBQUP3BXS5FwZp8RUOw06BaRn8tQLzN4XLIxXejpHN9Qo8x8jjBmAAKp6FoS51AgkSA/A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1381,14 +1378,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz",
-      "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.7.tgz",
+      "integrity": "sha512-yjqtpstPfZ0h/y40fAXRv2snciYr0OAoMXY/0ClC7tm4C/nG5NJKmIItlaYlLbIVAWNfrYuy9dq1bE0SbX0PEg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1398,14 +1395,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz",
-      "integrity": "sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.8.tgz",
+      "integrity": "sha512-sPtYrduWINTQTW7FtOy99VCTWp4H23UX7vYcut7S4CIMEXU+54zKX9uCoGkLsWXteyaMXzVHgzWbLfQ1w4GZgw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1415,14 +1411,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-flow-strip-types": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.25.2.tgz",
-      "integrity": "sha512-InBZ0O8tew5V0K6cHcQ+wgxlrjOw1W4wDXLkOTjLRD8GYhTSkxTVBtdy3MMtvYBrbAWa1Qm3hNoTc1620Yj+Mg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.25.7.tgz",
+      "integrity": "sha512-q8Td2PPc6/6I73g96SreSUCKEcwMXCwcXSIAVTyTTN6CpJe0dMj8coxu1fg1T9vfBLi6Rsi6a4ECcFBbKabS5w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/plugin-syntax-flow": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/plugin-syntax-flow": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1432,14 +1428,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz",
-      "integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.7.tgz",
+      "integrity": "sha512-n/TaiBGJxYFWvpJDfsxSj9lEEE44BFM1EPGz4KEiTipTgkoFVVcCmzAL3qA7fdQU96dpo4gGf5HBx/KnDvqiHw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1449,15 +1445,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.25.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz",
-      "integrity": "sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.7.tgz",
+      "integrity": "sha512-5MCTNcjCMxQ63Tdu9rxyN6cAWurqfrDZ76qvVPrGYdBxIj+EawuuxTu/+dgJlhK5eRz3v1gLwp6XwS8XaX2NiQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.24.8",
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/traverse": "^7.25.1"
+        "@babel/helper-compilation-targets": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/traverse": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1467,14 +1463,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz",
-      "integrity": "sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.8.tgz",
+      "integrity": "sha512-4OMNv7eHTmJ2YXs3tvxAfa/I43di+VcF+M4Wt66c88EAED1RoGaf1D64cL5FkRpNL+Vx9Hds84lksWvd/wMIdA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1484,13 +1479,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz",
-      "integrity": "sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.7.tgz",
+      "integrity": "sha512-fwzkLrSu2fESR/cm4t6vqd7ebNIopz2QHGtjoU+dswQo/P6lwAG04Q98lliE3jkz/XqnbGFLnUcE0q0CVUf92w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1500,14 +1495,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz",
-      "integrity": "sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.8.tgz",
+      "integrity": "sha512-f5W0AhSbbI+yY6VakT04jmxdxz+WsID0neG7+kQZbCOjuyJNdL5Nn4WIBm4hRpKnUcO9lP0eipUhFN12JpoH8g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1517,13 +1511,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz",
-      "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.7.tgz",
+      "integrity": "sha512-Std3kXwpXfRV0QtQy5JJcRpkqP8/wG4XL7hSKZmGlxPlDqmpXtEPRmhF7ztnlTCtUN3eXRUJp+sBEZjaIBVYaw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1533,14 +1527,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz",
-      "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.7.tgz",
+      "integrity": "sha512-CgselSGCGzjQvKzghCvDTxKHP3iooenLpJDO842ehn5D2G5fJB222ptnDwQho0WjEvg7zyoxb9P+wiYxiJX5yA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-module-transforms": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1550,15 +1544,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz",
-      "integrity": "sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.7.tgz",
+      "integrity": "sha512-L9Gcahi0kKFYXvweO6n0wc3ZG1ChpSFdgG+eV1WYZ3/dGbJK7vvk91FgGgak8YwRgrCuihF8tE/Xg07EkL5COg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.24.8",
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/helper-simple-access": "^7.24.7"
+        "@babel/helper-module-transforms": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-simple-access": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1568,16 +1562,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz",
-      "integrity": "sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.7.tgz",
+      "integrity": "sha512-t9jZIvBmOXJsiuyOwhrIGs8dVcD6jDyg2icw1VL4A/g+FnWyJKwUfSSU2nwJuMV2Zqui856El9u+ElB+j9fV1g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.0",
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "@babel/traverse": "^7.25.0"
+        "@babel/helper-module-transforms": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-validator-identifier": "^7.25.7",
+        "@babel/traverse": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1587,14 +1581,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz",
-      "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.7.tgz",
+      "integrity": "sha512-p88Jg6QqsaPh+EB7I9GJrIqi1Zt4ZBHUQtjw3z1bzEXcLh6GfPqzZJ6G+G1HBGKUNukT58MnKG7EN7zXQBCODw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-module-transforms": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1604,14 +1598,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz",
-      "integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.7.tgz",
+      "integrity": "sha512-BtAT9LzCISKG3Dsdw5uso4oV1+v2NlVXIIomKJgQybotJY3OwCwJmkongjHgwGKoZXd0qG5UZ12JUlDQ07W6Ow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1621,13 +1615,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz",
-      "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.7.tgz",
+      "integrity": "sha512-CfCS2jDsbcZaVYxRFo2qtavW8SpdzmBXC2LOI4oO0rP+JSRDxxF3inF4GcPsLgfb5FjkhXG5/yR/lxuRs2pySA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1637,14 +1631,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz",
-      "integrity": "sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.8.tgz",
+      "integrity": "sha512-Z7WJJWdQc8yCWgAmjI3hyC+5PXIubH9yRKzkl9ZEG647O9szl9zvmKLzpbItlijBnVhTUf1cpyWBsZ3+2wjWPQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1654,14 +1647,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz",
-      "integrity": "sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.8.tgz",
+      "integrity": "sha512-rm9a5iEFPS4iMIy+/A/PiS0QN0UyjPIeVvbU5EMZFKJZHt8vQnasbpo3T3EFcxzCeYO0BHfc4RqooCZc51J86Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1671,16 +1663,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz",
-      "integrity": "sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.8.tgz",
+      "integrity": "sha512-LkUu0O2hnUKHKE7/zYOIjByMa4VRaV2CD/cdGz0AxU9we+VA3kDDggKEzI0Oz1IroG+6gUP6UmWEHBMWZU316g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.24.7"
+        "@babel/helper-compilation-targets": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/plugin-transform-parameters": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1690,14 +1681,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz",
-      "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.7.tgz",
+      "integrity": "sha512-pWT6UXCEW3u1t2tcAGtE15ornCBvopHj9Bps9D2DsH15APgNVOTwwczGckX+WkAvBmuoYKRCFa4DK+jM8vh5AA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-replace-supers": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-replace-supers": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1707,14 +1698,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz",
-      "integrity": "sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.8.tgz",
+      "integrity": "sha512-EbQYweoMAHOn7iJ9GgZo14ghhb9tTjgOc88xFgYngifx7Z9u580cENCV159M4xDh3q/irbhSjZVpuhpC2gKBbg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1724,15 +1714,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz",
-      "integrity": "sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.8.tgz",
+      "integrity": "sha512-q05Bk7gXOxpTHoQ8RSzGSh/LHVB9JEIkKnk3myAWwZHnYiTGYtbdrYkIsS8Xyh4ltKf7GNUSgzs/6P2bJtBAQg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1742,13 +1731,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz",
-      "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.7.tgz",
+      "integrity": "sha512-FYiTvku63me9+1Nz7TOx4YMtW3tWXzfANZtrzHhUZrz4d47EEtMQhzFoZWESfXuAMMT5mwzD4+y1N8ONAX6lMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1758,14 +1747,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.4.tgz",
-      "integrity": "sha512-ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.7.tgz",
+      "integrity": "sha512-KY0hh2FluNxMLwOCHbxVOKfdB5sjWG4M183885FmaqWWiGMhRZq4DQRKH6mHdEucbJnyDyYiZNwNG424RymJjA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.4",
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-create-class-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1775,16 +1764,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz",
-      "integrity": "sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.8.tgz",
+      "integrity": "sha512-8Uh966svuB4V8RHHg0QJOB32QK287NBksJOByoKmHMp1TAobNniNalIkI2i5IPj5+S9NYCG4VIjbEuiSN8r+ow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-create-class-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.25.7",
+        "@babel/helper-create-class-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1794,13 +1782,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz",
-      "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.7.tgz",
+      "integrity": "sha512-lQEeetGKfFi0wHbt8ClQrUSUMfEeI3MMm74Z73T9/kuz990yYVtfofjf3NuA42Jy3auFOpbjDyCSiIkTs1VIYw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1810,13 +1798,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-display-name": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.7.tgz",
-      "integrity": "sha512-H/Snz9PFxKsS1JLI4dJLtnJgCJRoo0AUm3chP6NYr+9En1JMKloheEiLIhlp5MDVznWo+H3AAC1Mc8lmUEpsgg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.25.7.tgz",
+      "integrity": "sha512-r0QY7NVU8OnrwE+w2IWiRom0wwsTbjx4+xH2RTd7AVdof3uurXOF+/mXHQDRk+2jIvWgSaCHKMgggfvM4dyUGA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1826,17 +1814,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.2.tgz",
-      "integrity": "sha512-KQsqEAVBpU82NM/B/N9j9WOdphom1SZH3R+2V7INrQUH+V9EBFwZsEJl8eBIVeQE62FxJCc70jzEZwqU7RcVqA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.7.tgz",
+      "integrity": "sha512-vILAg5nwGlR9EXE8JIOX4NHXd49lrYbN8hnjffDtoULwpL9hUx/N55nqh2qd0q6FyNDfjl9V79ecKGvFbcSA0Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/plugin-syntax-jsx": "^7.24.7",
-        "@babel/types": "^7.25.2"
+        "@babel/helper-annotate-as-pure": "^7.25.7",
+        "@babel/helper-module-imports": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/plugin-syntax-jsx": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1846,13 +1834,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-development": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.24.7.tgz",
-      "integrity": "sha512-QG9EnzoGn+Qar7rxuW+ZOsbWOt56FvvI93xInqsZDC5fsekx1AlIO4KIJ5M+D0p0SqSH156EpmZyXq630B8OlQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.25.7.tgz",
+      "integrity": "sha512-5yd3lH1PWxzW6IZj+p+Y4OLQzz0/LzlOG8vGqonHfVR3euf1vyzyMUJk9Ac+m97BH46mFc/98t9PmYLyvgL3qg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.24.7"
+        "@babel/plugin-transform-react-jsx": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1862,14 +1850,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.24.7.tgz",
-      "integrity": "sha512-PLgBVk3fzbmEjBJ/u8kFzOqS9tUeDjiaWud/rRym/yjCo/M9cASPlnrd2ZmmZpQT40fOOrvR8jh+n8jikrOhNA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.25.7.tgz",
+      "integrity": "sha512-6YTHJ7yjjgYqGc8S+CbEXhLICODk0Tn92j+vNJo07HFk9t3bjFgAKxPLFhHwF2NjmQVSI1zBRfBWUeVBa2osfA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-annotate-as-pure": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1879,13 +1867,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz",
-      "integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.7.tgz",
+      "integrity": "sha512-mgDoQCRjrY3XK95UuV60tZlFCQGXEtMg8H+IsW72ldw1ih1jZhzYXbJvghmAEpg5UVhhnCeia1CkGttUvCkiMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.25.7",
         "regenerator-transform": "^0.15.2"
       },
       "engines": {
@@ -1896,13 +1884,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz",
-      "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.7.tgz",
+      "integrity": "sha512-3OfyfRRqiGeOvIWSagcwUTVk2hXBsr/ww7bLn6TRTuXnexA+Udov2icFOxFX9abaj4l96ooYkcNN1qi2Zvqwng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1912,13 +1900,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz",
-      "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.7.tgz",
+      "integrity": "sha512-uBbxNwimHi5Bv3hUccmOFlUy3ATO6WagTApenHz9KzoIdn0XeACdB12ZJ4cjhuB2WSi80Ez2FWzJnarccriJeA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1928,14 +1916,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz",
-      "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.7.tgz",
+      "integrity": "sha512-Mm6aeymI0PBh44xNIv/qvo8nmbkpZze1KvR8MkEqbIREDxoiWTi18Zr2jryfRMwDfVZF9foKh060fWgni44luw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1945,13 +1933,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz",
-      "integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.7.tgz",
+      "integrity": "sha512-ZFAeNkpGuLnAQ/NCsXJ6xik7Id+tHuS+NT+ue/2+rn/31zcdnupCdmunOizEaP0JsUmTFSTOPoQY7PkK2pttXw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1961,13 +1949,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz",
-      "integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.7.tgz",
+      "integrity": "sha512-SI274k0nUsFFmyQupiO7+wKATAmMFf8iFgq2O+vVFXZ0SV9lNfT1NGzBEhjquFmD8I9sqHLguH+gZVN3vww2AA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1977,13 +1965,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz",
-      "integrity": "sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.7.tgz",
+      "integrity": "sha512-OmWmQtTHnO8RSUbL0NTdtpbZHeNTnm68Gj5pA4Y2blFNh+V4iZR68V1qL9cI37J21ZN7AaCnkfdHtLExQPf2uA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1993,13 +1981,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz",
-      "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.7.tgz",
+      "integrity": "sha512-BN87D7KpbdiABA+t3HbVqHzKWUDN3dymLaTnPFAMyc8lV+KN3+YzNhVRNdinaCPA4AUqx7ubXbQ9shRjYBl3SQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2009,14 +1997,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz",
-      "integrity": "sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.7.tgz",
+      "integrity": "sha512-IWfR89zcEPQGB/iB408uGtSPlQd3Jpq11Im86vUgcmSTcoWAiQMCTOa2K2yNNqFJEBVICKhayctee65Ka8OB0w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2026,14 +2014,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz",
-      "integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.7.tgz",
+      "integrity": "sha512-8JKfg/hiuA3qXnlLx8qtv5HWRbgyFx2hMMtpDDuU2rTckpKkGu4ycK5yYHwuEa16/quXfoxHBIApEsNyMWnt0g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2043,14 +2031,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.4.tgz",
-      "integrity": "sha512-qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.7.tgz",
+      "integrity": "sha512-YRW8o9vzImwmh4Q3Rffd09bH5/hvY0pxg+1H1i0f7APoUeg12G7+HhLj9ZFNIrYkgBXhIijPJ+IXypN0hLTIbw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.2",
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2221,17 +2209,10 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/regjsgen": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
-      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@babel/runtime": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz",
-      "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz",
+      "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==",
       "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
@@ -2241,32 +2222,32 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
-      "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz",
+      "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/parser": "^7.25.0",
-        "@babel/types": "^7.25.0"
+        "@babel/code-frame": "^7.25.7",
+        "@babel/parser": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
-      "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz",
+      "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.6",
-        "@babel/parser": "^7.25.6",
-        "@babel/template": "^7.25.0",
-        "@babel/types": "^7.25.6",
+        "@babel/code-frame": "^7.25.7",
+        "@babel/generator": "^7.25.7",
+        "@babel/parser": "^7.25.7",
+        "@babel/template": "^7.25.7",
+        "@babel/types": "^7.25.7",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -2285,13 +2266,13 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
-      "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz",
+      "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.24.8",
-        "@babel/helper-validator-identifier": "^7.24.7",
+        "@babel/helper-string-parser": "^7.25.7",
+        "@babel/helper-validator-identifier": "^7.25.7",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -2481,9 +2462,9 @@
       }
     },
     "node_modules/@csstools/css-parser-algorithms": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.1.tgz",
-      "integrity": "sha512-lSquqZCHxDfuTg/Sk2hiS0mcSFCEBuj49JfzPHJogDBT0mGCyY5A1AQzBWngitrp7i1/HAZpIgzF/VjhOEIJIg==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.2.tgz",
+      "integrity": "sha512-6tC/MnlEvs5suR4Ahef4YlBccJDHZuxGsAlxXmybWjZ5jPxlzLSMlRZ9mVHSRvlD+CmtE7+hJ+UQbfXrws/rUQ==",
       "dev": true,
       "funding": [
         {
@@ -2500,13 +2481,13 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-tokenizer": "^3.0.1"
+        "@csstools/css-tokenizer": "^3.0.2"
       }
     },
     "node_modules/@csstools/css-tokenizer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.1.tgz",
-      "integrity": "sha512-UBqaiu7kU0lfvaP982/o3khfXccVlHPWp0/vwwiIgDF0GmqqqxoiXC/6FCjlS9u92f7CoEz6nXKQnrn1kIAkOw==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.2.tgz",
+      "integrity": "sha512-IuTRcD53WHsXPCZ6W7ubfGqReTJ9Ra0yRRFmXYP/Re8hFYYfoIYIK4080X5luslVLWimhIeFq0hj09urVMQzTw==",
       "dev": true,
       "funding": [
         {
@@ -3714,9 +3695,9 @@
       "license": "MIT"
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.5.tgz",
-      "integrity": "sha512-SU5cvamg0Eyu/F+kLeMXS7GoahL+OoizlclVFX3l5Ql6yNlywJJ0OuqTzUx0v+aHhPHEB/56CT06GQrRrGNYww==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz",
+      "integrity": "sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==",
       "cpu": [
         "arm"
       ],
@@ -3728,9 +3709,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.5.tgz",
-      "integrity": "sha512-S4pit5BP6E5R5C8S6tgU/drvgjtYW76FBuG6+ibG3tMvlD1h9LHVF9KmlmaUBQ8Obou7hEyS+0w+IR/VtxwNMQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.0.tgz",
+      "integrity": "sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==",
       "cpu": [
         "arm64"
       ],
@@ -3742,9 +3723,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.5.tgz",
-      "integrity": "sha512-250ZGg4ipTL0TGvLlfACkIxS9+KLtIbn7BCZjsZj88zSg2Lvu3Xdw6dhAhfe/FjjXPVNCtcSp+WZjVsD3a/Zlw==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz",
+      "integrity": "sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==",
       "cpu": [
         "arm64"
       ],
@@ -3756,9 +3737,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.5.tgz",
-      "integrity": "sha512-D8brJEFg5D+QxFcW6jYANu+Rr9SlKtTenmsX5hOSzNYVrK5oLAEMTUgKWYJP+wdKyCdeSwnapLsn+OVRFycuQg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.0.tgz",
+      "integrity": "sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==",
       "cpu": [
         "x64"
       ],
@@ -3770,9 +3751,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.5.tgz",
-      "integrity": "sha512-PNqXYmdNFyWNg0ma5LdY8wP+eQfdvyaBAojAXgO7/gs0Q/6TQJVXAXe8gwW9URjbS0YAammur0fynYGiWsKlXw==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.0.tgz",
+      "integrity": "sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==",
       "cpu": [
         "arm"
       ],
@@ -3784,9 +3765,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.5.tgz",
-      "integrity": "sha512-kSSCZOKz3HqlrEuwKd9TYv7vxPYD77vHSUvM2y0YaTGnFc8AdI5TTQRrM1yIp3tXCKrSL9A7JLoILjtad5t8pQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.0.tgz",
+      "integrity": "sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==",
       "cpu": [
         "arm"
       ],
@@ -3798,9 +3779,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.5.tgz",
-      "integrity": "sha512-oTXQeJHRbOnwRnRffb6bmqmUugz0glXaPyspp4gbQOPVApdpRrY/j7KP3lr7M8kTfQTyrBUzFjj5EuHAhqH4/w==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.0.tgz",
+      "integrity": "sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==",
       "cpu": [
         "arm64"
       ],
@@ -3812,9 +3793,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.5.tgz",
-      "integrity": "sha512-qnOTIIs6tIGFKCHdhYitgC2XQ2X25InIbZFor5wh+mALH84qnFHvc+vmWUpyX97B0hNvwNUL4B+MB8vJvH65Fw==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.0.tgz",
+      "integrity": "sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==",
       "cpu": [
         "arm64"
       ],
@@ -3826,9 +3807,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.5.tgz",
-      "integrity": "sha512-TMYu+DUdNlgBXING13rHSfUc3Ky5nLPbWs4bFnT+R6Vu3OvXkTkixvvBKk8uO4MT5Ab6lC3U7x8S8El2q5o56w==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.0.tgz",
+      "integrity": "sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==",
       "cpu": [
         "ppc64"
       ],
@@ -3840,9 +3821,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.5.tgz",
-      "integrity": "sha512-PTQq1Kz22ZRvuhr3uURH+U/Q/a0pbxJoICGSprNLAoBEkyD3Sh9qP5I0Asn0y0wejXQBbsVMRZRxlbGFD9OK4A==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.0.tgz",
+      "integrity": "sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==",
       "cpu": [
         "riscv64"
       ],
@@ -3854,9 +3835,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.5.tgz",
-      "integrity": "sha512-bR5nCojtpuMss6TDEmf/jnBnzlo+6n1UhgwqUvRoe4VIotC7FG1IKkyJbwsT7JDsF2jxR+NTnuOwiGv0hLyDoQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.0.tgz",
+      "integrity": "sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==",
       "cpu": [
         "s390x"
       ],
@@ -3868,9 +3849,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.5.tgz",
-      "integrity": "sha512-N0jPPhHjGShcB9/XXZQWuWBKZQnC1F36Ce3sDqWpujsGjDz/CQtOL9LgTrJ+rJC8MJeesMWrMWVLKKNR/tMOCA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz",
+      "integrity": "sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==",
       "cpu": [
         "x64"
       ],
@@ -3882,9 +3863,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.5.tgz",
-      "integrity": "sha512-uBa2e28ohzNNwjr6Uxm4XyaA1M/8aTgfF2T7UIlElLaeXkgpmIJ2EitVNQxjO9xLLLy60YqAgKn/AqSpCUkE9g==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz",
+      "integrity": "sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==",
       "cpu": [
         "x64"
       ],
@@ -3896,9 +3877,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.5.tgz",
-      "integrity": "sha512-RXT8S1HP8AFN/Kr3tg4fuYrNxZ/pZf1HemC5Tsddc6HzgGnJm0+Lh5rAHJkDuW3StI0ynNXukidROMXYl6ew8w==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.0.tgz",
+      "integrity": "sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==",
       "cpu": [
         "arm64"
       ],
@@ -3910,9 +3891,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.5.tgz",
-      "integrity": "sha512-ElTYOh50InL8kzyUD6XsnPit7jYCKrphmddKAe1/Ytt74apOxDq5YEcbsiKs0fR3vff3jEneMM+3I7jbqaMyBg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.0.tgz",
+      "integrity": "sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==",
       "cpu": [
         "ia32"
       ],
@@ -3924,9 +3905,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.5.tgz",
-      "integrity": "sha512-+lvL/4mQxSV8MukpkKyyvfwhH266COcWlXE/1qxwN08ajovta3459zrjLghYMgDerlzNwLAcFpvU+WWE5y6nAQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz",
+      "integrity": "sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==",
       "cpu": [
         "x64"
       ],
@@ -4584,9 +4565,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.7.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.4.tgz",
-      "integrity": "sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg==",
+      "version": "22.7.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.7.tgz",
+      "integrity": "sha512-SRxCrrg9CL/y54aiMCG3edPKdprgMVGDXjA3gB8UmmBW5TcXzRUYAh8EWzTnSJFAd1rgImPELza+A3bJ+qxz8Q==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.19.2"
@@ -4623,17 +4604,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.7.0.tgz",
-      "integrity": "sha512-RIHOoznhA3CCfSTFiB6kBGLQtB/sox+pJ6jeFu6FxJvqL8qRxq/FfGO/UhsGgQM9oGdXkV4xUgli+dt26biB6A==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.10.0.tgz",
+      "integrity": "sha512-phuB3hoP7FFKbRXxjl+DRlQDuJqhpOnm5MmtROXyWi3uS/Xg2ZXqiQfcG2BJHiN4QKyzdOJi3NEn/qTnjUlkmQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.7.0",
-        "@typescript-eslint/type-utils": "8.7.0",
-        "@typescript-eslint/utils": "8.7.0",
-        "@typescript-eslint/visitor-keys": "8.7.0",
+        "@typescript-eslint/scope-manager": "8.10.0",
+        "@typescript-eslint/type-utils": "8.10.0",
+        "@typescript-eslint/utils": "8.10.0",
+        "@typescript-eslint/visitor-keys": "8.10.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -4657,16 +4638,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.7.0.tgz",
-      "integrity": "sha512-lN0btVpj2unxHlNYLI//BQ7nzbMJYBVQX5+pbNXvGYazdlgYonMn4AhhHifQ+J4fGRYA/m1DjaQjx+fDetqBOQ==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.10.0.tgz",
+      "integrity": "sha512-E24l90SxuJhytWJ0pTQydFT46Nk0Z+bsLKo/L8rtQSL93rQ6byd1V/QbDpHUTdLPOMsBCcYXZweADNCfOCmOAg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.7.0",
-        "@typescript-eslint/types": "8.7.0",
-        "@typescript-eslint/typescript-estree": "8.7.0",
-        "@typescript-eslint/visitor-keys": "8.7.0",
+        "@typescript-eslint/scope-manager": "8.10.0",
+        "@typescript-eslint/types": "8.10.0",
+        "@typescript-eslint/typescript-estree": "8.10.0",
+        "@typescript-eslint/visitor-keys": "8.10.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -4686,14 +4667,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.7.0.tgz",
-      "integrity": "sha512-87rC0k3ZlDOuz82zzXRtQ7Akv3GKhHs0ti4YcbAJtaomllXoSO8hi7Ix3ccEvCd824dy9aIX+j3d2UMAfCtVpg==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.10.0.tgz",
+      "integrity": "sha512-AgCaEjhfql9MDKjMUxWvH7HjLeBqMCBfIaBbzzIcBbQPZE7CPh1m6FF+L75NUMJFMLYhCywJXIDEMa3//1A0dw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.7.0",
-        "@typescript-eslint/visitor-keys": "8.7.0"
+        "@typescript-eslint/types": "8.10.0",
+        "@typescript-eslint/visitor-keys": "8.10.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4704,14 +4685,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.7.0.tgz",
-      "integrity": "sha512-tl0N0Mj3hMSkEYhLkjREp54OSb/FI6qyCzfiiclvJvOqre6hsZTGSnHtmFLDU8TIM62G7ygEa1bI08lcuRwEnQ==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.10.0.tgz",
+      "integrity": "sha512-PCpUOpyQSpxBn230yIcK+LeCQaXuxrgCm2Zk1S+PTIRJsEfU6nJ0TtwyH8pIwPK/vJoA+7TZtzyAJSGBz+s/dg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.7.0",
-        "@typescript-eslint/utils": "8.7.0",
+        "@typescript-eslint/typescript-estree": "8.10.0",
+        "@typescript-eslint/utils": "8.10.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
@@ -4729,9 +4710,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.7.0.tgz",
-      "integrity": "sha512-LLt4BLHFwSfASHSF2K29SZ+ZCsbQOM+LuarPjRUuHm+Qd09hSe3GCeaQbcCr+Mik+0QFRmep/FyZBO6fJ64U3w==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.10.0.tgz",
+      "integrity": "sha512-k/E48uzsfJCRRbGLapdZgrX52csmWJ2rcowwPvOZ8lwPUv3xW6CcFeJAXgx4uJm+Ge4+a4tFOkdYvSpxhRhg1w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4743,14 +4724,14 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.7.0.tgz",
-      "integrity": "sha512-MC8nmcGHsmfAKxwnluTQpNqceniT8SteVwd2voYlmiSWGOtjvGXdPl17dYu2797GVscK30Z04WRM28CrKS9WOg==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.10.0.tgz",
+      "integrity": "sha512-3OE0nlcOHaMvQ8Xu5gAfME3/tWVDpb/HxtpUZ1WeOAksZ/h/gwrBzCklaGzwZT97/lBbbxJ16dMA98JMEngW4w==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/types": "8.7.0",
-        "@typescript-eslint/visitor-keys": "8.7.0",
+        "@typescript-eslint/types": "8.10.0",
+        "@typescript-eslint/visitor-keys": "8.10.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -4788,16 +4769,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.7.0.tgz",
-      "integrity": "sha512-ZbdUdwsl2X/s3CiyAu3gOlfQzpbuG3nTWKPoIvAu1pu5r8viiJvv2NPN2AqArL35NCYtw/lrPPfM4gxrMLNLPw==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.10.0.tgz",
+      "integrity": "sha512-Oq4uZ7JFr9d1ZunE/QKy5egcDRXT/FrS2z/nlxzPua2VHFtmMvFNDvpq1m/hq0ra+T52aUezfcjGRIB7vNJF9w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.7.0",
-        "@typescript-eslint/types": "8.7.0",
-        "@typescript-eslint/typescript-estree": "8.7.0"
+        "@typescript-eslint/scope-manager": "8.10.0",
+        "@typescript-eslint/types": "8.10.0",
+        "@typescript-eslint/typescript-estree": "8.10.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4811,13 +4792,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.7.0.tgz",
-      "integrity": "sha512-b1tx0orFCCh/THWPQa2ZwWzvOeyzzp36vkJYOpVg0u8UVOIsfVrnuC9FqAw9gRKn+rG2VmWQ/zDJZzkxUnj/XQ==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.10.0.tgz",
+      "integrity": "sha512-k8nekgqwr7FadWk548Lfph6V3r9OVqjzAIVskE7orMZR23cGJjAOVazsZSJW+ElyjfTM4wx/1g88Mi70DDtG9A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.7.0",
+        "@typescript-eslint/types": "8.10.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -4988,9 +4969,9 @@
       }
     },
     "node_modules/@vitest/mocker/node_modules/magic-string": {
-      "version": "0.30.11",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
-      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
+      "version": "0.30.12",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz",
+      "integrity": "sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5040,9 +5021,9 @@
       }
     },
     "node_modules/@vitest/snapshot/node_modules/magic-string": {
-      "version": "0.30.11",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
-      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
+      "version": "0.30.12",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz",
+      "integrity": "sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5118,9 +5099,9 @@
       }
     },
     "node_modules/@vue/compiler-sfc/node_modules/magic-string": {
-      "version": "0.30.11",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
-      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
+      "version": "0.30.12",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz",
+      "integrity": "sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.0"
@@ -5423,9 +5404,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
+      "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -5875,9 +5856,9 @@
       }
     },
     "node_modules/axe-core": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.0.tgz",
-      "integrity": "sha512-Mr2ZakwQ7XUAjp7pAwQWRhhK8mQQ6JAaNWSjmjxil0R8BPioMtQsTLOolGYkji1rcL++3dCqZA3zWqpT+9Ew6g==",
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.1.tgz",
+      "integrity": "sha512-qPC9o+kD8Tir0lzNGLeghbOrWMr3ZJpaRlCIb6Uobt/7N4FiEDvqUMnxzCHRHmg8vOg14kr5gVNyScRmbMaJ9g==",
       "dev": true,
       "license": "MPL-2.0",
       "engines": {
@@ -6162,9 +6143,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001664",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz",
-      "integrity": "sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==",
+      "version": "1.0.30001669",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz",
+      "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==",
       "funding": [
         {
           "type": "opencollective",
@@ -6513,9 +6494,9 @@
       "license": "MIT"
     },
     "node_modules/confbox": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz",
-      "integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz",
+      "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
       "license": "MIT"
     },
     "node_modules/config-chain": {
@@ -6612,9 +6593,9 @@
       }
     },
     "node_modules/css-functions-list": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.2.tgz",
-      "integrity": "sha512-c+N0v6wbKVxTu5gOBBFkr9BEdBWaqqjQeiJ8QvSRIJOf+UxlJh930m8e6/WNeODIK0mYLFkoONrnj16i2EcvfQ==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.3.tgz",
+      "integrity": "sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7649,9 +7630,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.29",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.29.tgz",
-      "integrity": "sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw==",
+      "version": "1.5.41",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.41.tgz",
+      "integrity": "sha512-dfdv/2xNjX0P8Vzme4cfzHqnPm5xsZXwsolTYr0eyW18IUmNyG08vL+fttvinTfhKfIKdRoqkDIC9e9iWQCNYQ==",
       "license": "ISC"
     },
     "node_modules/emoji-regex": {
@@ -7853,9 +7834,9 @@
       }
     },
     "node_modules/es-iterator-helpers": {
-      "version": "1.0.19",
-      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz",
-      "integrity": "sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.1.0.tgz",
+      "integrity": "sha512-/SurEfycdyssORP/E+bj4sEu1CWw4EmLDsHynHwSXQ7utgbrMRWW195pTrCjFgFCddf/UkYm3oqKPRq5i8bJbw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7866,12 +7847,12 @@
         "es-set-tostringtag": "^2.0.3",
         "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.4",
-        "globalthis": "^1.0.3",
+        "globalthis": "^1.0.4",
         "has-property-descriptors": "^1.0.2",
         "has-proto": "^1.0.3",
         "has-symbols": "^1.0.3",
         "internal-slot": "^1.0.7",
-        "iterator.prototype": "^1.1.2",
+        "iterator.prototype": "^1.1.3",
         "safe-array-concat": "^1.1.2"
       },
       "engines": {
@@ -8034,6 +8015,7 @@
       "version": "8.57.1",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
       "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
+      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8330,9 +8312,9 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.30.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.30.0.tgz",
-      "integrity": "sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==",
+      "version": "2.31.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
+      "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8344,7 +8326,7 @@
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.9",
-        "eslint-module-utils": "^2.9.0",
+        "eslint-module-utils": "^2.12.0",
         "hasown": "^2.0.2",
         "is-core-module": "^2.15.1",
         "is-glob": "^4.0.3",
@@ -8353,13 +8335,14 @@
         "object.groupby": "^1.0.3",
         "object.values": "^1.2.0",
         "semver": "^6.3.1",
+        "string.prototype.trimend": "^1.0.8",
         "tsconfig-paths": "^3.15.0"
       },
       "engines": {
         "node": ">=4"
       },
       "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
       }
     },
     "node_modules/eslint-plugin-import/node_modules/brace-expansion": {
@@ -8577,9 +8560,9 @@
       }
     },
     "node_modules/eslint-plugin-react": {
-      "version": "7.37.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.0.tgz",
-      "integrity": "sha512-IHBePmfWH5lKhJnJ7WB1V+v/GolbB0rjS8XYVCSQCZKaQCAUhMoVoOEn1Ef8Z8Wf0a7l8KTJvuZg5/e4qrZ6nA==",
+      "version": "7.37.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.1.tgz",
+      "integrity": "sha512-xwTnwDqzbDRA8uJ7BMxPs/EXRB3i8ZfnOIp8BsxEQkT0nHPp+WWceqGgo6rKb9ctNi8GJLDT4Go5HAWELa/WMg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9225,9 +9208,9 @@
       }
     },
     "node_modules/eslint-plugin-unicorn/node_modules/globals": {
-      "version": "15.9.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-15.9.0.tgz",
-      "integrity": "sha512-SmSKyLLKFbSr6rptvP8izbyxJL4ILwqO9Jg23UA0sDlGlu58V59D1//I3vlc0KJphVdUR7vMjHIplYnzBxorQA==",
+      "version": "15.11.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-15.11.0.tgz",
+      "integrity": "sha512-yeyNSjdbyVaWurlwCpcA6XNBrHTMIeDdj0/hnvX/OLJ9ekOXYbLsLinH/MucQyGvNnXhidTdNhTtJaffL2sMfw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9237,19 +9220,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-plugin-unicorn/node_modules/jsesc": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
-      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/eslint-plugin-vitest-globals": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-vitest-globals/-/eslint-plugin-vitest-globals-1.5.0.tgz",
@@ -9589,10 +9559,10 @@
       "license": "MIT"
     },
     "node_modules/fast-uri": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.2.tgz",
-      "integrity": "sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row==",
-      "license": "MIT"
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz",
+      "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==",
+      "license": "BSD-3-Clause"
     },
     "node_modules/fastest-levenshtein": {
       "version": "1.0.16",
@@ -9822,9 +9792,9 @@
       }
     },
     "node_modules/get-east-asian-width": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz",
-      "integrity": "sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz",
+      "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==",
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -9833,16 +9803,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/get-func-name": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
-      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/get-intrinsic": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
@@ -11090,9 +11050,9 @@
       }
     },
     "node_modules/iterator.prototype": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz",
-      "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.3.tgz",
+      "integrity": "sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11101,6 +11061,9 @@
         "has-symbols": "^1.0.3",
         "reflect.getprototypeof": "^1.0.4",
         "set-function-name": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/jackspeak": {
@@ -11287,16 +11250,16 @@
       }
     },
     "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
       "dev": true,
       "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/json-buffer": {
@@ -11731,14 +11694,11 @@
       }
     },
     "node_modules/loupe": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.1.tgz",
-      "integrity": "sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.2.tgz",
+      "integrity": "sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "get-func-name": "^2.0.1"
-      }
+      "license": "MIT"
     },
     "node_modules/lowercase-keys": {
       "version": "1.0.1",
@@ -12189,15 +12149,15 @@
       }
     },
     "node_modules/mlly": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.1.tgz",
-      "integrity": "sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.2.tgz",
+      "integrity": "sha512-tN3dvVHYVz4DhSXinXIk7u9syPYaJvio118uomkovAtWBT+RdbP6Lfh/5Lvo519YMmwBafwlh20IPTXIStscpA==",
       "license": "MIT",
       "dependencies": {
-        "acorn": "^8.11.3",
+        "acorn": "^8.12.1",
         "pathe": "^1.1.2",
-        "pkg-types": "^1.1.1",
-        "ufo": "^1.5.3"
+        "pkg-types": "^1.2.0",
+        "ufo": "^1.5.4"
       }
     },
     "node_modules/monaco-editor": {
@@ -12638,9 +12598,9 @@
       "license": "BlueOak-1.0.0"
     },
     "node_modules/package-manager-detector": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-0.2.0.tgz",
-      "integrity": "sha512-E385OSk9qDcXhcM9LNSe4sdhx8a9mAPrZ4sMLW+tmxl5ZuGtPUcdFu+MPP2jbgiWAZ6Pfe5soGFMd+0Db5Vrog==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-0.2.2.tgz",
+      "integrity": "sha512-VgXbyrSNsml4eHWIvxxG/nTL4wgybMTXCV2Un/+yEc3aDKKU6nQBZjbeP3Pl3qm9Qg92X/1ng4ffvCeD/zwHgg==",
       "license": "MIT"
     },
     "node_modules/parent-module": {
@@ -12780,9 +12740,9 @@
       "license": "MIT"
     },
     "node_modules/picocolors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
-      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
       "license": "ISC"
     },
     "node_modules/picomatch": {
@@ -12880,13 +12840,13 @@
       }
     },
     "node_modules/pkg-types": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.2.0.tgz",
-      "integrity": "sha512-+ifYuSSqOQ8CqP4MbZA5hDpb97n3E8SVWdJe+Wms9kj745lmd3b7EZJiqvmLwAlmRfjrI7Hi5z3kdBJ93lFNPA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.2.1.tgz",
+      "integrity": "sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==",
       "license": "MIT",
       "dependencies": {
-        "confbox": "^0.1.7",
-        "mlly": "^1.7.1",
+        "confbox": "^0.1.8",
+        "mlly": "^1.7.2",
         "pathe": "^1.1.2"
       }
     },
@@ -13832,16 +13792,16 @@
       }
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
-      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz",
+      "integrity": "sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
         "es-errors": "^1.3.0",
-        "set-function-name": "^2.0.1"
+        "set-function-name": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13851,16 +13811,16 @@
       }
     },
     "node_modules/regexpu-core": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
-      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.1.1.tgz",
+      "integrity": "sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/regjsgen": "^0.8.0",
         "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.1.0",
-        "regjsparser": "^0.9.1",
+        "regenerate-unicode-properties": "^10.2.0",
+        "regjsgen": "^0.8.0",
+        "regjsparser": "^0.11.0",
         "unicode-match-property-ecmascript": "^2.0.0",
         "unicode-match-property-value-ecmascript": "^2.1.0"
       },
@@ -13868,28 +13828,26 @@
         "node": ">=4"
       }
     },
-    "node_modules/regexpu-core/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      }
-    },
     "node_modules/regexpu-core/node_modules/regjsparser": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.1.tgz",
+      "integrity": "sha512-1DHODs4B8p/mQHU9kr+jv8+wIC9mtG4eBHxWxIq5mhjE3D5oORhCc6deRKzTjs9DcfRFmj9BHSDguZklqCGFWQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "jsesc": "~0.5.0"
+        "jsesc": "~3.0.2"
       },
       "bin": {
         "regjsparser": "bin/parser"
       }
     },
+    "node_modules/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/regjsparser": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.10.0.tgz",
@@ -14435,9 +14393,9 @@
       }
     },
     "node_modules/solid-js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.9.1.tgz",
-      "integrity": "sha512-Gd6QWRFfO2XKKZqVK4YwbhWZkr0jWw1dYHOt+VYebomeyikGP0SuMflf42XcDuU9HAEYDArFJIYsBNjlE7iZsw==",
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.9.2.tgz",
+      "integrity": "sha512-fe/K03nV+kMFJYhAOE8AIQHcGxB4rMIEoEyrulbtmf217NffbbwBqJnJI4ovt16e+kaIt0czE2WA7mP/pYN9yg==",
       "license": "MIT",
       "dependencies": {
         "csstype": "^3.1.0",
@@ -14652,14 +14610,18 @@
       "license": "MIT"
     },
     "node_modules/string.prototype.includes": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.includes/-/string.prototype.includes-2.0.0.tgz",
-      "integrity": "sha512-E34CkBgyeqNDcrbU76cDjL5JLcVrtSdYq0MEh/B10r17pRP4ciHLwTgnuLV8Ay6cgEMLkcBkFCKyFZ43YldYzg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.includes/-/string.prototype.includes-2.0.1.tgz",
+      "integrity": "sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/string.prototype.matchall": {
@@ -14998,9 +14960,9 @@
       }
     },
     "node_modules/stylelint/node_modules/postcss-safe-parser": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-7.0.0.tgz",
-      "integrity": "sha512-ovehqRNVCpuFzbXoTb4qLtyzK3xn3t/CUBxOs8LsnQjQrShaB4lKiHoVqY8ANaC0hBMHq5QVWk77rwGklFUDrg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-7.0.1.tgz",
+      "integrity": "sha512-0AioNCJZ2DPYz5ABT6bddIqlhgwhpHZ/l65YAYo0BCIn0xiDpsnTHz0gnoTGk0OXZW0JRs+cDwL8u/teRdz+8A==",
       "dev": true,
       "funding": [
         {
@@ -15267,9 +15229,9 @@
       }
     },
     "node_modules/synckit": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz",
-      "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==",
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.2.tgz",
+      "integrity": "sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15362,9 +15324,9 @@
       "license": "ISC"
     },
     "node_modules/terser": {
-      "version": "5.34.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.34.1.tgz",
-      "integrity": "sha512-FsJZ7iZLd/BXkz+4xrRTGJ26o/6VTjQytUk8b8OxkwcD2I+79VPJlz7qss1+zE7h8GNIScFqXcDyJ/KqBYZFVA==",
+      "version": "5.36.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.36.0.tgz",
+      "integrity": "sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
@@ -15571,9 +15533,9 @@
       "license": "MIT"
     },
     "node_modules/tinyexec": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.0.tgz",
-      "integrity": "sha512-tVGE0mVJPGb0chKhqmsoosjsS+qUnJVGJpZgsHYQcGoPlG3B51R3PouqTgEGH2Dc9jjFyOqOpix6ZHNMXp1FZg==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.1.tgz",
+      "integrity": "sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==",
       "license": "MIT"
     },
     "node_modules/tinypool": {
@@ -15719,9 +15681,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
-      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
+      "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==",
       "dev": true,
       "license": "0BSD"
     },
@@ -15829,9 +15791,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.6.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
-      "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
+      "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
       "devOptional": true,
       "license": "Apache-2.0",
       "bin": {
@@ -16046,9 +16008,9 @@
       "license": "MIT"
     },
     "node_modules/vite": {
-      "version": "5.4.8",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.8.tgz",
-      "integrity": "sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==",
+      "version": "5.4.9",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.9.tgz",
+      "integrity": "sha512-20OVpJHh0PAM0oSOELa5GaZNWeDjcAvQjGXy2Uyr+Tp+/D2/Hdz6NLgpJLsarPTA2QJ6v8mX2P1ZfbsSKvdMkg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16157,9 +16119,9 @@
       }
     },
     "node_modules/vite/node_modules/rollup": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.5.tgz",
-      "integrity": "sha512-WoinX7GeQOFMGznEcWA1WrTQCd/tpEbMkc3nuMs9BT0CPjMdSjPMTVClwWd4pgSQwJdP65SK9mTCNvItlr5o7w==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.0.tgz",
+      "integrity": "sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16173,22 +16135,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.22.5",
-        "@rollup/rollup-android-arm64": "4.22.5",
-        "@rollup/rollup-darwin-arm64": "4.22.5",
-        "@rollup/rollup-darwin-x64": "4.22.5",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.22.5",
-        "@rollup/rollup-linux-arm-musleabihf": "4.22.5",
-        "@rollup/rollup-linux-arm64-gnu": "4.22.5",
-        "@rollup/rollup-linux-arm64-musl": "4.22.5",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.22.5",
-        "@rollup/rollup-linux-riscv64-gnu": "4.22.5",
-        "@rollup/rollup-linux-s390x-gnu": "4.22.5",
-        "@rollup/rollup-linux-x64-gnu": "4.22.5",
-        "@rollup/rollup-linux-x64-musl": "4.22.5",
-        "@rollup/rollup-win32-arm64-msvc": "4.22.5",
-        "@rollup/rollup-win32-ia32-msvc": "4.22.5",
-        "@rollup/rollup-win32-x64-msvc": "4.22.5",
+        "@rollup/rollup-android-arm-eabi": "4.24.0",
+        "@rollup/rollup-android-arm64": "4.24.0",
+        "@rollup/rollup-darwin-arm64": "4.24.0",
+        "@rollup/rollup-darwin-x64": "4.24.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.24.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.24.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.24.0",
+        "@rollup/rollup-linux-arm64-musl": "4.24.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.24.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.24.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.24.0",
+        "@rollup/rollup-linux-x64-gnu": "4.24.0",
+        "@rollup/rollup-linux-x64-musl": "4.24.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.24.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.24.0",
+        "@rollup/rollup-win32-x64-msvc": "4.24.0",
         "fsevents": "~2.3.2"
       }
     },
@@ -16972,9 +16934,9 @@
       "license": "ISC"
     },
     "node_modules/yaml": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz",
-      "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz",
+      "integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==",
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"
diff --git a/poetry.lock b/poetry.lock
index 886dfe53d8..dd60884828 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -328,13 +328,13 @@ files = [
 
 [[package]]
 name = "tomli"
-version = "2.0.1"
+version = "2.0.2"
 description = "A lil' TOML parser"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
-    {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
+    {file = "tomli-2.0.2-py3-none-any.whl", hash = "sha256:2ebe24485c53d303f690b0ec092806a085f07af5a5aa1464f3931eec36caaa38"},
+    {file = "tomli-2.0.2.tar.gz", hash = "sha256:d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed"},
 ]
 
 [[package]]
diff --git a/web_src/fomantic/package-lock.json b/web_src/fomantic/package-lock.json
index 0b9dc6eaa7..43eec8123b 100644
--- a/web_src/fomantic/package-lock.json
+++ b/web_src/fomantic/package-lock.json
@@ -211,9 +211,9 @@
       }
     },
     "node_modules/@octokit/core/node_modules/@octokit/types": {
-      "version": "13.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.0.tgz",
-      "integrity": "sha512-CrooV/vKCXqwLa+osmHLIMUb87brpgUqlqkPGc6iE2wCkUvTrHiXFMhAKoDDaAAYJrtKtrFTgSQTg5nObBEaew==",
+      "version": "13.6.1",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.1.tgz",
+      "integrity": "sha512-PHZE9Z+kWXb23Ndik8MKPirBPziOc0D2/3KH1P+6jK5nGWe96kadZuE4jev2/Jq7FvIfTlT2Ltg8Fv2x1v0a5g==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -317,9 +317,9 @@
       }
     },
     "node_modules/@octokit/graphql/node_modules/@octokit/types": {
-      "version": "13.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.0.tgz",
-      "integrity": "sha512-CrooV/vKCXqwLa+osmHLIMUb87brpgUqlqkPGc6iE2wCkUvTrHiXFMhAKoDDaAAYJrtKtrFTgSQTg5nObBEaew==",
+      "version": "13.6.1",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.1.tgz",
+      "integrity": "sha512-PHZE9Z+kWXb23Ndik8MKPirBPziOc0D2/3KH1P+6jK5nGWe96kadZuE4jev2/Jq7FvIfTlT2Ltg8Fv2x1v0a5g==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -492,9 +492,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.7.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.4.tgz",
-      "integrity": "sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg==",
+      "version": "22.7.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.7.tgz",
+      "integrity": "sha512-SRxCrrg9CL/y54aiMCG3edPKdprgMVGDXjA3gB8UmmBW5TcXzRUYAh8EWzTnSJFAd1rgImPELza+A3bJ+qxz8Q==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.19.2"
@@ -1219,9 +1219,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001664",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz",
-      "integrity": "sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==",
+      "version": "1.0.30001669",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz",
+      "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==",
       "funding": [
         {
           "type": "opencollective",
@@ -1961,9 +1961,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.29",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.29.tgz",
-      "integrity": "sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw==",
+      "version": "1.5.41",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.41.tgz",
+      "integrity": "sha512-dfdv/2xNjX0P8Vzme4cfzHqnPm5xsZXwsolTYr0eyW18IUmNyG08vL+fttvinTfhKfIKdRoqkDIC9e9iWQCNYQ==",
       "license": "ISC"
     },
     "node_modules/emoji-regex": {
@@ -5760,9 +5760,9 @@
       "license": "ISC"
     },
     "node_modules/nan": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz",
-      "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==",
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
+      "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
       "license": "MIT",
       "optional": true
     },
@@ -8259,9 +8259,9 @@
       }
     },
     "node_modules/update-browserslist-db/node_modules/picocolors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
-      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
       "license": "ISC"
     },
     "node_modules/urix": {

From 95c7599db5f5fb3546029bec22ca6126af81ad83 Mon Sep 17 00:00:00 2001
From: dragon 
Date: Mon, 21 Oct 2024 10:08:57 +0800
Subject: [PATCH 196/443] fix arch pkg

---
 routers/api/packages/arch/arch.go           |  9 ++++++--
 services/packages/arch/repository.go        | 12 +++++++++--
 tests/integration/api_packages_arch_test.go | 24 +++++++++++++++++++++
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/routers/api/packages/arch/arch.go b/routers/api/packages/arch/arch.go
index 15fcc37c70..ecd2281884 100644
--- a/routers/api/packages/arch/arch.go
+++ b/routers/api/packages/arch/arch.go
@@ -173,6 +173,12 @@ func PushPackage(ctx *context.Context) {
 		apiError(ctx, http.StatusInternalServerError, err)
 		return
 	}
+	if p.FileMetadata.Arch == "any" {
+		if err = arch_service.BuildCustomRepositoryFiles(ctx, ctx.Package.Owner.ID, group); err != nil {
+			apiError(ctx, http.StatusInternalServerError, err)
+			return
+		}
+	}
 	ctx.Status(http.StatusCreated)
 }
 
@@ -197,8 +203,7 @@ func GetPackageOrDB(ctx *context.Context) {
 	}
 
 	if archDBOrSig.MatchString(file) {
-		pkg, u, pf, err := arch_service.GetPackageDBFile(ctx, group, arch, ctx.Package.Owner.ID,
-			strings.HasSuffix(file, ".sig"))
+		pkg, u, pf, err := arch_service.GetPackageDBFile(ctx, ctx.Package.Owner.ID, group, arch, strings.HasSuffix(file, ".sig"))
 		if err != nil {
 			if errors.Is(err, util.ErrNotExist) {
 				apiError(ctx, http.StatusNotFound, err)
diff --git a/services/packages/arch/repository.go b/services/packages/arch/repository.go
index 58433ab5c2..763a0a2102 100644
--- a/services/packages/arch/repository.go
+++ b/services/packages/arch/repository.go
@@ -273,16 +273,24 @@ func GetPackageFile(ctx context.Context, group, file string, ownerID int64) (io.
 	return packages_service.GetPackageFileStream(ctx, pkgFile)
 }
 
-func GetPackageDBFile(ctx context.Context, group, arch string, ownerID int64, signFile bool) (io.ReadSeekCloser, *url.URL, *packages_model.PackageFile, error) {
+func GetPackageDBFile(ctx context.Context, ownerID int64, group, arch string, sigFile bool) (io.ReadSeekCloser, *url.URL, *packages_model.PackageFile, error) {
 	pv, err := GetOrCreateRepositoryVersion(ctx, ownerID)
 	if err != nil {
 		return nil, nil, nil, err
 	}
 	fileName := fmt.Sprintf("%s.db", arch)
-	if signFile {
+	if sigFile {
 		fileName = fmt.Sprintf("%s.db.sig", arch)
 	}
 	file, err := packages_model.GetFileForVersionByName(ctx, pv.ID, fileName, group)
+	// fail back to any db
+	if errors.Is(err, util.ErrNotExist) && arch != "any" {
+		fileName = "any.db"
+		if sigFile {
+			fileName = "any.db.sig"
+		}
+		file, err = packages_model.GetFileForVersionByName(ctx, pv.ID, fileName, group)
+	}
 	if err != nil {
 		return nil, nil, nil, err
 	}
diff --git a/tests/integration/api_packages_arch_test.go b/tests/integration/api_packages_arch_test.go
index 2cf0186416..8651af4a58 100644
--- a/tests/integration/api_packages_arch_test.go
+++ b/tests/integration/api_packages_arch_test.go
@@ -336,6 +336,30 @@ HMhNSS1IzUsBcpJAPFAwwUXSM0u4BjoaR8EoGAWjgGQAAILFeyQADAAA
 			MakeRequest(t, req, http.StatusNoContent)
 		}
 	})
+	t.Run("Package Arch Test", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		req := NewRequestWithBody(t, "PUT", rootURL, bytes.NewReader(pkgs["any"])).
+			AddBasicAuth(user.Name)
+		MakeRequest(t, req, http.StatusCreated)
+
+		req = NewRequest(t, "GET", rootURL+"/x86_64/base.db")
+		respPkg := MakeRequest(t, req, http.StatusOK)
+
+		files, err := listTarGzFiles(respPkg.Body.Bytes())
+		require.NoError(t, err)
+		require.Len(t, files, 1)
+
+		req = NewRequestWithBody(t, "PUT", rootURL, bytes.NewReader(pkgs["otherXZ"])).
+			AddBasicAuth(user.Name)
+		MakeRequest(t, req, http.StatusCreated)
+
+		req = NewRequest(t, "GET", rootURL+"/x86_64/base.db")
+		respPkg = MakeRequest(t, req, http.StatusOK)
+
+		files, err = listTarGzFiles(respPkg.Body.Bytes())
+		require.NoError(t, err)
+		require.Len(t, files, 2)
+	})
 }
 
 func getProperty(data, key string) string {

From e0ea4e2de4fa12e3a77c7a7a12b690e7a1cbaeee Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Mon, 21 Oct 2024 07:40:17 +0200
Subject: [PATCH 197/443] feat(ci): allow manual triggering of the test suite

When a skip ci label is added to the PR title, removing it won't
trigger the CI. There needs to be a way to manually trigger it.
---
 .forgejo/workflows/testing.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml
index 3440993ce2..2801b9ef74 100644
--- a/.forgejo/workflows/testing.yml
+++ b/.forgejo/workflows/testing.yml
@@ -6,6 +6,7 @@ on:
     branches:
       - 'forgejo*'
       - 'v*/forgejo*'
+  workflow_dispatch:
 
 jobs:
   backend-checks:

From 04e2e1510d748cddd3d5ff4374134212da9b5f31 Mon Sep 17 00:00:00 2001
From: Otto Richter 
Date: Mon, 21 Oct 2024 15:21:44 +0200
Subject: [PATCH 198/443] Revert "add gap between branch dropdown and PR
 button"

This change does not bring the desired benefit, because the button is
reinitialized from a Vue component once loaded, overriding this change
and causing a visual glitch upon page load (the button is moving its
position).

See the comment:

> this code must match the code in BranchTagSelector.vue

This button is also used in other places such as the release list where
the additional margin does not fit well. As such, this needs a new
solution.

This reverts commit 18cad9d342e6a43748117f028ce66520cfd34377.
---
 templates/repo/branch_dropdown.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl
index f2bda8e627..dcb1792485 100644
--- a/templates/repo/branch_dropdown.tmpl
+++ b/templates/repo/branch_dropdown.tmpl
@@ -70,7 +70,7 @@
 

 	{{/* show dummy elements before Vue componment is mounted, this code must match the code in BranchTagSelector.vue */}}
 	

-		

 		

-			

+			

 			{{if .RenderedContent}}
 				{{.RenderedContent}}
 			{{else}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 683dea8425..947a480df1 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -52,7 +52,7 @@
 						

 					

 					

-						

+						

 							{{if .Issue.RenderedContent}}
 								{{.Issue.RenderedContent}}
 							{{else}}
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index 08c83c07d7..99703f81ec 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -59,7 +59,7 @@
 						

 					

 					

-						

+						

 							{{if .RenderedContent}}
 								{{.RenderedContent}}
 							{{else}}
@@ -435,7 +435,7 @@
 							

 						

 						

-							

+							

 								{{if .RenderedContent}}
 									{{.RenderedContent}}
 								{{else}}
diff --git a/templates/repo/issue/view_content/context_menu.tmpl b/templates/repo/issue/view_content/context_menu.tmpl
index 4afd73c371..f020a9ea4b 100644
--- a/templates/repo/issue/view_content/context_menu.tmpl
+++ b/templates/repo/issue/view_content/context_menu.tmpl
@@ -11,7 +11,7 @@
 		{{end}}
 		
{{ctx.Locale.Tr "repo.issues.context.copy_link"}}

 		{{if and .ctxData.IsSigned (not .ctxData.Repository.IsArchived)}}
-			
{{ctx.Locale.Tr "repo.issues.context.quote_reply"}}

+			
{{ctx.Locale.Tr "repo.issues.context.quote_reply"}}

 			{{if not .ctxData.UnitIssuesGlobalDisabled}}
 				
{{ctx.Locale.Tr "repo.issues.context.reference_issue"}}

 			{{end}}
diff --git a/templates/repo/issue/view_content/conversation.tmpl b/templates/repo/issue/view_content/conversation.tmpl
index c788a61132..4492eb1d88 100644
--- a/templates/repo/issue/view_content/conversation.tmpl
+++ b/templates/repo/issue/view_content/conversation.tmpl
@@ -85,7 +85,7 @@
 							

 						

 						

-							

+							

 							{{if .RenderedContent}}
 								{{.RenderedContent}}
 							{{else}}
diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
index c870b6d86a..3e1bcefd66 100644
--- a/tests/e2e/e2e_test.go
+++ b/tests/e2e/e2e_test.go
@@ -49,7 +49,9 @@ func TestMain(m *testing.M) {
 
 	err := unittest.InitFixtures(
 		unittest.FixturesOptions{
-			Dir: filepath.Join(filepath.Dir(setting.AppPath), "models/fixtures/"),
+			Dir:  filepath.Join(setting.AppWorkPath, "models/fixtures/"),
+			Base: setting.AppWorkPath,
+			Dirs: []string{"tests/e2e/fixtures/"},
 		},
 	)
 	if err != nil {
diff --git a/tests/e2e/fixtures/comment.yml b/tests/e2e/fixtures/comment.yml
new file mode 100644
index 0000000000..f3f8a2d8e8
--- /dev/null
+++ b/tests/e2e/fixtures/comment.yml
@@ -0,0 +1,22 @@
+-
+  id: 1001
+  type: 0 # comment
+  poster_id: 2
+  issue_id: 1 # in repo_id 1
+  content: "## Lorem Ipsum\nI would like to say that **I am not appealed** that it took _so long_ for this `feature` to be [created](https://example.com) $e^{\\pi i} + 1 = 0$\n$$e^{\\pi i} + 1 = 0$$\n#1\n```js\nconsole.log('evil')\nalert('evil')\n```\n:+1: :100:"
+  created_unix: 946684811
+  updated_unix: 946684811
+  content_version: 1
+
+-
+  id: 1002
+  type: 21 # code comment
+  poster_id: 2
+  issue_id: 19
+  content: "## Lorem Ipsum\nI would like to say that **I am not appealed** that it took _so long_ for this `feature` to be [created](https://example.com) $e^{\\pi i} + 1 = 0$\n$$e^{\\pi i} + 1 = 0$$\n#1\n```js\nconsole.log('evil')\nalert('evil')\n```\n:+1: :100:"
+  review_id: 1001
+  line: 1
+  tree_path: "test1.txt"
+  created_unix: 946684812
+  invalidated: false
+  content_version: 1
diff --git a/tests/e2e/fixtures/review.yml b/tests/e2e/fixtures/review.yml
new file mode 100644
index 0000000000..0892c54e55
--- /dev/null
+++ b/tests/e2e/fixtures/review.yml
@@ -0,0 +1,8 @@
+-
+  id: 1001
+  type: 22
+  reviewer_id: 1
+  issue_id: 2
+  content: "Review Comment"
+  updated_unix: 946684810
+  created_unix: 946684810
diff --git a/tests/e2e/issue-comment.test.e2e.js b/tests/e2e/issue-comment.test.e2e.js
index a21f00c511..8a1e48d75f 100644
--- a/tests/e2e/issue-comment.test.e2e.js
+++ b/tests/e2e/issue-comment.test.e2e.js
@@ -44,6 +44,7 @@ test('Hyperlink paste behaviour', async ({browser}, workerInfo) => {
   await page.locator('textarea').press('ControlOrMeta+a');
   await page.locator('textarea').press('ControlOrMeta+v');
   await expect(page.locator('textarea')).toHaveValue('https://codeberg.org/forgejo/forgejo#some-anchor');
+  await page.locator('textarea').fill('');
 });
 
 test('Always focus edit tab first on edit', async ({browser}, workerInfo) => {
@@ -68,3 +69,109 @@ test('Always focus edit tab first on edit', async ({browser}, workerInfo) => {
   await expect(editTab).toHaveClass(/active/);
   await expect(previewTab).not.toHaveClass(/active/);
 });
+
+test('Quote reply', async ({browser}, workerInfo) => {
+  test.skip(workerInfo.project.name !== 'firefox', 'Uses Firefox specific selection quirks');
+  const page = await login({browser}, workerInfo);
+  const response = await page.goto('/user2/repo1/issues/1');
+  expect(response?.status()).toBe(200);
+
+  const editorTextarea = page.locator('textarea.markdown-text-editor');
+
+  // Full quote.
+  await page.click('#issuecomment-1001 .comment-container .context-menu');
+  await page.click('#issuecomment-1001 .quote-reply');
+
+  await expect(editorTextarea).toHaveValue('@user2 wrote in http://localhost:3003/user2/repo1/issues/1#issuecomment-1001:\n\n' +
+                                           '> ## [](#lorem-ipsum)Lorem Ipsum\n' +
+                                           '> \n' +
+                                           '> I would like to say that **I am not appealed** that it took _so long_ for this `feature` to be [created](https://example.com) \\(e^{\\pi i} + 1 = 0\\)\n' +
+                                           '> \n' +
+                                           '> \\[e^{\\pi i} + 1 = 0\\]\n' +
+                                           '> \n' +
+                                           '> #1\n' +
+                                           '> \n' +
+                                           '> ```js\n' +
+                                           "> console.log('evil')\n" +
+                                           "> alert('evil')\n" +
+                                           '> ```\n' +
+                                           '> \n' +
+                                           '> :+1: :100:\n\n');
+
+  await editorTextarea.fill('');
+
+  // Partial quote.
+  await page.click('#issuecomment-1001 .comment-container .context-menu');
+
+  await page.evaluate(() => {
+    const range = new Range();
+    range.setStart(document.querySelector('#issuecomment-1001-content #user-content-lorem-ipsum').childNodes[1], 6);
+    range.setEnd(document.querySelector('#issuecomment-1001-content p').childNodes[1].childNodes[0], 7);
+
+    const selection = window.getSelection();
+
+    // Add range to window selection
+    selection.addRange(range);
+  });
+
+  await page.click('#issuecomment-1001 .quote-reply');
+
+  await expect(editorTextarea).toHaveValue('@user2 wrote in http://localhost:3003/user2/repo1/issues/1#issuecomment-1001:\n\n' +
+                                           '> ## Ipsum\n' +
+                                           '> \n' +
+                                           '> I would like to say that **I am no**\n\n');
+
+  await editorTextarea.fill('');
+
+  // Another partial quote.
+  await page.click('#issuecomment-1001 .comment-container .context-menu');
+
+  await page.evaluate(() => {
+    const range = new Range();
+    range.setStart(document.querySelector('#issuecomment-1001-content p').childNodes[1].childNodes[0], 7);
+    range.setEnd(document.querySelector('#issuecomment-1001-content p').childNodes[7].childNodes[0], 3);
+
+    const selection = window.getSelection();
+
+    // Add range to window selection
+    selection.addRange(range);
+  });
+
+  await page.click('#issuecomment-1001 .quote-reply');
+
+  await expect(editorTextarea).toHaveValue('@user2 wrote in http://localhost:3003/user2/repo1/issues/1#issuecomment-1001:\n\n' +
+                                           '> **t appealed** that it took _so long_ for this `feature` to be [cre](https://example.com)\n\n');
+
+  await editorTextarea.fill('');
+});
+
+test('Pull quote reply', async ({browser}, workerInfo) => {
+  test.skip(workerInfo.project.name !== 'firefox', 'Uses Firefox specific selection quirks');
+  const page = await login({browser}, workerInfo);
+  const response = await page.goto('/user2/commitsonpr/pulls/1/files');
+  expect(response?.status()).toBe(200);
+
+  const editorTextarea = page.locator('textarea.markdown-text-editor');
+
+  // Full quote with no reply handler being open.
+  await page.click('.comment-code-cloud .context-menu');
+  await page.click('.comment-code-cloud .quote-reply');
+
+  await expect(editorTextarea).toHaveValue('@user2 wrote in http://localhost:3003/user2/commitsonpr/pulls/1/files#issuecomment-1002:\n\n' +
+                                           '> ## [](#lorem-ipsum)Lorem Ipsum\n' +
+                                           '> \n' +
+                                           '> I would like to say that **I am not appealed** that it took _so long_ for this `feature` to be [created](https://example.com) \\(e^{\\pi i} + 1 = 0\\)\n' +
+                                           '> \n' +
+                                           '> \\[e^{\\pi i} + 1 = 0\\]\n' +
+                                           '> \n' +
+                                           '> #1\n' +
+                                           '> \n' +
+                                           '> ```js\n' +
+                                           "> console.log('evil')\n" +
+                                           "> alert('evil')\n" +
+                                           '> ```\n' +
+                                           '> \n' +
+                                           '> :+1: :100:\n\n');
+
+  await editorTextarea.fill('');
+});
diff --git a/tests/integration/repo_issue_title_test.go b/tests/integration/repo_issue_title_test.go
index 5199be91bc..cf517a7a40 100644
--- a/tests/integration/repo_issue_title_test.go
+++ b/tests/integration/repo_issue_title_test.go
@@ -39,7 +39,7 @@ func TestIssueTitles(t *testing.T) {
 
 		titleHTML := []string{
 			"Title",
-			`👍`,
+			`👍`,
 			`code`,
 		}
 
diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js
index 73aaa457f2..257e735e8e 100644
--- a/web_src/js/features/repo-legacy.js
+++ b/web_src/js/features/repo-legacy.js
@@ -27,6 +27,8 @@ import {hideElem, showElem} from '../utils/dom.js';
 import {getComboMarkdownEditor, initComboMarkdownEditor} from './comp/ComboMarkdownEditor.js';
 import {attachRefIssueContextPopup} from './contextpopup.js';
 import {POST, GET} from '../modules/fetch.js';
+import {MarkdownQuote} from '@github/quote-selection';
+import {toAbsoluteUrl} from '../utils.js';
 
 const {csrfToken} = window.config;
 
@@ -579,32 +581,105 @@ export function initRepository() {
   initUnicodeEscapeButton();
 }
 
+const filters = {
+  A(el) {
+    if (el.classList.contains('mention') || el.classList.contains('ref-issue')) {
+      return el.textContent;
+    }
+    return el;
+  },
+  PRE(el) {
+    const firstChild = el.children[0];
+    if (firstChild && el.classList.contains('code-block')) {
+      // Get the language of the codeblock.
+      const language = firstChild.className.match(/language-(\S+)/);
+      // Remove trailing newlines.
+      const text = el.textContent.replace(/\n+$/, '');
+      el.textContent = `\`\`\`${language[1]}\n${text}\n\`\`\`\n\n`;
+    }
+    return el;
+  },
+  SPAN(el) {
+    const emojiAlias = el.getAttribute('data-alias');
+    if (emojiAlias && el.classList.contains('emoji')) {
+      return `:${emojiAlias}:`;
+    }
+    if (el.classList.contains('katex')) {
+      const texCode = el.querySelector('annotation[encoding="application/x-tex"]').textContent;
+      if (el.parentElement.classList.contains('katex-display')) {
+        el.textContent = `\\[${texCode}\\]\n\n`;
+      } else {
+        el.textContent = `\\(${texCode}\\)\n\n`;
+      }
+    }
+    return el;
+  },
+};
+
+function hasContent(node) {
+  return node.nodeName === 'IMG' || node.firstChild !== null;
+}
+
+// This code matches that of what is done by @github/quote-selection
+function preprocessFragment(fragment) {
+  const nodeIterator = document.createNodeIterator(fragment, NodeFilter.SHOW_ELEMENT, {
+    acceptNode(node) {
+      if (node.nodeName in filters && hasContent(node)) {
+        return NodeFilter.FILTER_ACCEPT;
+      }
+
+      return NodeFilter.FILTER_SKIP;
+    },
+  });
+  const results = [];
+  let node = nodeIterator.nextNode();
+
+  while (node) {
+    if (node instanceof HTMLElement) {
+      results.push(node);
+    }
+    node = nodeIterator.nextNode();
+  }
+
+  // process deepest matches first
+  results.reverse();
+
+  for (const el of results) {
+    el.replaceWith(filters[el.nodeName](el));
+  }
+}
+
 function initRepoIssueCommentEdit() {
   // Edit issue or comment content
   $(document).on('click', '.edit-content', onEditContent);
 
   // Quote reply
-  $(document).on('click', '.quote-reply', async function (event) {
+  $(document).on('click', '.quote-reply', async (event) => {
     event.preventDefault();
-    const target = $(this).data('target');
-    const quote = $(`#${target}`).text().replace(/\n/g, '\n> ');
-    const content = `> ${quote}\n\n`;
-    let editor;
-    if (this.classList.contains('quote-reply-diff')) {
-      const $replyBtn = $(this).closest('.comment-code-cloud').find('button.comment-form-reply');
-      editor = await handleReply($replyBtn);
+    const quote = new MarkdownQuote('', preprocessFragment);
+
+    let editorTextArea;
+    if (event.target.classList.contains('quote-reply-diff')) {
+      // Temporarily store the range so it doesn't get lost (likely caused by async code).
+      const currentRange = quote.range;
+
+      const replyButton = event.target.closest('.comment-code-cloud').querySelector('button.comment-form-reply');
+      editorTextArea = (await handleReply($(replyButton))).textarea;
+
+      quote.range = currentRange;
     } else {
-      // for normal issue/comment page
-      editor = getComboMarkdownEditor($('#comment-form .combo-markdown-editor'));
+      editorTextArea = document.querySelector('#comment-form .combo-markdown-editor textarea');
     }
-    if (editor) {
-      if (editor.value()) {
-        editor.value(`${editor.value()}\n\n${content}`);
-      } else {
-        editor.value(content);
-      }
-      editor.focus();
-      editor.moveCursorToEnd();
+
+    // Select the whole comment body if there's no selection.
+    if (quote.range.collapsed) {
+      quote.select(document.querySelector(`#${event.target.getAttribute('data-target')}`));
+    }
+
+    // If the selection is in the comment body, then insert the quote.
+    if (quote.closest(`#${event.target.getAttribute('data-target')}`)) {
+      editorTextArea.value += `@${event.target.getAttribute('data-author')} wrote in ${toAbsoluteUrl(event.target.getAttribute('data-reference-url'))}:`;
+      quote.insert(editorTextArea);
     }
   });
 }

From c9cb4700340797bb15a27dfd5261e440afe21f5a Mon Sep 17 00:00:00 2001
From: wangjingcun 
Date: Tue, 22 Oct 2024 08:41:05 +0800
Subject: [PATCH 229/443] chore: fix some function names in comment (#32300)

fix some function names in comment

(cherry picked from commit 3d6ccbac3f20c485ab95a29d280c9371e558bfac)
---
 cmd/admin_auth_ldap.go | 2 +-
 models/issues/issue.go | 2 +-
 models/issues/pull.go  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd/admin_auth_ldap.go b/cmd/admin_auth_ldap.go
index e3c81809f8..aff2a12855 100644
--- a/cmd/admin_auth_ldap.go
+++ b/cmd/admin_auth_ldap.go
@@ -386,7 +386,7 @@ func (a *authService) addLdapSimpleAuth(c *cli.Context) error {
 	return a.createAuthSource(ctx, authSource)
 }
 
-// updateLdapBindDn updates a new LDAP (simple auth) authentication source.
+// updateLdapSimpleAuth updates a new LDAP (simple auth) authentication source.
 func (a *authService) updateLdapSimpleAuth(c *cli.Context) error {
 	ctx, cancel := installSignals()
 	defer cancel()
diff --git a/models/issues/issue.go b/models/issues/issue.go
index f7379b7e0c..13991da767 100644
--- a/models/issues/issue.go
+++ b/models/issues/issue.go
@@ -875,7 +875,7 @@ func GetPinnedIssues(ctx context.Context, repoID int64, isPull bool) (IssueList,
 	return issues, nil
 }
 
-// IsNewPinnedAllowed returns if a new Issue or Pull request can be pinned
+// IsNewPinAllowed returns if a new Issue or Pull request can be pinned
 func IsNewPinAllowed(ctx context.Context, repoID int64, isPull bool) (bool, error) {
 	var maxPin int
 	_, err := db.GetEngine(ctx).SQL("SELECT COUNT(pin_order) FROM issue WHERE repo_id = ? AND is_pull = ? AND pin_order > 0", repoID, isPull).Get(&maxPin)
diff --git a/models/issues/pull.go b/models/issues/pull.go
index 45e2e19434..e7663ea350 100644
--- a/models/issues/pull.go
+++ b/models/issues/pull.go
@@ -689,7 +689,7 @@ func GetPullRequestByIssueID(ctx context.Context, issueID int64) (*PullRequest,
 	return pr, pr.LoadAttributes(ctx)
 }
 
-// GetPullRequestsByBaseHeadInfo returns the pull request by given base and head
+// GetPullRequestByBaseHeadInfo returns the pull request by given base and head
 func GetPullRequestByBaseHeadInfo(ctx context.Context, baseID, headID int64, base, head string) (*PullRequest, error) {
 	pr := &PullRequest{}
 	sess := db.GetEngine(ctx).

From 00379db370a06ae4c8186bb5840fb03214523705 Mon Sep 17 00:00:00 2001
From: 0ko <0ko@noreply.codeberg.org>
Date: Sun, 27 Oct 2024 09:39:18 +0000
Subject: [PATCH 230/443] i18n: fix placeholders in string for refusing to
 review (#5713)

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5713
Reviewed-by: Earl Warren 
---
 options/locale/locale_en-US.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index cdfd409d96..113c94d71f 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1795,7 +1795,7 @@ issues.review.add_review_request = requested review from %[1]s %[2]s
 issues.review.add_review_requests = requested reviews from %[1]s %[2]s
 issues.review.remove_review_request = removed review request for %[1]s %[2]s
 issues.review.remove_review_requests = removed review requests for %[1]s %[2]s
-issues.review.remove_review_request_self = refused to review %[1]s %[2]s
+issues.review.remove_review_request_self = refused to review %s
 issues.review.add_remove_review_requests = requested reviews from %[1]s and removed review requests for %[2]s %[3]s
 issues.review.pending = Pending
 issues.review.pending.tooltip = This comment is not currently visible to other users. To submit your pending comments, select "%s" -> "%s/%s/%s" at the top of the page.

From 8c79008d6ff055df643a43cd6f9edbe220d87c35 Mon Sep 17 00:00:00 2001
From: Zettat123 
Date: Tue, 22 Oct 2024 13:09:19 +0800
Subject: [PATCH 231/443] Add `DISABLE_ORGANIZATIONS_PAGE` and
 `DISABLE_CODE_PAGE` settings for explore pages and fix an issue related to
 user search (#32288)

These settings can allow users to only display the repositories explore page.

Thanks to yp05327 and wxiaoguang !

---------

Co-authored-by: Giteabot 
Co-authored-by: wxiaoguang 
(cherry picked from commit 9206fbb55fd28f21720072fce6a36cc22277934c)

Conflicts:
	 - templates/explore/navbar.tmpl
	   Resolved by manually applying the last hunk to our template.
---
 custom/conf/app.example.ini               | 18 +++++++++++++
 modules/setting/service.go                |  6 +++--
 routers/api/v1/api.go                     | 12 +++++++--
 routers/web/explore/code.go               |  5 ++--
 routers/web/explore/org.go                |  8 +++++-
 routers/web/explore/repo.go               |  4 ++-
 routers/web/explore/user.go               |  4 ++-
 routers/web/user/search.go                | 31 +++++++----------------
 routers/web/web.go                        |  2 +-
 templates/explore/navbar.tmpl             |  7 +++--
 web_src/js/features/comp/SearchUserBox.js | 27 +++++++++-----------
 11 files changed, 75 insertions(+), 49 deletions(-)

diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index 24a1ccc6f4..3f0e9c447d 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -925,6 +925,24 @@ LEVEL = Info
 ;; Valid site url schemes for user profiles
 ;VALID_SITE_URL_SCHEMES=http,https
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;[service.explore]
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Only allow signed in users to view the explore pages.
+;REQUIRE_SIGNIN_VIEW = false
+;;
+;; Disable the users explore page.
+;DISABLE_USERS_PAGE = false
+;;
+;; Disable the organizations explore page.
+;DISABLE_ORGANIZATIONS_PAGE = false
+;;
+;; Disable the code explore page.
+;DISABLE_CODE_PAGE = false
+;;
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/modules/setting/service.go b/modules/setting/service.go
index afaee18101..128b8c7069 100644
--- a/modules/setting/service.go
+++ b/modules/setting/service.go
@@ -91,8 +91,10 @@ var Service = struct {
 
 	// Explore page settings
 	Explore struct {
-		RequireSigninView bool `ini:"REQUIRE_SIGNIN_VIEW"`
-		DisableUsersPage  bool `ini:"DISABLE_USERS_PAGE"`
+		RequireSigninView        bool `ini:"REQUIRE_SIGNIN_VIEW"`
+		DisableUsersPage         bool `ini:"DISABLE_USERS_PAGE"`
+		DisableOrganizationsPage bool `ini:"DISABLE_ORGANIZATIONS_PAGE"`
+		DisableCodePage          bool `ini:"DISABLE_CODE_PAGE"`
 	} `ini:"service.explore"`
 }{
 	AllowedUserVisibilityModesSlice: []bool{true, true, true},
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 6e4a97b885..b8f49a5bb6 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -395,12 +395,20 @@ func reqToken() func(ctx *context.APIContext) {
 
 func reqExploreSignIn() func(ctx *context.APIContext) {
 	return func(ctx *context.APIContext) {
-		if setting.Service.Explore.RequireSigninView && !ctx.IsSigned {
+		if (setting.Service.RequireSignInView || setting.Service.Explore.RequireSigninView) && !ctx.IsSigned {
 			ctx.Error(http.StatusUnauthorized, "reqExploreSignIn", "you must be signed in to search for users")
 		}
 	}
 }
 
+func reqUsersExploreEnabled() func(ctx *context.APIContext) {
+	return func(ctx *context.APIContext) {
+		if setting.Service.Explore.DisableUsersPage {
+			ctx.NotFound()
+		}
+	}
+}
+
 func reqBasicOrRevProxyAuth() func(ctx *context.APIContext) {
 	return func(ctx *context.APIContext) {
 		if ctx.IsSigned && setting.Service.EnableReverseProxyAuthAPI && ctx.Data["AuthedMethod"].(string) == auth.ReverseProxyMethodName {
@@ -887,7 +895,7 @@ func Routes() *web.Route {
 
 		// Users (requires user scope)
 		m.Group("/users", func() {
-			m.Get("/search", reqExploreSignIn(), user.Search)
+			m.Get("/search", reqExploreSignIn(), reqUsersExploreEnabled(), user.Search)
 
 			m.Group("/{username}", func() {
 				m.Get("", reqExploreSignIn(), user.GetInfo)
diff --git a/routers/web/explore/code.go b/routers/web/explore/code.go
index 437282cbb1..7992517ad4 100644
--- a/routers/web/explore/code.go
+++ b/routers/web/explore/code.go
@@ -21,12 +21,13 @@ const (
 
 // Code render explore code page
 func Code(ctx *context.Context) {
-	if !setting.Indexer.RepoIndexerEnabled {
+	if !setting.Indexer.RepoIndexerEnabled || setting.Service.Explore.DisableCodePage {
 		ctx.Redirect(setting.AppSubURL + "/explore")
 		return
 	}
 
-	ctx.Data["UsersIsDisabled"] = setting.Service.Explore.DisableUsersPage
+	ctx.Data["UsersPageIsDisabled"] = setting.Service.Explore.DisableUsersPage
+	ctx.Data["OrganizationsPageIsDisabled"] = setting.Service.Explore.DisableOrganizationsPage
 	ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
 	ctx.Data["Title"] = ctx.Tr("explore")
 	ctx.Data["PageIsExplore"] = true
diff --git a/routers/web/explore/org.go b/routers/web/explore/org.go
index f8fd6ec38e..7178630b64 100644
--- a/routers/web/explore/org.go
+++ b/routers/web/explore/org.go
@@ -14,7 +14,13 @@ import (
 
 // Organizations render explore organizations page
 func Organizations(ctx *context.Context) {
-	ctx.Data["UsersIsDisabled"] = setting.Service.Explore.DisableUsersPage
+	if setting.Service.Explore.DisableOrganizationsPage {
+		ctx.Redirect(setting.AppSubURL + "/explore")
+		return
+	}
+
+	ctx.Data["UsersPageIsDisabled"] = setting.Service.Explore.DisableUsersPage
+	ctx.Data["CodePageIsDisabled"] = setting.Service.Explore.DisableCodePage
 	ctx.Data["Title"] = ctx.Tr("explore")
 	ctx.Data["PageIsExplore"] = true
 	ctx.Data["PageIsExploreOrganizations"] = true
diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go
index 116b983b3a..798fdf5654 100644
--- a/routers/web/explore/repo.go
+++ b/routers/web/explore/repo.go
@@ -165,7 +165,9 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 
 // Repos render explore repositories page
 func Repos(ctx *context.Context) {
-	ctx.Data["UsersIsDisabled"] = setting.Service.Explore.DisableUsersPage
+	ctx.Data["UsersPageIsDisabled"] = setting.Service.Explore.DisableUsersPage
+	ctx.Data["OrganizationsPageIsDisabled"] = setting.Service.Explore.DisableOrganizationsPage
+	ctx.Data["CodePageIsDisabled"] = setting.Service.Explore.DisableCodePage
 	ctx.Data["Title"] = ctx.Tr("explore")
 	ctx.Data["PageIsExplore"] = true
 	ctx.Data["PageIsExploreRepositories"] = true
diff --git a/routers/web/explore/user.go b/routers/web/explore/user.go
index b79a79fb2c..15c60f546f 100644
--- a/routers/web/explore/user.go
+++ b/routers/web/explore/user.go
@@ -131,9 +131,11 @@ func RenderUserSearch(ctx *context.Context, opts *user_model.SearchUserOptions,
 // Users render explore users page
 func Users(ctx *context.Context) {
 	if setting.Service.Explore.DisableUsersPage {
-		ctx.Redirect(setting.AppSubURL + "/explore/repos")
+		ctx.Redirect(setting.AppSubURL + "/explore")
 		return
 	}
+	ctx.Data["OrganizationsPageIsDisabled"] = setting.Service.Explore.DisableOrganizationsPage
+	ctx.Data["CodePageIsDisabled"] = setting.Service.Explore.DisableCodePage
 	ctx.Data["Title"] = ctx.Tr("explore")
 	ctx.Data["PageIsExplore"] = true
 	ctx.Data["PageIsExploreUsers"] = true
diff --git a/routers/web/user/search.go b/routers/web/user/search.go
index fb7729bbe1..be5eee90a9 100644
--- a/routers/web/user/search.go
+++ b/routers/web/user/search.go
@@ -8,37 +8,24 @@ import (
 
 	"code.gitea.io/gitea/models/db"
 	user_model "code.gitea.io/gitea/models/user"
+	"code.gitea.io/gitea/modules/optional"
+	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/services/context"
 	"code.gitea.io/gitea/services/convert"
 )
 
-// Search search users
-func Search(ctx *context.Context) {
-	listOptions := db.ListOptions{
-		Page:     ctx.FormInt("page"),
-		PageSize: convert.ToCorrectPageSize(ctx.FormInt("limit")),
-	}
-
-	users, maxResults, err := user_model.SearchUsers(ctx, &user_model.SearchUserOptions{
+// SearchCandidates searches candidate users for dropdown list
+func SearchCandidates(ctx *context.Context) {
+	users, _, err := user_model.SearchUsers(ctx, &user_model.SearchUserOptions{
 		Actor:       ctx.Doer,
 		Keyword:     ctx.FormTrim("q"),
-		UID:         ctx.FormInt64("uid"),
 		Type:        user_model.UserTypeIndividual,
-		IsActive:    ctx.FormOptionalBool("active"),
-		ListOptions: listOptions,
+		IsActive:    optional.Some(true),
+		ListOptions: db.ListOptions{PageSize: setting.UI.MembersPagingNum},
 	})
 	if err != nil {
-		ctx.JSON(http.StatusInternalServerError, map[string]any{
-			"ok":    false,
-			"error": err.Error(),
-		})
+		ctx.ServerError("Unable to search users", err)
 		return
 	}
-
-	ctx.SetTotalCountHeader(maxResults)
-
-	ctx.JSON(http.StatusOK, map[string]any{
-		"ok":   true,
-		"data": convert.ToUsers(ctx, ctx.Doer, users),
-	})
+	ctx.JSON(http.StatusOK, map[string]any{"data": convert.ToUsers(ctx, ctx.Doer, users)})
 }
diff --git a/routers/web/web.go b/routers/web/web.go
index c268f7224d..34880bdda1 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -642,7 +642,7 @@ func registerRoutes(m *web.Route) {
 		m.Post("/logout", auth.SignOut)
 		m.Get("/task/{task}", reqSignIn, user.TaskStatus)
 		m.Get("/stopwatches", reqSignIn, user.GetStopwatches)
-		m.Get("/search", ignExploreSignIn, user.Search)
+		m.Get("/search_candidates", ignExploreSignIn, user.SearchCandidates)
 		m.Group("/oauth2", func() {
 			m.Get("/{provider}", auth.SignInOAuth)
 			m.Get("/{provider}/callback", auth.SignInOAuthCallback)
diff --git a/templates/explore/navbar.tmpl b/templates/explore/navbar.tmpl
index 8e619fa66f..c07c0ba4a4 100644
--- a/templates/explore/navbar.tmpl
+++ b/templates/explore/navbar.tmpl
@@ -3,15 +3,18 @@
 		
 			{{svg "octicon-repo"}} {{ctx.Locale.Tr "explore.repos"}}
 		
-		{{if not .UsersIsDisabled}}
+		{{if not .UsersPageIsDisabled}}
 			
 				{{svg "octicon-person"}} {{ctx.Locale.Tr "explore.users"}}
 			
 		{{end}}
+		{{if not .OrganizationsPageIsDisabled}}
 		
 			{{svg "octicon-organization"}} {{ctx.Locale.Tr "explore.organizations"}}
 		
-		{{if and (not $.UnitTypeCode.UnitGlobalDisabled) .IsRepoIndexerEnabled}}
+		{{end}}
+
+		{{if and (not $.UnitTypeCode.UnitGlobalDisabled) .IsRepoIndexerEnabled (not .CodePageIsDisabled)}}
 		
 			{{svg "octicon-code"}} {{ctx.Locale.Tr "explore.code"}}
 		
diff --git a/web_src/js/features/comp/SearchUserBox.js b/web_src/js/features/comp/SearchUserBox.js
index 081c47425f..b03cbad16f 100644
--- a/web_src/js/features/comp/SearchUserBox.js
+++ b/web_src/js/features/comp/SearchUserBox.js
@@ -8,41 +8,38 @@ export function initCompSearchUserBox() {
   const searchUserBox = document.getElementById('search-user-box');
   if (!searchUserBox) return;
 
-  const $searchUserBox = $(searchUserBox);
   const allowEmailInput = searchUserBox.getAttribute('data-allow-email') === 'true';
   const allowEmailDescription = searchUserBox.getAttribute('data-allow-email-description') ?? undefined;
-  $searchUserBox.search({
+  $(searchUserBox).search({
     minCharacters: 2,
     apiSettings: {
-      url: `${appSubUrl}/user/search?active=1&q={query}`,
+      url: `${appSubUrl}/user/search_candidates?q={query}`,
       onResponse(response) {
-        const items = [];
-        const searchQuery = $searchUserBox.find('input').val();
+        const resultItems = [];
+        const searchQuery = searchUserBox.querySelector('input').value;
         const searchQueryUppercase = searchQuery.toUpperCase();
-        $.each(response.data, (_i, item) => {
+        for (const item of response.data) {
           const resultItem = {
             title: item.login,
             image: item.avatar_url,
+            description: htmlEscape(item.full_name),
           };
-          if (item.full_name) {
-            resultItem.description = htmlEscape(item.full_name);
-          }
           if (searchQueryUppercase === item.login.toUpperCase()) {
-            items.unshift(resultItem);
+            resultItems.unshift(resultItem); // add the exact match to the top
           } else {
-            items.push(resultItem);
+            resultItems.push(resultItem);
           }
-        });
+        }
 
-        if (allowEmailInput && !items.length && looksLikeEmailAddressCheck.test(searchQuery)) {
+        if (allowEmailInput && !resultItems.length && looksLikeEmailAddressCheck.test(searchQuery)) {
           const resultItem = {
             title: searchQuery,
             description: allowEmailDescription,
           };
-          items.push(resultItem);
+          resultItems.push(resultItem);
         }
 
-        return {results: items};
+        return {results: resultItems};
       },
     },
     searchFields: ['login', 'full_name'],

From 261c0a95b4f67296dccb700b946f213807213ea2 Mon Sep 17 00:00:00 2001
From: Lunny Xiao 
Date: Wed, 23 Oct 2024 09:28:28 +0800
Subject: [PATCH 232/443] Add warn log when deleting inactive users (#32318)

Add log for the problem #31480

(cherry picked from commit a264c46fb04112c5ec2c1b2acd523a2e4450da40)

Conflicts:
	- services/user/user.go
	  Resolved by manually adding the log line.
---
 services/user/user.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/user/user.go b/services/user/user.go
index 606a4b2137..817c46e059 100644
--- a/services/user/user.go
+++ b/services/user/user.go
@@ -306,6 +306,7 @@ func DeleteInactiveUsers(ctx context.Context, olderThan time.Duration) error {
 			// Ignore users that were set inactive by admin.
 			if models.IsErrUserOwnRepos(err) || models.IsErrUserHasOrgs(err) ||
 				models.IsErrUserOwnPackages(err) || models.IsErrDeleteLastAdminUser(err) {
+				log.Warn("Inactive user %q has repositories, organizations or packages, skipping deletion: %v", u.Name, err)
 				continue
 			}
 			return err

From 480d565944be2bd4aa91462f8ef98b3afafe14eb Mon Sep 17 00:00:00 2001
From: Lunny Xiao 
Date: Wed, 23 Oct 2024 14:41:00 +0800
Subject: [PATCH 233/443] Fix disable 2fa bug (#32320)

(cherry picked from commit 2abdbe88b5d16dcb345d27b73f1d9738f2d826dd)
---
 routers/web/user/setting/security/2fa.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/routers/web/user/setting/security/2fa.go b/routers/web/user/setting/security/2fa.go
index a145867ea4..7c85c0e4b7 100644
--- a/routers/web/user/setting/security/2fa.go
+++ b/routers/web/user/setting/security/2fa.go
@@ -34,8 +34,9 @@ func RegenerateScratchTwoFactor(ctx *context.Context) {
 		if auth.IsErrTwoFactorNotEnrolled(err) {
 			ctx.Flash.Error(ctx.Tr("settings.twofa_not_enrolled"))
 			ctx.Redirect(setting.AppSubURL + "/user/settings/security")
+		} else {
+			ctx.ServerError("SettingsTwoFactor: Failed to GetTwoFactorByUID", err)
 		}
-		ctx.ServerError("SettingsTwoFactor: Failed to GetTwoFactorByUID", err)
 		return
 	}
 
@@ -64,8 +65,9 @@ func DisableTwoFactor(ctx *context.Context) {
 		if auth.IsErrTwoFactorNotEnrolled(err) {
 			ctx.Flash.Error(ctx.Tr("settings.twofa_not_enrolled"))
 			ctx.Redirect(setting.AppSubURL + "/user/settings/security")
+		} else {
+			ctx.ServerError("SettingsTwoFactor: Failed to GetTwoFactorByUID", err)
 		}
-		ctx.ServerError("SettingsTwoFactor: Failed to GetTwoFactorByUID", err)
 		return
 	}
 
@@ -74,8 +76,9 @@ func DisableTwoFactor(ctx *context.Context) {
 			// There is a potential DB race here - we must have been disabled by another request in the intervening period
 			ctx.Flash.Success(ctx.Tr("settings.twofa_disabled"))
 			ctx.Redirect(setting.AppSubURL + "/user/settings/security")
+		} else {
+			ctx.ServerError("SettingsTwoFactor: Failed to DeleteTwoFactorByID", err)
 		}
-		ctx.ServerError("SettingsTwoFactor: Failed to DeleteTwoFactorByID", err)
 		return
 	}
 

From 83e4139d410f3f9ca46e65ba808c03b37f366bfe Mon Sep 17 00:00:00 2001
From: Gergely Nagy 
Date: Sun, 27 Oct 2024 11:00:20 +0100
Subject: [PATCH 234/443] chore(release-notes): notes for the week 2024-44
 weekly cherry pick

---
 release-notes/5714.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 release-notes/5714.md

diff --git a/release-notes/5714.md b/release-notes/5714.md
new file mode 100644
index 0000000000..968ad8bb51
--- /dev/null
+++ b/release-notes/5714.md
@@ -0,0 +1,3 @@
+fix: [commit](https://codeberg.org/forgejo/forgejo/commit/d13a4ab5632d6a9697bd0907f9c69ed57d949340) Fixed a bug related to disabling two-factor authentication
+chore: [commit](https://codeberg.org/forgejo/forgejo/commit/ab26d880932dbc116c43ea277029984c7a6d4e94) Emit a log message when failing to delete an inactive user
+feat: [commit](https://codeberg.org/forgejo/forgejo/commit/ab660c5944d59cdb4ecc071401445ac9f53cee45) Add `DISABLE_ORGANIZATIONS_PAGE` and `DISABLE_CODE_PAGE` settings for explore pages

From 492c667a6ffb119a2d024a09c489ad99b7a5fc7f Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Mon, 28 Oct 2024 00:06:32 +0000
Subject: [PATCH 235/443] Lock file maintenance

---
 package-lock.json                  | 1769 +++++++++++++---------------
 web_src/fomantic/package-lock.json |   32 +-
 2 files changed, 823 insertions(+), 978 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index aa09af59f0..2841e704f6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -172,12 +172,13 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz",
-      "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.0.tgz",
+      "integrity": "sha512-INCKxTtbXtcNbUZ3YXutwMpEleqttcswhAdee7dhuoVrD2cnuc3PqtERBtxkX5nziX9vnBL8WXmSGwv8CuPV6g==",
       "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.25.7",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
       },
       "engines": {
@@ -185,9 +186,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.8.tgz",
-      "integrity": "sha512-ZsysZyXY4Tlx+Q53XdnOFmqwfB9QDTHYxaZYajWRoBLuLEAwI2UIbtxOjWh/cFaa9IKUlcB+DDuoskLuKu56JA==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.0.tgz",
+      "integrity": "sha512-qETICbZSLe7uXv9VE8T/RWOdIE5qqyTucOt4zLYMafj2MRO271VGgLd4RACJMeBO37UPWhXiKMBk7YlJ0fOzQA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -275,13 +276,14 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz",
-      "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.0.tgz",
+      "integrity": "sha512-/AIkAmInnWwgEAJGQr9vY0c66Mj6kjkE2ZPB1PurTRaRAh3U+J45sAQMjQDJdh4WbR3l0x5xkimXBKyBXXAu2w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.7",
+        "@babel/parser": "^7.26.0",
+        "@babel/types": "^7.26.0",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^3.0.2"
@@ -291,41 +293,41 @@
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
-      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.7.tgz",
-      "integrity": "sha512-12xfNeKNH7jubQNm7PAkzlLwEmCs1tfuX3UjIw6vP6QXi+leKh6+LyC/+Ed4EIQermwd58wsyh070yjDHFlNGg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz",
+      "integrity": "sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz",
-      "integrity": "sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz",
+      "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.25.7",
-        "@babel/helper-validator-option": "^7.25.7",
+        "@babel/compat-data": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
@@ -345,18 +347,18 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.7.tgz",
-      "integrity": "sha512-bD4WQhbkx80mAyj/WCm4ZHcF4rDxkoLFO6ph8/5/mQ3z4vAzltQXAmbc7GvVJx5H+lk5Mi5EmbTeox5nMGCsbw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz",
+      "integrity": "sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-member-expression-to-functions": "^7.25.7",
-        "@babel/helper-optimise-call-expression": "^7.25.7",
-        "@babel/helper-replace-supers": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
-        "@babel/traverse": "^7.25.7",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -377,13 +379,13 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.7.tgz",
-      "integrity": "sha512-byHhumTj/X47wJ6C6eLpK7wW/WBEcnUeb7D0FNc/jFQnQVw7DOso3Zz5u9x/zLrFVkHa89ZGDbkAa1D54NdrCQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz",
+      "integrity": "sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
         "regexpu-core": "^6.1.1",
         "semver": "^6.3.1"
       },
@@ -422,44 +424,43 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.7.tgz",
-      "integrity": "sha512-O31Ssjd5K6lPbTX9AAYpSKrZmLeagt9uwschJd+Ixo6QiRyfpvgtVQp8qrDR9UNFjZ8+DO34ZkdrN+BnPXemeA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
+      "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.7.tgz",
-      "integrity": "sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.7.tgz",
-      "integrity": "sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+      "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.25.7",
-        "@babel/helper-simple-access": "^7.25.7",
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -469,22 +470,22 @@
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.7.tgz",
-      "integrity": "sha512-VAwcwuYhv/AT+Vfr28c9y6SHzTan1ryqrydSTFGjU0uDJHw3uZ+PduI8plCLkRsDnqK2DMEDmwrOQRsK/Ykjng==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz",
+      "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.7.tgz",
-      "integrity": "sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz",
+      "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -492,15 +493,15 @@
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.7.tgz",
-      "integrity": "sha512-kRGE89hLnPfcz6fTrlNU+uhgcwv0mBE4Gv3P9Ke9kLVJYpi4AMVVEElXvB5CabrPZW4nCM8P8UyyjrzCM0O2sw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz",
+      "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-wrap-function": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-wrap-function": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -510,15 +511,15 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.7.tgz",
-      "integrity": "sha512-iy8JhqlUW9PtZkd4pHM96v6BdJ66Ba9yWSE4z0W4TvSZwLBPkyDsiIU3ENe4SmrzRBs76F7rQXTy1lYC49n6Lw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz",
+      "integrity": "sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.25.7",
-        "@babel/helper-optimise-call-expression": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -528,55 +529,55 @@
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.7.tgz",
-      "integrity": "sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz",
+      "integrity": "sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.7.tgz",
-      "integrity": "sha512-pPbNbchZBkPMD50K0p3JGcFMNLVUCuU/ABybm/PGNj4JiHrpmNyqqCphBk4i19xXtNV0JhldQJJtbSW5aUvbyA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
+      "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz",
-      "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz",
-      "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz",
-      "integrity": "sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+      "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -584,127 +585,41 @@
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.7.tgz",
-      "integrity": "sha512-MA0roW3JF2bD1ptAaJnvcabsVlNQShUaThyJbCDD4bCp8NEgiFvpoqRI2YS22hHlc2thjO/fTg2ShLMC3jygAg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz",
+      "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.25.7",
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/template": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.7.tgz",
-      "integrity": "sha512-Sv6pASx7Esm38KQpF/U/OXLwPPrdGHNKoeblRxgZRLXnAtnkEe4ptJPDtAZM7fBLadbc1Q07kQpSiGQ0Jg6tRA==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
+      "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.26.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz",
-      "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "license": "MIT"
-    },
-    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/parser": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz",
-      "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==",
+      "version": "7.26.1",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.1.tgz",
+      "integrity": "sha512-reoQYNiAJreZNsJzyrDNzFQ+IQ5JFiIzAHJg9bn94S3l+4++J7RsIhNMoB+lgP/9tpmiAQqspv+xfdxTSzREOw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.8"
+        "@babel/types": "^7.26.0"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -714,14 +629,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.7.tgz",
-      "integrity": "sha512-UV9Lg53zyebzD1DwQoT9mzkEKa922LNUp5YkTJ6Uta0RbyXaQNUgcvSt7qIu1PpPzVb6rd10OVNTzkyBGeVmxQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz",
+      "integrity": "sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -731,13 +646,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.7.tgz",
-      "integrity": "sha512-GDDWeVLNxRIkQTnJn2pDOM1pkCgYdSqPeT1a9vh9yIqu2uzzgw1zcqEb+IJOhy+dTBMlNdThrDIksr2o09qrrQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz",
+      "integrity": "sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -747,13 +662,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.7.tgz",
-      "integrity": "sha512-wxyWg2RYaSUYgmd9MR0FyRGyeOMQE/Uzr1wzd/g5cf5bwi9A4v6HFdDm7y1MgDtod/fLOSTZY6jDgV0xU9d5bA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz",
+      "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -763,15 +678,15 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.7.tgz",
-      "integrity": "sha512-Xwg6tZpLxc4iQjorYsyGMyfJE7nP5MV8t/Ka58BgiA7Jw0fRqQNcANlLfdJ/yvBt9z9LD2We+BEkT7vLqZRWng==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz",
+      "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
-        "@babel/plugin-transform-optional-chaining": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/plugin-transform-optional-chaining": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -781,14 +696,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.7.tgz",
-      "integrity": "sha512-UVATLMidXrnH+GMUIuxq55nejlj02HP7F5ETyBONzP6G87fPBogG4CH6kxrSrdIuAjdwNO9VzyaYsrZPscWUrw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz",
+      "integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -871,13 +786,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-decorators": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.25.7.tgz",
-      "integrity": "sha512-oXduHo642ZhstLVYTe2z2GSJIruU0c/W3/Ghr6A5yGMsVrvdnxO1z+3pbTcT7f3/Clnt+1z8D/w1r1f1SHaCHw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.25.9.tgz",
+      "integrity": "sha512-ryzI0McXUPJnRCvMo4lumIKZUzhYUO/ScI+Mz4YVaTLt04DHNSjEUjKVvbzQjZFLuod/cYEc07mJWhzl6v4DPg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -913,13 +828,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-flow": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.25.7.tgz",
-      "integrity": "sha512-fyoj6/YdVtlv2ROig/J0fP7hh/wNO1MJGm1NR70Pg7jbkF+jOUL9joorqaCOQh06Y+LfgTagHzC8KqZ3MF782w==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.26.0.tgz",
+      "integrity": "sha512-B+O2DnPc0iG+YXFqOxv2WNuNU97ToWjOomUQ78DouOENWUaM5sVrmet9mcomUGQFwpJd//gvUagXBSdzO1fRKg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -929,13 +844,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.7.tgz",
-      "integrity": "sha512-ZvZQRmME0zfJnDQnVBKYzHxXT7lYBB3Revz1GuS7oLXWMgqUPX4G+DDbT30ICClht9WKV34QVrZhSw6WdklwZQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz",
+      "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -945,13 +860,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.7.tgz",
-      "integrity": "sha512-AqVo+dguCgmpi/3mYBdu9lkngOBlQ2w2vnNpa6gfiCxQZLzV4ZbhsXitJ2Yblkoe1VQwtHSaNmIaGll/26YWRw==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
+      "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -987,13 +902,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.7.tgz",
-      "integrity": "sha512-ruZOnKO+ajVL/MVx+PwNBPOkrnXTXoWMtte1MBpegfCArhqOe3Bj52avVj1huLLxNKYKXYaSxZ2F+woK1ekXfw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
+      "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1130,13 +1045,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.7.tgz",
-      "integrity": "sha512-EJN2mKxDwfOUCPxMO6MUI58RN3ganiRAG/MS/S3HfB6QFNjroAMelQo/gybyYq97WerCBAZoyrAoW8Tzdq2jWg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz",
+      "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1146,15 +1061,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.8.tgz",
-      "integrity": "sha512-9ypqkozyzpG+HxlH4o4gdctalFGIjjdufzo7I2XPda0iBnZ6a+FO0rIEQcdSPXp02CkvGsII1exJhmROPQd5oA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz",
+      "integrity": "sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-remap-async-to-generator": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-remap-async-to-generator": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1164,15 +1079,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.7.tgz",
-      "integrity": "sha512-ZUCjAavsh5CESCmi/xCpX1qcCaAglzs/7tmuvoFnJgA1dM7gQplsguljoTg+Ru8WENpX89cQyAtWoaE0I3X3Pg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz",
+      "integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-remap-async-to-generator": "^7.25.7"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-remap-async-to-generator": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1182,13 +1097,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.7.tgz",
-      "integrity": "sha512-xHttvIM9fvqW+0a3tZlYcZYSBpSWzGBFIt/sYG3tcdSzBB8ZeVgz2gBP7Df+sM0N1850jrviYSSeUuc+135dmQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz",
+      "integrity": "sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1198,13 +1113,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.7.tgz",
-      "integrity": "sha512-ZEPJSkVZaeTFG/m2PARwLZQ+OG0vFIhPlKHK/JdIMy8DbRJ/htz6LRrTFtdzxi9EHmcwbNPAKDnadpNSIW+Aow==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz",
+      "integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1214,14 +1129,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.7.tgz",
-      "integrity": "sha512-mhyfEW4gufjIqYFo9krXHJ3ElbFLIze5IDp+wQTxoPd+mwFb1NxatNAwmv8Q8Iuxv7Zc+q8EkiMQwc9IhyGf4g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz",
+      "integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1231,14 +1146,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.25.8.tgz",
-      "integrity": "sha512-e82gl3TCorath6YLf9xUwFehVvjvfqFhdOo4+0iVIVju+6XOi5XHkqB3P2AXnSwoeTX0HBoXq5gJFtvotJzFnQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz",
+      "integrity": "sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1248,17 +1163,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.7.tgz",
-      "integrity": "sha512-9j9rnl+YCQY0IGoeipXvnk3niWicIB6kCsWRGLwX241qSXpbA4MKxtp/EdvFxsc4zI5vqfLxzOd0twIJ7I99zg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz",
+      "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-compilation-targets": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-replace-supers": "^7.25.7",
-        "@babel/traverse": "^7.25.7",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1279,14 +1194,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.7.tgz",
-      "integrity": "sha512-QIv+imtM+EtNxg/XBKL3hiWjgdLjMOmZ+XzQwSgmBfKbfxUjBzGgVPklUuE55eq5/uVoh8gg3dqlrwR/jw3ZeA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz",
+      "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/template": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/template": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1296,13 +1211,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.7.tgz",
-      "integrity": "sha512-xKcfLTlJYUczdaM1+epcdh1UGewJqr9zATgrNHcLBcV2QmfvPPEixo/sK/syql9cEmbr7ulu5HMFG5vbbt/sEA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz",
+      "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1312,14 +1227,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.7.tgz",
-      "integrity": "sha512-kXzXMMRzAtJdDEgQBLF4oaiT6ZCU3oWHgpARnTKDAqPkDJ+bs3NrZb310YYevR5QlRo3Kn7dzzIdHbZm1VzJdQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz",
+      "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1329,13 +1244,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.7.tgz",
-      "integrity": "sha512-by+v2CjoL3aMnWDOyCIg+yxU9KXSRa9tN6MbqggH5xvymmr9p4AMjYkNlQy4brMceBnUyHZ9G8RnpvT8wP7Cfg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz",
+      "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1345,14 +1260,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.7.tgz",
-      "integrity": "sha512-HvS6JF66xSS5rNKXLqkk7L9c/jZ/cdIVIcoPVrnl8IsVpLggTjXs8OWekbLHs/VtYDDh5WXnQyeE3PPUGm22MA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz",
+      "integrity": "sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1362,13 +1277,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.8.tgz",
-      "integrity": "sha512-gznWY+mr4ZQL/EWPcbBQUP3BXS5FwZp8RUOw06BaRn8tQLzN4XLIxXejpHN9Qo8x8jjBmAAKp6FoS51AgkSA/A==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz",
+      "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1378,14 +1293,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.7.tgz",
-      "integrity": "sha512-yjqtpstPfZ0h/y40fAXRv2snciYr0OAoMXY/0ClC7tm4C/nG5NJKmIItlaYlLbIVAWNfrYuy9dq1bE0SbX0PEg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz",
+      "integrity": "sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1395,13 +1310,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.8.tgz",
-      "integrity": "sha512-sPtYrduWINTQTW7FtOy99VCTWp4H23UX7vYcut7S4CIMEXU+54zKX9uCoGkLsWXteyaMXzVHgzWbLfQ1w4GZgw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz",
+      "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1411,14 +1326,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-flow-strip-types": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.25.7.tgz",
-      "integrity": "sha512-q8Td2PPc6/6I73g96SreSUCKEcwMXCwcXSIAVTyTTN6CpJe0dMj8coxu1fg1T9vfBLi6Rsi6a4ECcFBbKabS5w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.25.9.tgz",
+      "integrity": "sha512-/VVukELzPDdci7UUsWQaSkhgnjIWXnIyRpM02ldxaVoFK96c41So8JcKT3m0gYjyv7j5FNPGS5vfELrWalkbDA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/plugin-syntax-flow": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/plugin-syntax-flow": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1428,14 +1343,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.7.tgz",
-      "integrity": "sha512-n/TaiBGJxYFWvpJDfsxSj9lEEE44BFM1EPGz4KEiTipTgkoFVVcCmzAL3qA7fdQU96dpo4gGf5HBx/KnDvqiHw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz",
+      "integrity": "sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1445,15 +1360,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.7.tgz",
-      "integrity": "sha512-5MCTNcjCMxQ63Tdu9rxyN6cAWurqfrDZ76qvVPrGYdBxIj+EawuuxTu/+dgJlhK5eRz3v1gLwp6XwS8XaX2NiQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz",
+      "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1463,13 +1378,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.8.tgz",
-      "integrity": "sha512-4OMNv7eHTmJ2YXs3tvxAfa/I43di+VcF+M4Wt66c88EAED1RoGaf1D64cL5FkRpNL+Vx9Hds84lksWvd/wMIdA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz",
+      "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1479,13 +1394,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.7.tgz",
-      "integrity": "sha512-fwzkLrSu2fESR/cm4t6vqd7ebNIopz2QHGtjoU+dswQo/P6lwAG04Q98lliE3jkz/XqnbGFLnUcE0q0CVUf92w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz",
+      "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1495,13 +1410,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.8.tgz",
-      "integrity": "sha512-f5W0AhSbbI+yY6VakT04jmxdxz+WsID0neG7+kQZbCOjuyJNdL5Nn4WIBm4hRpKnUcO9lP0eipUhFN12JpoH8g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz",
+      "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1511,13 +1426,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.7.tgz",
-      "integrity": "sha512-Std3kXwpXfRV0QtQy5JJcRpkqP8/wG4XL7hSKZmGlxPlDqmpXtEPRmhF7ztnlTCtUN3eXRUJp+sBEZjaIBVYaw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz",
+      "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1527,14 +1442,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.7.tgz",
-      "integrity": "sha512-CgselSGCGzjQvKzghCvDTxKHP3iooenLpJDO842ehn5D2G5fJB222ptnDwQho0WjEvg7zyoxb9P+wiYxiJX5yA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz",
+      "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1544,15 +1459,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.7.tgz",
-      "integrity": "sha512-L9Gcahi0kKFYXvweO6n0wc3ZG1ChpSFdgG+eV1WYZ3/dGbJK7vvk91FgGgak8YwRgrCuihF8tE/Xg07EkL5COg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz",
+      "integrity": "sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-simple-access": "^7.25.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-simple-access": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1562,16 +1477,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.7.tgz",
-      "integrity": "sha512-t9jZIvBmOXJsiuyOwhrIGs8dVcD6jDyg2icw1VL4A/g+FnWyJKwUfSSU2nwJuMV2Zqui856El9u+ElB+j9fV1g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz",
+      "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1581,14 +1496,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.7.tgz",
-      "integrity": "sha512-p88Jg6QqsaPh+EB7I9GJrIqi1Zt4ZBHUQtjw3z1bzEXcLh6GfPqzZJ6G+G1HBGKUNukT58MnKG7EN7zXQBCODw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz",
+      "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1598,14 +1513,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.7.tgz",
-      "integrity": "sha512-BtAT9LzCISKG3Dsdw5uso4oV1+v2NlVXIIomKJgQybotJY3OwCwJmkongjHgwGKoZXd0qG5UZ12JUlDQ07W6Ow==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz",
+      "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1615,13 +1530,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.7.tgz",
-      "integrity": "sha512-CfCS2jDsbcZaVYxRFo2qtavW8SpdzmBXC2LOI4oO0rP+JSRDxxF3inF4GcPsLgfb5FjkhXG5/yR/lxuRs2pySA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz",
+      "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1631,13 +1546,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.8.tgz",
-      "integrity": "sha512-Z7WJJWdQc8yCWgAmjI3hyC+5PXIubH9yRKzkl9ZEG647O9szl9zvmKLzpbItlijBnVhTUf1cpyWBsZ3+2wjWPQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz",
+      "integrity": "sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1647,13 +1562,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.8.tgz",
-      "integrity": "sha512-rm9a5iEFPS4iMIy+/A/PiS0QN0UyjPIeVvbU5EMZFKJZHt8vQnasbpo3T3EFcxzCeYO0BHfc4RqooCZc51J86Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz",
+      "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1663,15 +1578,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.8.tgz",
-      "integrity": "sha512-LkUu0O2hnUKHKE7/zYOIjByMa4VRaV2CD/cdGz0AxU9we+VA3kDDggKEzI0Oz1IroG+6gUP6UmWEHBMWZU316g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz",
+      "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/plugin-transform-parameters": "^7.25.7"
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/plugin-transform-parameters": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1681,14 +1596,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.7.tgz",
-      "integrity": "sha512-pWT6UXCEW3u1t2tcAGtE15ornCBvopHj9Bps9D2DsH15APgNVOTwwczGckX+WkAvBmuoYKRCFa4DK+jM8vh5AA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz",
+      "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-replace-supers": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1698,13 +1613,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.8.tgz",
-      "integrity": "sha512-EbQYweoMAHOn7iJ9GgZo14ghhb9tTjgOc88xFgYngifx7Z9u580cENCV159M4xDh3q/irbhSjZVpuhpC2gKBbg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz",
+      "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1714,14 +1629,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.8.tgz",
-      "integrity": "sha512-q05Bk7gXOxpTHoQ8RSzGSh/LHVB9JEIkKnk3myAWwZHnYiTGYtbdrYkIsS8Xyh4ltKf7GNUSgzs/6P2bJtBAQg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz",
+      "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1731,13 +1646,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.7.tgz",
-      "integrity": "sha512-FYiTvku63me9+1Nz7TOx4YMtW3tWXzfANZtrzHhUZrz4d47EEtMQhzFoZWESfXuAMMT5mwzD4+y1N8ONAX6lMQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
+      "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1747,14 +1662,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.7.tgz",
-      "integrity": "sha512-KY0hh2FluNxMLwOCHbxVOKfdB5sjWG4M183885FmaqWWiGMhRZq4DQRKH6mHdEucbJnyDyYiZNwNG424RymJjA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz",
+      "integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1764,15 +1679,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.8.tgz",
-      "integrity": "sha512-8Uh966svuB4V8RHHg0QJOB32QK287NBksJOByoKmHMp1TAobNniNalIkI2i5IPj5+S9NYCG4VIjbEuiSN8r+ow==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz",
+      "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-create-class-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1782,13 +1697,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.7.tgz",
-      "integrity": "sha512-lQEeetGKfFi0wHbt8ClQrUSUMfEeI3MMm74Z73T9/kuz990yYVtfofjf3NuA42Jy3auFOpbjDyCSiIkTs1VIYw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz",
+      "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1798,13 +1713,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-display-name": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.25.7.tgz",
-      "integrity": "sha512-r0QY7NVU8OnrwE+w2IWiRom0wwsTbjx4+xH2RTd7AVdof3uurXOF+/mXHQDRk+2jIvWgSaCHKMgggfvM4dyUGA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.25.9.tgz",
+      "integrity": "sha512-KJfMlYIUxQB1CJfO3e0+h0ZHWOTLCPP115Awhaz8U0Zpq36Gl/cXlpoyMRnUWlhNUBAzldnCiAZNvCDj7CrKxQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1814,17 +1729,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.7.tgz",
-      "integrity": "sha512-vILAg5nwGlR9EXE8JIOX4NHXd49lrYbN8hnjffDtoULwpL9hUx/N55nqh2qd0q6FyNDfjl9V79ecKGvFbcSA0Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.9.tgz",
+      "integrity": "sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-module-imports": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/plugin-syntax-jsx": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/plugin-syntax-jsx": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1834,13 +1749,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-development": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.25.7.tgz",
-      "integrity": "sha512-5yd3lH1PWxzW6IZj+p+Y4OLQzz0/LzlOG8vGqonHfVR3euf1vyzyMUJk9Ac+m97BH46mFc/98t9PmYLyvgL3qg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.25.9.tgz",
+      "integrity": "sha512-9mj6rm7XVYs4mdLIpbZnHOYdpW42uoiBCTVowg7sP1thUOiANgMb4UtpRivR0pp5iL+ocvUv7X4mZgFRpJEzGw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.25.7"
+        "@babel/plugin-transform-react-jsx": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1850,14 +1765,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.25.7.tgz",
-      "integrity": "sha512-6YTHJ7yjjgYqGc8S+CbEXhLICODk0Tn92j+vNJo07HFk9t3bjFgAKxPLFhHwF2NjmQVSI1zBRfBWUeVBa2osfA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.25.9.tgz",
+      "integrity": "sha512-KQ/Takk3T8Qzj5TppkS1be588lkbTp5uj7w6a0LeQaTMSckU/wK0oJ/pih+T690tkgI5jfmg2TqDJvd41Sj1Cg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1867,13 +1782,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.7.tgz",
-      "integrity": "sha512-mgDoQCRjrY3XK95UuV60tZlFCQGXEtMg8H+IsW72ldw1ih1jZhzYXbJvghmAEpg5UVhhnCeia1CkGttUvCkiMQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz",
+      "integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.9",
         "regenerator-transform": "^0.15.2"
       },
       "engines": {
@@ -1884,13 +1799,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.7.tgz",
-      "integrity": "sha512-3OfyfRRqiGeOvIWSagcwUTVk2hXBsr/ww7bLn6TRTuXnexA+Udov2icFOxFX9abaj4l96ooYkcNN1qi2Zvqwng==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz",
+      "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1900,13 +1815,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.7.tgz",
-      "integrity": "sha512-uBbxNwimHi5Bv3hUccmOFlUy3ATO6WagTApenHz9KzoIdn0XeACdB12ZJ4cjhuB2WSi80Ez2FWzJnarccriJeA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz",
+      "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1916,14 +1831,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.7.tgz",
-      "integrity": "sha512-Mm6aeymI0PBh44xNIv/qvo8nmbkpZze1KvR8MkEqbIREDxoiWTi18Zr2jryfRMwDfVZF9foKh060fWgni44luw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz",
+      "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1933,13 +1848,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.7.tgz",
-      "integrity": "sha512-ZFAeNkpGuLnAQ/NCsXJ6xik7Id+tHuS+NT+ue/2+rn/31zcdnupCdmunOizEaP0JsUmTFSTOPoQY7PkK2pttXw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz",
+      "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1949,13 +1864,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.7.tgz",
-      "integrity": "sha512-SI274k0nUsFFmyQupiO7+wKATAmMFf8iFgq2O+vVFXZ0SV9lNfT1NGzBEhjquFmD8I9sqHLguH+gZVN3vww2AA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz",
+      "integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1965,13 +1880,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.7.tgz",
-      "integrity": "sha512-OmWmQtTHnO8RSUbL0NTdtpbZHeNTnm68Gj5pA4Y2blFNh+V4iZR68V1qL9cI37J21ZN7AaCnkfdHtLExQPf2uA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz",
+      "integrity": "sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1981,13 +1896,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.7.tgz",
-      "integrity": "sha512-BN87D7KpbdiABA+t3HbVqHzKWUDN3dymLaTnPFAMyc8lV+KN3+YzNhVRNdinaCPA4AUqx7ubXbQ9shRjYBl3SQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz",
+      "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1997,14 +1912,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.7.tgz",
-      "integrity": "sha512-IWfR89zcEPQGB/iB408uGtSPlQd3Jpq11Im86vUgcmSTcoWAiQMCTOa2K2yNNqFJEBVICKhayctee65Ka8OB0w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz",
+      "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2014,14 +1929,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.7.tgz",
-      "integrity": "sha512-8JKfg/hiuA3qXnlLx8qtv5HWRbgyFx2hMMtpDDuU2rTckpKkGu4ycK5yYHwuEa16/quXfoxHBIApEsNyMWnt0g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz",
+      "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2031,14 +1946,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.7.tgz",
-      "integrity": "sha512-YRW8o9vzImwmh4Q3Rffd09bH5/hvY0pxg+1H1i0f7APoUeg12G7+HhLj9ZFNIrYkgBXhIijPJ+IXypN0hLTIbw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz",
+      "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2210,9 +2125,9 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz",
-      "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz",
+      "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
       "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
@@ -2222,32 +2137,32 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz",
-      "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+      "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.25.7",
-        "@babel/parser": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/code-frame": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz",
-      "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+      "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.25.7",
-        "@babel/generator": "^7.25.7",
-        "@babel/parser": "^7.25.7",
-        "@babel/template": "^7.25.7",
-        "@babel/types": "^7.25.7",
+        "@babel/code-frame": "^7.25.9",
+        "@babel/generator": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.25.9",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -2266,14 +2181,13 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz",
-      "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz",
+      "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.25.7",
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2462,9 +2376,9 @@
       }
     },
     "node_modules/@csstools/css-parser-algorithms": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.2.tgz",
-      "integrity": "sha512-6tC/MnlEvs5suR4Ahef4YlBccJDHZuxGsAlxXmybWjZ5jPxlzLSMlRZ9mVHSRvlD+CmtE7+hJ+UQbfXrws/rUQ==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.3.tgz",
+      "integrity": "sha512-15WQTALDyxAwSgAvLt7BksAssiSrNNhTv4zM7qX9U6R7FtpNskVVakzWQlYODlwPwXhGpKPmB10LM943pxMe7w==",
       "dev": true,
       "funding": [
         {
@@ -2485,9 +2399,9 @@
       }
     },
     "node_modules/@csstools/css-tokenizer": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.2.tgz",
-      "integrity": "sha512-IuTRcD53WHsXPCZ6W7ubfGqReTJ9Ra0yRRFmXYP/Re8hFYYfoIYIK4080X5luslVLWimhIeFq0hj09urVMQzTw==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz",
+      "integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==",
       "dev": true,
       "funding": [
         {
@@ -2960,17 +2874,20 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
+      "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
       "peerDependencies": {
         "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
@@ -3698,9 +3615,9 @@
       "license": "MIT"
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz",
-      "integrity": "sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.2.tgz",
+      "integrity": "sha512-ufoveNTKDg9t/b7nqI3lwbCG/9IJMhADBNjjz/Jn6LxIZxD7T5L8l2uO/wD99945F1Oo8FvgbbZJRguyk/BdzA==",
       "cpu": [
         "arm"
       ],
@@ -3712,9 +3629,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.0.tgz",
-      "integrity": "sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.2.tgz",
+      "integrity": "sha512-iZoYCiJz3Uek4NI0J06/ZxUgwAfNzqltK0MptPDO4OR0a88R4h0DSELMsflS6ibMCJ4PnLvq8f7O1d7WexUvIA==",
       "cpu": [
         "arm64"
       ],
@@ -3726,9 +3643,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz",
-      "integrity": "sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.2.tgz",
+      "integrity": "sha512-/UhrIxobHYCBfhi5paTkUDQ0w+jckjRZDZ1kcBL132WeHZQ6+S5v9jQPVGLVrLbNUebdIRpIt00lQ+4Z7ys4Rg==",
       "cpu": [
         "arm64"
       ],
@@ -3740,9 +3657,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.0.tgz",
-      "integrity": "sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.2.tgz",
+      "integrity": "sha512-1F/jrfhxJtWILusgx63WeTvGTwE4vmsT9+e/z7cZLKU8sBMddwqw3UV5ERfOV+H1FuRK3YREZ46J4Gy0aP3qDA==",
       "cpu": [
         "x64"
       ],
@@ -3753,10 +3670,38 @@
         "darwin"
       ]
     },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.24.2.tgz",
+      "integrity": "sha512-1YWOpFcGuC6iGAS4EI+o3BV2/6S0H+m9kFOIlyFtp4xIX5rjSnL3AwbTBxROX0c8yWtiWM7ZI6mEPTI7VkSpZw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.24.2.tgz",
+      "integrity": "sha512-3qAqTewYrCdnOD9Gl9yvPoAoFAVmPJsBvleabvx4bnu1Kt6DrB2OALeRVag7BdWGWLhP1yooeMLEi6r2nYSOjg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.0.tgz",
-      "integrity": "sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.2.tgz",
+      "integrity": "sha512-ArdGtPHjLqWkqQuoVQ6a5UC5ebdX8INPuJuJNWRe0RGa/YNhVvxeWmCTFQ7LdmNCSUzVZzxAvUznKaYx645Rig==",
       "cpu": [
         "arm"
       ],
@@ -3768,9 +3713,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.0.tgz",
-      "integrity": "sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.2.tgz",
+      "integrity": "sha512-B6UHHeNnnih8xH6wRKB0mOcJGvjZTww1FV59HqJoTJ5da9LCG6R4SEBt6uPqzlawv1LoEXSS0d4fBlHNWl6iYw==",
       "cpu": [
         "arm"
       ],
@@ -3782,9 +3727,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.0.tgz",
-      "integrity": "sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.2.tgz",
+      "integrity": "sha512-kr3gqzczJjSAncwOS6i7fpb4dlqcvLidqrX5hpGBIM1wtt0QEVtf4wFaAwVv8QygFU8iWUMYEoJZWuWxyua4GQ==",
       "cpu": [
         "arm64"
       ],
@@ -3796,9 +3741,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.0.tgz",
-      "integrity": "sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.2.tgz",
+      "integrity": "sha512-TDdHLKCWgPuq9vQcmyLrhg/bgbOvIQ8rtWQK7MRxJ9nvaxKx38NvY7/Lo6cYuEnNHqf6rMqnivOIPIQt6H2AoA==",
       "cpu": [
         "arm64"
       ],
@@ -3810,9 +3755,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.0.tgz",
-      "integrity": "sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.2.tgz",
+      "integrity": "sha512-xv9vS648T3X4AxFFZGWeB5Dou8ilsv4VVqJ0+loOIgDO20zIhYfDLkk5xoQiej2RiSQkld9ijF/fhLeonrz2mw==",
       "cpu": [
         "ppc64"
       ],
@@ -3824,9 +3769,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.0.tgz",
-      "integrity": "sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.2.tgz",
+      "integrity": "sha512-tbtXwnofRoTt223WUZYiUnbxhGAOVul/3StZ947U4A5NNjnQJV5irKMm76G0LGItWs6y+SCjUn/Q0WaMLkEskg==",
       "cpu": [
         "riscv64"
       ],
@@ -3838,9 +3783,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.0.tgz",
-      "integrity": "sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.2.tgz",
+      "integrity": "sha512-gc97UebApwdsSNT3q79glOSPdfwgwj5ELuiyuiMY3pEWMxeVqLGKfpDFoum4ujivzxn6veUPzkGuSYoh5deQ2Q==",
       "cpu": [
         "s390x"
       ],
@@ -3852,9 +3797,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz",
-      "integrity": "sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.2.tgz",
+      "integrity": "sha512-jOG/0nXb3z+EM6SioY8RofqqmZ+9NKYvJ6QQaa9Mvd3RQxlH68/jcB/lpyVt4lCiqr04IyaC34NzhUqcXbB5FQ==",
       "cpu": [
         "x64"
       ],
@@ -3866,9 +3811,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz",
-      "integrity": "sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.2.tgz",
+      "integrity": "sha512-XAo7cJec80NWx9LlZFEJQxqKOMz/lX3geWs2iNT5CHIERLFfd90f3RYLLjiCBm1IMaQ4VOX/lTC9lWfzzQm14Q==",
       "cpu": [
         "x64"
       ],
@@ -3880,9 +3825,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.0.tgz",
-      "integrity": "sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.2.tgz",
+      "integrity": "sha512-A+JAs4+EhsTjnPQvo9XY/DC0ztaws3vfqzrMNMKlwQXuniBKOIIvAAI8M0fBYiTCxQnElYu7mLk7JrhlQ+HeOw==",
       "cpu": [
         "arm64"
       ],
@@ -3894,9 +3839,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.0.tgz",
-      "integrity": "sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.2.tgz",
+      "integrity": "sha512-ZhcrakbqA1SCiJRMKSU64AZcYzlZ/9M5LaYil9QWxx9vLnkQ9Vnkve17Qn4SjlipqIIBFKjBES6Zxhnvh0EAEw==",
       "cpu": [
         "ia32"
       ],
@@ -3908,9 +3853,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz",
-      "integrity": "sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.2.tgz",
+      "integrity": "sha512-2mLH46K1u3r6uwc95hU+OR9q/ggYMpnS7pSp83Ece1HUQgF9Nh/QwTK5rcgbFnV9j+08yBrU5sA/P0RK2MSBNA==",
       "cpu": [
         "x64"
       ],
@@ -4568,12 +4513,12 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.7.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.7.tgz",
-      "integrity": "sha512-SRxCrrg9CL/y54aiMCG3edPKdprgMVGDXjA3gB8UmmBW5TcXzRUYAh8EWzTnSJFAd1rgImPELza+A3bJ+qxz8Q==",
+      "version": "22.8.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.1.tgz",
+      "integrity": "sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg==",
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~6.19.2"
+        "undici-types": "~6.19.8"
       }
     },
     "node_modules/@types/normalize-package-data": {
@@ -4607,14 +4552,14 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.10.0.tgz",
-      "integrity": "sha512-AgCaEjhfql9MDKjMUxWvH7HjLeBqMCBfIaBbzzIcBbQPZE7CPh1m6FF+L75NUMJFMLYhCywJXIDEMa3//1A0dw==",
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.11.0.tgz",
+      "integrity": "sha512-Uholz7tWhXmA4r6epo+vaeV7yjdKy5QFCERMjs1kMVsLRKIrSdM6o21W2He9ftp5PP6aWOVpD5zvrvuHZC0bMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.10.0",
-        "@typescript-eslint/visitor-keys": "8.10.0"
+        "@typescript-eslint/types": "8.11.0",
+        "@typescript-eslint/visitor-keys": "8.11.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4625,9 +4570,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.10.0.tgz",
-      "integrity": "sha512-k/E48uzsfJCRRbGLapdZgrX52csmWJ2rcowwPvOZ8lwPUv3xW6CcFeJAXgx4uJm+Ge4+a4tFOkdYvSpxhRhg1w==",
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.11.0.tgz",
+      "integrity": "sha512-tn6sNMHf6EBAYMvmPUaKaVeYvhUsrE6x+bXQTxjQRp360h1giATU0WvgeEys1spbvb5R+VpNOZ+XJmjD8wOUHw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4639,14 +4584,14 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.10.0.tgz",
-      "integrity": "sha512-3OE0nlcOHaMvQ8Xu5gAfME3/tWVDpb/HxtpUZ1WeOAksZ/h/gwrBzCklaGzwZT97/lBbbxJ16dMA98JMEngW4w==",
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.11.0.tgz",
+      "integrity": "sha512-yHC3s1z1RCHoCz5t06gf7jH24rr3vns08XXhfEqzYpd6Hll3z/3g23JRi0jM8A47UFKNc3u/y5KIMx8Ynbjohg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/types": "8.10.0",
-        "@typescript-eslint/visitor-keys": "8.10.0",
+        "@typescript-eslint/types": "8.11.0",
+        "@typescript-eslint/visitor-keys": "8.11.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -4684,16 +4629,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.10.0.tgz",
-      "integrity": "sha512-Oq4uZ7JFr9d1ZunE/QKy5egcDRXT/FrS2z/nlxzPua2VHFtmMvFNDvpq1m/hq0ra+T52aUezfcjGRIB7vNJF9w==",
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.11.0.tgz",
+      "integrity": "sha512-CYiX6WZcbXNJV7UNB4PLDIBtSdRmRI/nb0FMyqHPTQD1rMjA0foPLaPUV39C/MxkTd/QKSeX+Gb34PPsDVC35g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.10.0",
-        "@typescript-eslint/types": "8.10.0",
-        "@typescript-eslint/typescript-estree": "8.10.0"
+        "@typescript-eslint/scope-manager": "8.11.0",
+        "@typescript-eslint/types": "8.11.0",
+        "@typescript-eslint/typescript-estree": "8.11.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4707,13 +4652,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.10.0.tgz",
-      "integrity": "sha512-k8nekgqwr7FadWk548Lfph6V3r9OVqjzAIVskE7orMZR23cGJjAOVazsZSJW+ElyjfTM4wx/1g88Mi70DDtG9A==",
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.11.0.tgz",
+      "integrity": "sha512-EaewX6lxSjRJnc+99+dqzTeoDZUfyrA52d2/HRrkI830kgovWsmIiTfmr0NZorzqic7ga+1bS60lRBUgR3n/Bw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.10.0",
+        "@typescript-eslint/types": "8.11.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -5312,9 +5257,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
-      "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==",
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -5476,6 +5421,16 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "license": "Python-2.0"
     },
+    "node_modules/aria-query": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz",
+      "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/array-buffer-byte-length": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
@@ -5754,9 +5709,9 @@
       }
     },
     "node_modules/axe-core": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.1.tgz",
-      "integrity": "sha512-qPC9o+kD8Tir0lzNGLeghbOrWMr3ZJpaRlCIb6Uobt/7N4FiEDvqUMnxzCHRHmg8vOg14kr5gVNyScRmbMaJ9g==",
+      "version": "4.10.2",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.2.tgz",
+      "integrity": "sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==",
       "dev": true,
       "license": "MPL-2.0",
       "engines": {
@@ -5901,9 +5856,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
-      "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
+      "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
       "funding": [
         {
           "type": "opencollective",
@@ -5920,10 +5875,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001663",
-        "electron-to-chromium": "^1.5.28",
+        "caniuse-lite": "^1.0.30001669",
+        "electron-to-chromium": "^1.5.41",
         "node-releases": "^2.0.18",
-        "update-browserslist-db": "^1.1.0"
+        "update-browserslist-db": "^1.1.1"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -6041,9 +5996,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001669",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz",
-      "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==",
+      "version": "1.0.30001673",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001673.tgz",
+      "integrity": "sha512-WTrjUCSMp3LYX0nE12ECkV0a+e6LC85E0Auz75555/qr78Oc8YWhEPNfDd6SHdtlCMSzqtuXY0uyEMNRcsKpKw==",
       "funding": [
         {
           "type": "opencollective",
@@ -6061,9 +6016,9 @@
       "license": "CC-BY-4.0"
     },
     "node_modules/chai": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.1.tgz",
-      "integrity": "sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.2.tgz",
+      "integrity": "sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6634,9 +6589,9 @@
       "license": "MIT"
     },
     "node_modules/cytoscape": {
-      "version": "3.30.2",
-      "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.30.2.tgz",
-      "integrity": "sha512-oICxQsjW8uSaRmn4UK/jkczKOqTrVqt5/1WL0POiJUT2EKNc9STM4hYFHv917yu55aTBMFNRzymlJhVAiWPCxw==",
+      "version": "3.30.3",
+      "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.30.3.tgz",
+      "integrity": "sha512-HncJ9gGJbVtw7YXtIs3+6YAFSSiKsom0amWc33Z7QbylbY2JGMrA0yz4EwrdTScZxnwclXeEZHzO5pxoy0ZE4g==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10"
@@ -7246,39 +7201,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/deep-equal": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz",
-      "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.5",
-        "es-get-iterator": "^1.1.3",
-        "get-intrinsic": "^1.2.2",
-        "is-arguments": "^1.1.1",
-        "is-array-buffer": "^3.0.2",
-        "is-date-object": "^1.0.5",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "isarray": "^2.0.5",
-        "object-is": "^1.1.5",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.1",
-        "side-channel": "^1.0.4",
-        "which-boxed-primitive": "^1.0.2",
-        "which-collection": "^1.0.1",
-        "which-typed-array": "^1.1.13"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/deep-extend": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
@@ -7528,9 +7450,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.41",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.41.tgz",
-      "integrity": "sha512-dfdv/2xNjX0P8Vzme4cfzHqnPm5xsZXwsolTYr0eyW18IUmNyG08vL+fttvinTfhKfIKdRoqkDIC9e9iWQCNYQ==",
+      "version": "1.5.47",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.47.tgz",
+      "integrity": "sha512-zS5Yer0MOYw4rtK2iq43cJagHZ8sXN0jDHDKzB+86gSBSAI4v07S97mcq+Gs2vclAxSh1j7vOAHxSVgduiiuVQ==",
       "license": "ISC"
     },
     "node_modules/emoji-regex": {
@@ -7710,27 +7632,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/es-get-iterator": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
-      "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.3",
-        "is-arguments": "^1.1.1",
-        "is-map": "^2.0.2",
-        "is-set": "^2.0.2",
-        "is-string": "^1.0.7",
-        "isarray": "^2.0.5",
-        "stop-iteration-iterator": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/es-iterator-helpers": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.1.0.tgz",
@@ -8182,13 +8083,13 @@
       }
     },
     "node_modules/eslint-plugin-jsx-a11y": {
-      "version": "6.10.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.0.tgz",
-      "integrity": "sha512-ySOHvXX8eSN6zz8Bywacm7CvGNhUtdjvqfQDVe6020TUK34Cywkw7m0KsCCk1Qtm9G1FayfTN1/7mMYnYO2Bhg==",
+      "version": "6.10.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz",
+      "integrity": "sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "aria-query": "~5.1.3",
+        "aria-query": "^5.3.2",
         "array-includes": "^3.1.8",
         "array.prototype.flatmap": "^1.3.2",
         "ast-types-flow": "^0.0.8",
@@ -8196,14 +8097,13 @@
         "axobject-query": "^4.1.0",
         "damerau-levenshtein": "^1.0.8",
         "emoji-regex": "^9.2.2",
-        "es-iterator-helpers": "^1.0.19",
         "hasown": "^2.0.2",
         "jsx-ast-utils": "^3.3.5",
         "language-tags": "^1.0.9",
         "minimatch": "^3.1.2",
         "object.fromentries": "^2.0.8",
         "safe-regex-test": "^1.0.3",
-        "string.prototype.includes": "^2.0.0"
+        "string.prototype.includes": "^2.0.1"
       },
       "engines": {
         "node": ">=4.0"
@@ -8212,16 +8112,6 @@
         "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9"
       }
     },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/aria-query": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
-      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "deep-equal": "^2.0.5"
-      }
-    },
     "node_modules/eslint-plugin-jsx-a11y/node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -8307,10 +8197,23 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/eslint-plugin-playwright/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/eslint-plugin-react": {
-      "version": "7.36.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.36.1.tgz",
-      "integrity": "sha512-/qwbqNXZoq+VP30s1d4Nc1C5GTxjJQjk4Jzs4Wq2qzxFM7dSmuG2UkIjg2USMLh3A/aVcUNrK7v0J5U1XEGGwA==",
+      "version": "7.37.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.2.tgz",
+      "integrity": "sha512-EsTAnj9fLVr/GZleBLFbj/sSuXeWmp1eXIN60ceYnZveqEaUCyW4X+Vh4WTdUhCkW4xutXYqTXCUSyqD4rB75w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8319,7 +8222,7 @@
         "array.prototype.flatmap": "^1.3.2",
         "array.prototype.tosorted": "^1.1.4",
         "doctrine": "^2.1.0",
-        "es-iterator-helpers": "^1.0.19",
+        "es-iterator-helpers": "^1.1.0",
         "estraverse": "^5.3.0",
         "hasown": "^2.0.2",
         "jsx-ast-utils": "^2.4.1 || ^3.0.0",
@@ -8496,6 +8399,116 @@
         }
       }
     },
+    "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": {
+      "version": "7.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.16.1.tgz",
+      "integrity": "sha512-rbu/H2MWXN4SkjIIyWcmYBjlp55VT+1G3duFOIukTNFxr9PI35pLc2ydwAfejCEitCv4uztA07q0QWanOHC7dA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "7.16.1",
+        "@typescript-eslint/utils": "7.16.1",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
+      "version": "7.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.16.1.tgz",
+      "integrity": "sha512-AQn9XqCzUXd4bAVEsAXM/Izk11Wx2u4H3BAfQVhSfzfDOm/wAON9nP7J5rpkCxts7E5TELmN845xTUCQrD1xIQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "7.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.16.1.tgz",
+      "integrity": "sha512-0vFPk8tMjj6apaAZ1HlwM8w7jbghC8jc1aRNJG5vN8Ym5miyhTQGMqU++kuBFDNKe9NcPeZ6x0zfSzV8xC1UlQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@typescript-eslint/types": "7.16.1",
+        "@typescript-eslint/visitor-keys": "7.16.1",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
+      "version": "7.16.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.16.1.tgz",
+      "integrity": "sha512-WrFM8nzCowV0he0RlkotGDujx78xudsxnGMBHI88l5J8wEhED6yBwaSLP99ygfrzAjsQvcYQ94quDwI0d7E1fA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "7.16.1",
+        "@typescript-eslint/types": "7.16.1",
+        "@typescript-eslint/typescript-estree": "7.16.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      }
+    },
+    "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/eslint-plugin/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/parser": {
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz",
@@ -8596,100 +8609,12 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/type-utils": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.16.1.tgz",
-      "integrity": "sha512-rbu/H2MWXN4SkjIIyWcmYBjlp55VT+1G3duFOIukTNFxr9PI35pLc2ydwAfejCEitCv4uztA07q0QWanOHC7dA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.16.1",
-        "@typescript-eslint/utils": "7.16.1",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.16.1.tgz",
-      "integrity": "sha512-AQn9XqCzUXd4bAVEsAXM/Izk11Wx2u4H3BAfQVhSfzfDOm/wAON9nP7J5rpkCxts7E5TELmN845xTUCQrD1xIQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.16.1.tgz",
-      "integrity": "sha512-0vFPk8tMjj6apaAZ1HlwM8w7jbghC8jc1aRNJG5vN8Ym5miyhTQGMqU++kuBFDNKe9NcPeZ6x0zfSzV8xC1UlQ==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "@typescript-eslint/types": "7.16.1",
-        "@typescript-eslint/visitor-keys": "7.16.1",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/type-utils/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/types": {
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
       "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
       },
@@ -8704,7 +8629,6 @@
       "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
       "dev": true,
       "license": "BSD-2-Clause",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/types": "7.18.0",
         "@typescript-eslint/visitor-keys": "7.18.0",
@@ -8734,7 +8658,6 @@
       "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/types": "7.18.0",
         "eslint-visitor-keys": "^3.4.3"
@@ -8753,7 +8676,6 @@
       "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -8765,16 +8687,16 @@
       }
     },
     "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/utils": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.16.1.tgz",
-      "integrity": "sha512-WrFM8nzCowV0he0RlkotGDujx78xudsxnGMBHI88l5J8wEhED6yBwaSLP99ygfrzAjsQvcYQ94quDwI0d7E1fA==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
+      "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.16.1",
-        "@typescript-eslint/types": "7.16.1",
-        "@typescript-eslint/typescript-estree": "7.16.1"
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/typescript-estree": "7.18.0"
       },
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -8787,12 +8709,16 @@
         "eslint": "^8.56.0"
       }
     },
-    "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.16.1.tgz",
-      "integrity": "sha512-AQn9XqCzUXd4bAVEsAXM/Izk11Wx2u4H3BAfQVhSfzfDOm/wAON9nP7J5rpkCxts7E5TELmN845xTUCQrD1xIQ==",
+    "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
+      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0"
+      },
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
       },
@@ -8801,21 +8727,15 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.16.1.tgz",
-      "integrity": "sha512-0vFPk8tMjj6apaAZ1HlwM8w7jbghC8jc1aRNJG5vN8Ym5miyhTQGMqU++kuBFDNKe9NcPeZ6x0zfSzV8xC1UlQ==",
+    "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
+      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.16.1",
-        "@typescript-eslint/visitor-keys": "7.16.1",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
+        "@typescript-eslint/types": "7.18.0",
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -8823,27 +8743,6 @@
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/utils/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/eslint-plugin-sonarjs/node_modules/@typescript-eslint/visitor-keys": {
@@ -9028,6 +8927,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/eslint-plugin-vue/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/eslint-plugin-wc": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-wc/-/eslint-plugin-wc-2.2.0.tgz",
@@ -9043,9 +8955,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.1.0.tgz",
+      "integrity": "sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -9053,7 +8965,7 @@
         "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -9107,23 +9019,6 @@
         "concat-map": "0.0.1"
       }
     },
-    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.1.0.tgz",
-      "integrity": "sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
     "node_modules/eslint/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -10192,23 +10087,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/is-arguments": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/is-array-buffer": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
@@ -12101,23 +11979,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object-is": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz",
-      "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -13342,16 +13203,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/read-pkg-up/node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/read-pkg/node_modules/hosted-git-info": {
       "version": "2.8.9",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
@@ -13549,9 +13400,9 @@
       }
     },
     "node_modules/regexpu-core/node_modules/regjsparser": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.1.tgz",
-      "integrity": "sha512-1DHODs4B8p/mQHU9kr+jv8+wIC9mtG4eBHxWxIq5mhjE3D5oORhCc6deRKzTjs9DcfRFmj9BHSDguZklqCGFWQ==",
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.2.tgz",
+      "integrity": "sha512-3OGZZ4HoLJkkAZx/48mTXJNlmqTGOzc0o9OWQPuWpkOlXXPbyN6OafCcoXUnBqE2D3f/T5L+pWc1kdEmnfnRsA==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -14096,9 +13947,9 @@
       }
     },
     "node_modules/solid-js": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.9.2.tgz",
-      "integrity": "sha512-fe/K03nV+kMFJYhAOE8AIQHcGxB4rMIEoEyrulbtmf217NffbbwBqJnJI4ovt16e+kaIt0czE2WA7mP/pYN9yg==",
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.9.3.tgz",
+      "integrity": "sha512-5ba3taPoZGt9GY3YlsCB24kCg0Lv/rie/HTD4kG6h4daZZz7+yK02xn8Vx8dLYBc9i6Ps5JwAbEiqjmKaLB3Ag==",
       "license": "MIT",
       "dependencies": {
         "csstype": "^3.1.0",
@@ -14265,19 +14116,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/stop-iteration-iterator": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
-      "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "internal-slot": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -15236,15 +15074,6 @@
         "@popperjs/core": "^2.9.0"
       }
     },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -15360,16 +15189,13 @@
       }
     },
     "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
       "dev": true,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     },
     "node_modules/typed-array-buffer": {
@@ -15667,9 +15493,9 @@
       "license": "MIT"
     },
     "node_modules/vite": {
-      "version": "5.4.9",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.9.tgz",
-      "integrity": "sha512-20OVpJHh0PAM0oSOELa5GaZNWeDjcAvQjGXy2Uyr+Tp+/D2/Hdz6NLgpJLsarPTA2QJ6v8mX2P1ZfbsSKvdMkg==",
+      "version": "5.4.10",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.10.tgz",
+      "integrity": "sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15778,9 +15604,9 @@
       }
     },
     "node_modules/vite/node_modules/rollup": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.0.tgz",
-      "integrity": "sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.2.tgz",
+      "integrity": "sha512-do/DFGq5g6rdDhdpPq5qb2ecoczeK6y+2UAjdJ5trjQJj5f1AiVdLRWRc9A9/fFukfvJRgM0UXzxBIYMovm5ww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15794,22 +15620,24 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.24.0",
-        "@rollup/rollup-android-arm64": "4.24.0",
-        "@rollup/rollup-darwin-arm64": "4.24.0",
-        "@rollup/rollup-darwin-x64": "4.24.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.24.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.24.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.24.0",
-        "@rollup/rollup-linux-arm64-musl": "4.24.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.24.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.24.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.24.0",
-        "@rollup/rollup-linux-x64-gnu": "4.24.0",
-        "@rollup/rollup-linux-x64-musl": "4.24.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.24.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.24.0",
-        "@rollup/rollup-win32-x64-msvc": "4.24.0",
+        "@rollup/rollup-android-arm-eabi": "4.24.2",
+        "@rollup/rollup-android-arm64": "4.24.2",
+        "@rollup/rollup-darwin-arm64": "4.24.2",
+        "@rollup/rollup-darwin-x64": "4.24.2",
+        "@rollup/rollup-freebsd-arm64": "4.24.2",
+        "@rollup/rollup-freebsd-x64": "4.24.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.24.2",
+        "@rollup/rollup-linux-arm-musleabihf": "4.24.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.24.2",
+        "@rollup/rollup-linux-arm64-musl": "4.24.2",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.24.2",
+        "@rollup/rollup-linux-riscv64-gnu": "4.24.2",
+        "@rollup/rollup-linux-s390x-gnu": "4.24.2",
+        "@rollup/rollup-linux-x64-gnu": "4.24.2",
+        "@rollup/rollup-linux-x64-musl": "4.24.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.24.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.24.2",
+        "@rollup/rollup-win32-x64-msvc": "4.24.2",
         "fsevents": "~2.3.2"
       }
     },
@@ -15969,9 +15797,9 @@
       }
     },
     "node_modules/vue-component-type-helpers": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.1.6.tgz",
-      "integrity": "sha512-ng11B8B/ZADUMMOsRbqv0arc442q7lifSubD0v8oDXIFoMg/mXwAPUunrroIDkY+mcD0dHKccdaznSVp8EoX3w==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.1.8.tgz",
+      "integrity": "sha512-ii36gDzrYAfOQIkOlo44yceDdT5269gKmNGxf07Qx6seH2U50+tQ2ol02XLhYPmxrh6YabAsOdte8WDrpaO6Tw==",
       "dev": true,
       "license": "MIT"
     },
@@ -16000,6 +15828,23 @@
         "eslint": ">=6.0.0"
       }
     },
+    "node_modules/vue-eslint-parser/node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/vue-eslint-parser/node_modules/eslint-visitor-keys": {
       "version": "3.4.3",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
diff --git a/web_src/fomantic/package-lock.json b/web_src/fomantic/package-lock.json
index 43eec8123b..3cefb665cc 100644
--- a/web_src/fomantic/package-lock.json
+++ b/web_src/fomantic/package-lock.json
@@ -492,12 +492,12 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.7.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.7.tgz",
-      "integrity": "sha512-SRxCrrg9CL/y54aiMCG3edPKdprgMVGDXjA3gB8UmmBW5TcXzRUYAh8EWzTnSJFAd1rgImPELza+A3bJ+qxz8Q==",
+      "version": "22.8.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.1.tgz",
+      "integrity": "sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg==",
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~6.19.2"
+        "undici-types": "~6.19.8"
       }
     },
     "node_modules/@types/vinyl": {
@@ -1115,9 +1115,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
-      "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
+      "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
       "funding": [
         {
           "type": "opencollective",
@@ -1134,10 +1134,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001663",
-        "electron-to-chromium": "^1.5.28",
+        "caniuse-lite": "^1.0.30001669",
+        "electron-to-chromium": "^1.5.41",
         "node-releases": "^2.0.18",
-        "update-browserslist-db": "^1.1.0"
+        "update-browserslist-db": "^1.1.1"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -1219,9 +1219,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001669",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz",
-      "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==",
+      "version": "1.0.30001673",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001673.tgz",
+      "integrity": "sha512-WTrjUCSMp3LYX0nE12ECkV0a+e6LC85E0Auz75555/qr78Oc8YWhEPNfDd6SHdtlCMSzqtuXY0uyEMNRcsKpKw==",
       "funding": [
         {
           "type": "opencollective",
@@ -1961,9 +1961,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.41",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.41.tgz",
-      "integrity": "sha512-dfdv/2xNjX0P8Vzme4cfzHqnPm5xsZXwsolTYr0eyW18IUmNyG08vL+fttvinTfhKfIKdRoqkDIC9e9iWQCNYQ==",
+      "version": "1.5.47",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.47.tgz",
+      "integrity": "sha512-zS5Yer0MOYw4rtK2iq43cJagHZ8sXN0jDHDKzB+86gSBSAI4v07S97mcq+Gs2vclAxSh1j7vOAHxSVgduiiuVQ==",
       "license": "ISC"
     },
     "node_modules/emoji-regex": {

From 266e0b2ce91ebd18858071d7702589971384402c Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Wed, 23 Oct 2024 00:48:46 +0200
Subject: [PATCH 236/443] security: add permission check to 'delete branch
 after merge'

- Add a permission check that the doer has write permissions to the head
repository if the the 'delete branch after merge' is enabled when
merging a pull request.
- Unify the checks in the web and API router to `DeleteBranchAfterMerge`.
- Added integration tests.
---
 options/locale/locale_en-US.ini      |  4 +++
 release-notes/5718.md                |  1 +
 routers/api/v1/repo/pull.go          | 33 ++++++-----------------
 routers/web/repo/pull.go             | 29 ++++++++++++---------
 services/repository/branch.go        | 39 ++++++++++++++++++++++++++++
 tests/integration/api_pull_test.go   | 38 +++++++++++++++++++++++++++
 tests/integration/pull_merge_test.go | 32 +++++++++++++++++++++++
 7 files changed, 139 insertions(+), 37 deletions(-)
 create mode 100644 release-notes/5718.md

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 113c94d71f..013a684a7c 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1979,6 +1979,10 @@ pulls.auto_merge_canceled_schedule = The auto merge was canceled for this pull r
 pulls.auto_merge_newly_scheduled_comment = `scheduled this pull request to auto merge when all checks succeed %[1]s`
 pulls.auto_merge_canceled_schedule_comment = `canceled auto merging this pull request when all checks succeed %[1]s`
 
+pulls.delete_after_merge.head_branch.is_default = The head branch you want to delete is the default branch and cannot be deleted.
+pulls.delete_after_merge.head_branch.is_protected = The head branch you want to delete is a protected branch and cannot be deleted.
+pulls.delete_after_merge.head_branch.insufficient_branch = You don't have permission to delete the head branch.
+
 pulls.delete.title = Delete this pull request?
 pulls.delete.text = Do you really want to delete this pull request? (This will permanently remove all content. Consider closing it instead, if you intend to keep it archived)
 
diff --git a/release-notes/5718.md b/release-notes/5718.md
new file mode 100644
index 0000000000..f44178d1fe
--- /dev/null
+++ b/release-notes/5718.md
@@ -0,0 +1 @@
+Because of a missing permission check, the branch used to propose a pull request to a repository can always be deleted by the user performing the merge. It was fixed so that such a deletion is only allowed if the user performing the merge has write permission to the repository from which the pull request was made.
diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go
index 748ef18802..ace107b289 100644
--- a/routers/api/v1/repo/pull.go
+++ b/routers/api/v1/repo/pull.go
@@ -28,6 +28,7 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/timeutil"
+	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/modules/web"
 	"code.gitea.io/gitea/routers/api/v1/utils"
 	asymkey_service "code.gitea.io/gitea/services/asymkey"
@@ -1034,17 +1035,6 @@ func MergePullRequest(ctx *context.APIContext) {
 	log.Trace("Pull request merged: %d", pr.ID)
 
 	if form.DeleteBranchAfterMerge {
-		// Don't cleanup when there are other PR's that use this branch as head branch.
-		exist, err := issues_model.HasUnmergedPullRequestsByHeadInfo(ctx, pr.HeadRepoID, pr.HeadBranch)
-		if err != nil {
-			ctx.ServerError("HasUnmergedPullRequestsByHeadInfo", err)
-			return
-		}
-		if exist {
-			ctx.Status(http.StatusOK)
-			return
-		}
-
 		var headRepo *git.Repository
 		if ctx.Repo != nil && ctx.Repo.Repository != nil && ctx.Repo.Repository.ID == pr.HeadRepoID && ctx.Repo.GitRepo != nil {
 			headRepo = ctx.Repo.GitRepo
@@ -1056,27 +1046,20 @@ func MergePullRequest(ctx *context.APIContext) {
 			}
 			defer headRepo.Close()
 		}
-		if err := pull_service.RetargetChildrenOnMerge(ctx, ctx.Doer, pr); err != nil {
-			ctx.Error(http.StatusInternalServerError, "RetargetChildrenOnMerge", err)
-			return
-		}
-		if err := repo_service.DeleteBranch(ctx, ctx.Doer, pr.HeadRepo, headRepo, pr.HeadBranch); err != nil {
+
+		if err := repo_service.DeleteBranchAfterMerge(ctx, ctx.Doer, pr, headRepo); err != nil {
 			switch {
-			case git.IsErrBranchNotExist(err):
-				ctx.NotFound(err)
 			case errors.Is(err, repo_service.ErrBranchIsDefault):
-				ctx.Error(http.StatusForbidden, "DefaultBranch", fmt.Errorf("can not delete default branch"))
+				ctx.Error(http.StatusForbidden, "DefaultBranch", fmt.Errorf("the head branch is the default branch"))
 			case errors.Is(err, git_model.ErrBranchIsProtected):
-				ctx.Error(http.StatusForbidden, "IsProtectedBranch", fmt.Errorf("branch protected"))
+				ctx.Error(http.StatusForbidden, "IsProtectedBranch", fmt.Errorf("the head branch is protected"))
+			case errors.Is(err, util.ErrPermissionDenied):
+				ctx.Error(http.StatusForbidden, "HeadBranch", fmt.Errorf("insufficient permission to delete head branch"))
 			default:
-				ctx.Error(http.StatusInternalServerError, "DeleteBranch", err)
+				ctx.Error(http.StatusInternalServerError, "DeleteBranchAfterMerge", err)
 			}
 			return
 		}
-		if err := issues_model.AddDeletePRBranchComment(ctx, ctx.Doer, pr.BaseRepo, pr.Issue.ID, pr.HeadBranch); err != nil {
-			// Do not fail here as branch has already been deleted
-			log.Error("DeleteBranch: %v", err)
-		}
 	}
 
 	ctx.Status(http.StatusOK)
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index bc85012700..14b03b9fa4 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -1389,21 +1389,11 @@ func MergePullRequest(ctx *context.Context) {
 	log.Trace("Pull request merged: %d", pr.ID)
 
 	if form.DeleteBranchAfterMerge {
-		// Don't cleanup when other pr use this branch as head branch
-		exist, err := issues_model.HasUnmergedPullRequestsByHeadInfo(ctx, pr.HeadRepoID, pr.HeadBranch)
-		if err != nil {
-			ctx.ServerError("HasUnmergedPullRequestsByHeadInfo", err)
-			return
-		}
-		if exist {
-			ctx.JSONRedirect(issue.Link())
-			return
-		}
-
 		var headRepo *git.Repository
 		if ctx.Repo != nil && ctx.Repo.Repository != nil && pr.HeadRepoID == ctx.Repo.Repository.ID && ctx.Repo.GitRepo != nil {
 			headRepo = ctx.Repo.GitRepo
 		} else {
+			var err error
 			headRepo, err = gitrepo.OpenRepository(ctx, pr.HeadRepo)
 			if err != nil {
 				ctx.ServerError(fmt.Sprintf("OpenRepository[%s]", pr.HeadRepo.FullName()), err)
@@ -1411,7 +1401,22 @@ func MergePullRequest(ctx *context.Context) {
 			}
 			defer headRepo.Close()
 		}
-		deleteBranch(ctx, pr, headRepo)
+
+		if err := repo_service.DeleteBranchAfterMerge(ctx, ctx.Doer, pr, headRepo); err != nil {
+			switch {
+			case errors.Is(err, repo_service.ErrBranchIsDefault):
+				ctx.Flash.Error(ctx.Tr("repo.pulls.delete_after_merge.head_branch.is_default"))
+			case errors.Is(err, git_model.ErrBranchIsProtected):
+				ctx.Flash.Error(ctx.Tr("repo.pulls.delete_after_merge.head_branch.is_protected"))
+			case errors.Is(err, util.ErrPermissionDenied):
+				ctx.Flash.Error(ctx.Tr("repo.pulls.delete_after_merge.head_branch.insufficient_branch"))
+			default:
+				ctx.ServerError("DeleteBranchAfterMerge", err)
+			}
+
+			ctx.JSONRedirect(issue.Link())
+			return
+		}
 	}
 
 	ctx.JSONRedirect(issue.Link())
diff --git a/services/repository/branch.go b/services/repository/branch.go
index f0e7120926..7d92053178 100644
--- a/services/repository/branch.go
+++ b/services/repository/branch.go
@@ -14,7 +14,9 @@ import (
 	"code.gitea.io/gitea/models/db"
 	git_model "code.gitea.io/gitea/models/git"
 	issues_model "code.gitea.io/gitea/models/issues"
+	"code.gitea.io/gitea/models/perm/access"
 	repo_model "code.gitea.io/gitea/models/repo"
+	"code.gitea.io/gitea/models/unit"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/gitrepo"
@@ -24,8 +26,10 @@ import (
 	"code.gitea.io/gitea/modules/queue"
 	repo_module "code.gitea.io/gitea/modules/repository"
 	"code.gitea.io/gitea/modules/timeutil"
+	"code.gitea.io/gitea/modules/util"
 	webhook_module "code.gitea.io/gitea/modules/webhook"
 	notify_service "code.gitea.io/gitea/services/notify"
+	pull_service "code.gitea.io/gitea/services/pull"
 	files_service "code.gitea.io/gitea/services/repository/files"
 
 	"xorm.io/builder"
@@ -475,6 +479,41 @@ func DeleteBranch(ctx context.Context, doer *user_model.User, repo *repo_model.R
 	return nil
 }
 
+// DeleteBranchAfterMerge deletes the head branch after a PR was merged assiociated with the head branch.
+func DeleteBranchAfterMerge(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest, headRepo *git.Repository) error {
+	// Don't cleanup when there are other PR's that use this branch as head branch.
+	exist, err := issues_model.HasUnmergedPullRequestsByHeadInfo(ctx, pr.HeadRepoID, pr.HeadBranch)
+	if err != nil {
+		return err
+	}
+	if exist {
+		return nil
+	}
+
+	// Ensure the doer has write permissions to the head repository of the branch it wants to delete.
+	perm, err := access.GetUserRepoPermission(ctx, pr.HeadRepo, doer)
+	if err != nil {
+		return err
+	}
+	if !perm.CanWrite(unit.TypeCode) {
+		return util.NewPermissionDeniedErrorf("Must have write permission to the head repository")
+	}
+
+	if err := pull_service.RetargetChildrenOnMerge(ctx, doer, pr); err != nil {
+		return err
+	}
+	if err := DeleteBranch(ctx, doer, pr.HeadRepo, headRepo, pr.HeadBranch); err != nil {
+		return err
+	}
+
+	if err := issues_model.AddDeletePRBranchComment(ctx, doer, pr.BaseRepo, pr.Issue.ID, pr.HeadBranch); err != nil {
+		// Do not fail here as branch has already been deleted
+		log.Error("DeleteBranchAfterMerge: %v", err)
+	}
+
+	return nil
+}
+
 type BranchSyncOptions struct {
 	RepoID int64
 }
diff --git a/tests/integration/api_pull_test.go b/tests/integration/api_pull_test.go
index 51c25fb75f..7b95d441dd 100644
--- a/tests/integration/api_pull_test.go
+++ b/tests/integration/api_pull_test.go
@@ -7,6 +7,8 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"net/url"
+	"strings"
 	"testing"
 
 	auth_model "code.gitea.io/gitea/models/auth"
@@ -17,6 +19,7 @@ import (
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
+	"code.gitea.io/gitea/modules/test"
 	"code.gitea.io/gitea/services/forms"
 	issue_service "code.gitea.io/gitea/services/issue"
 	"code.gitea.io/gitea/tests"
@@ -309,3 +312,38 @@ func doAPIGetPullFiles(ctx APITestContext, pr *api.PullRequest, callback func(*t
 		}
 	}
 }
+
+func TestAPIPullDeleteBranchPerms(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
+		user2Session := loginUser(t, "user2")
+		user4Session := loginUser(t, "user4")
+		testRepoFork(t, user4Session, "user2", "repo1", "user4", "repo1")
+		testEditFileToNewBranch(t, user2Session, "user2", "repo1", "master", "base-pr", "README.md", "Hello, World\n(Edited - base PR)\n")
+
+		req := NewRequestWithValues(t, "POST", "/user4/repo1/compare/master...user2/repo1:base-pr", map[string]string{
+			"_csrf": GetCSRF(t, user4Session, "/user4/repo1/compare/master...user2/repo1:base-pr"),
+			"title": "Testing PR",
+		})
+		resp := user4Session.MakeRequest(t, req, http.StatusOK)
+		elem := strings.Split(test.RedirectURL(resp), "/")
+
+		token := getTokenForLoggedInUser(t, user4Session, auth_model.AccessTokenScopeWriteRepository)
+		req = NewRequestWithValues(t, "POST", "/api/v1/repos/user4/repo1/pulls/"+elem[4]+"/merge", map[string]string{
+			"do":                        "merge",
+			"delete_branch_after_merge": "on",
+		}).AddTokenAuth(token)
+		resp = user4Session.MakeRequest(t, req, http.StatusForbidden)
+
+		type userResponse struct {
+			Message string `json:"message"`
+		}
+		var bodyResp userResponse
+		DecodeJSON(t, resp, &bodyResp)
+
+		assert.EqualValues(t, "insufficient permission to delete head branch", bodyResp.Message)
+
+		// Check that the branch still exist.
+		req = NewRequest(t, "GET", "/api/v1/repos/user2/repo1/branches/base-pr").AddTokenAuth(token)
+		user4Session.MakeRequest(t, req, http.StatusOK)
+	})
+}
diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go
index 0f25bdebac..caf100144d 100644
--- a/tests/integration/pull_merge_test.go
+++ b/tests/integration/pull_merge_test.go
@@ -37,6 +37,7 @@ import (
 	"code.gitea.io/gitea/modules/test"
 	"code.gitea.io/gitea/modules/translation"
 	"code.gitea.io/gitea/services/automerge"
+	forgejo_context "code.gitea.io/gitea/services/context"
 	"code.gitea.io/gitea/services/forms"
 	"code.gitea.io/gitea/services/pull"
 	commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus"
@@ -1150,3 +1151,34 @@ func TestPullAutoMergeAfterCommitStatusSucceedAndApprovalForAgitFlow(t *testing.
 		unittest.AssertNotExistsBean(t, &pull_model.AutoMerge{PullID: pr.ID})
 	})
 }
+
+func TestPullDeleteBranchPerms(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
+		user2Session := loginUser(t, "user2")
+		user4Session := loginUser(t, "user4")
+		testRepoFork(t, user4Session, "user2", "repo1", "user4", "repo1")
+		testEditFileToNewBranch(t, user2Session, "user2", "repo1", "master", "base-pr", "README.md", "Hello, World\n(Edited - base PR)\n")
+
+		req := NewRequestWithValues(t, "POST", "/user4/repo1/compare/master...user2/repo1:base-pr", map[string]string{
+			"_csrf": GetCSRF(t, user4Session, "/user4/repo1/compare/master...user2/repo1:base-pr"),
+			"title": "Testing PR",
+		})
+		resp := user4Session.MakeRequest(t, req, http.StatusOK)
+		elem := strings.Split(test.RedirectURL(resp), "/")
+
+		req = NewRequestWithValues(t, "POST", "/user4/repo1/pulls/"+elem[4]+"/merge", map[string]string{
+			"_csrf":                     GetCSRF(t, user4Session, "/user4/repo1/pulls/"+elem[4]),
+			"do":                        "merge",
+			"delete_branch_after_merge": "on",
+		})
+		user4Session.MakeRequest(t, req, http.StatusOK)
+
+		flashCookie := user4Session.GetCookie(forgejo_context.CookieNameFlash)
+		assert.NotNil(t, flashCookie)
+		assert.EqualValues(t, "error%3DYou%2Bdon%2527t%2Bhave%2Bpermission%2Bto%2Bdelete%2Bthe%2Bhead%2Bbranch.", flashCookie.Value)
+
+		// Check that the branch still exist.
+		req = NewRequest(t, "GET", "/user2/repo1/src/branch/base-pr")
+		user4Session.MakeRequest(t, req, http.StatusOK)
+	})
+}

From 53231bad611285b2c52c489a308cbdc8f6dce222 Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Fri, 25 Oct 2024 08:18:26 +0200
Subject: [PATCH 237/443] fix(sec): use constant time check for internal token

---
 release-notes/5719.md       | 1 +
 routers/private/internal.go | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 release-notes/5719.md

diff --git a/release-notes/5719.md b/release-notes/5719.md
new file mode 100644
index 0000000000..19a74825e4
--- /dev/null
+++ b/release-notes/5719.md
@@ -0,0 +1 @@
+Forgejo generates a token which is used to authenticate web endpoints that are only meant to be used internally, for instance when the SSH daemon is used to push a commit with Git. The verification of this token was not done in constant time and was susceptible to [timing attacks](https://en.wikipedia.org/wiki/Timing_attack). A pre-condition for such an attack is the precise measurements of the time for each operation. Since it requires observing the timing of network operations, the issue is mitigated when a Forgejo instance is accessed over the internet because the ISP introduce unpredictable random delays.
diff --git a/routers/private/internal.go b/routers/private/internal.go
index ede310113c..311f59b60e 100644
--- a/routers/private/internal.go
+++ b/routers/private/internal.go
@@ -5,6 +5,7 @@
 package private
 
 import (
+	"crypto/subtle"
 	"net/http"
 	"strings"
 
@@ -28,7 +29,7 @@ func CheckInternalToken(next http.Handler) http.Handler {
 			http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
 			return
 		}
-		if len(fields) != 2 || fields[0] != "Bearer" || fields[1] != setting.InternalToken {
+		if len(fields) != 2 || fields[0] != "Bearer" || subtle.ConstantTimeCompare([]byte(fields[1]), []byte(setting.InternalToken)) == 0 {
 			log.Debug("Forbidden attempt to access internal url: Authorization header: %s", tokens)
 			http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
 		} else {

From f9a16f8be01457a6c6f1125df3e27cd9f6217245 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Mon, 28 Oct 2024 06:26:24 +0000
Subject: [PATCH 238/443] Update renovate to v38.133.0

---
 .forgejo/workflows/renovate.yml | 2 +-
 Makefile                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml
index 9cea4aea31..c399731430 100644
--- a/.forgejo/workflows/renovate.yml
+++ b/.forgejo/workflows/renovate.yml
@@ -23,7 +23,7 @@ jobs:
 
     runs-on: docker
     container:
-      image: code.forgejo.org/forgejo-contrib/renovate:38.128.6
+      image: code.forgejo.org/forgejo-contrib/renovate:38.133.0
 
     steps:
       - name: Load renovate repo cache
diff --git a/Makefile b/Makefile
index 1c47424d45..62cf4e536d 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1 # renovate: datasour
 DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.26.0 # renovate: datasource=go
 GOMOCK_PACKAGE ?= go.uber.org/mock/mockgen@v0.4.0 # renovate: datasource=go
 GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.16.2 # renovate: datasource=go
-RENOVATE_NPM_PACKAGE ?= renovate@38.128.6 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate
+RENOVATE_NPM_PACKAGE ?= renovate@38.133.0 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate
 
 ifeq ($(HAS_GO), yes)
 	CGO_EXTRA_CFLAGS := -DSQLITE_MAX_VARIABLE_NUMBER=32766

From e8e0fe1feaa1b0f570daf8848bcb1ee79b424cf8 Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Mon, 28 Oct 2024 09:08:48 +0100
Subject: [PATCH 239/443] docs: add links to the v7.0.10 & v9.0.1 release notes

---
 RELEASE-NOTES.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index e05288335f..65209ee54a 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -6,6 +6,10 @@ A [patch or minor release](https://semver.org/spec/v2.0.0.html) (e.g. upgrading
 
 The release notes of each release [are available in the corresponding milestone](https://codeberg.org/forgejo/forgejo/milestones), starting with [Forgejo 7.0.7](https://codeberg.org/forgejo/forgejo/milestone/7683) and [Forgejo 8.0.1](https://codeberg.org/forgejo/forgejo/milestone/7682).
 
+## 9.0.1
+
+The Forgejo v9.0.1 release notes are [available in the v9.0.1 milestone](https://codeberg.org/forgejo/forgejo/milestone/8544).
+
 ## 9.0.0
 
 The Forgejo v9.0.0 release notes are [available in the v9.0.0 milestone](https://codeberg.org/forgejo/forgejo/milestone/7235).
@@ -159,6 +163,10 @@ A [companion blog post](https://forgejo.org/2024-07-release-v8-0/) provides addi
   - [PR](https://codeberg.org/forgejo/forgejo/pulls/2937): 31 March updates
 
 
+## 7.0.10
+
+The Forgejo v7.0.10 release notes are [available in the v7.0.10 milestone](https://codeberg.org/forgejo/forgejo/milestone/8286).
+
 ## 7.0.9
 
 The Forgejo v7.0.9 release notes are [available in the v7.0.9 milestone](https://codeberg.org/forgejo/forgejo/milestone/8232).

From 75ce0bf06bef4b15372213cb0e77cfedb62d6a84 Mon Sep 17 00:00:00 2001
From: JakobDev 
Date: Mon, 28 Oct 2024 17:37:24 +0100
Subject: [PATCH 240/443] Fix test

---
 tests/integration/milestone_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/milestone_test.go b/tests/integration/milestone_test.go
index 2a01786dc0..0a475e0967 100644
--- a/tests/integration/milestone_test.go
+++ b/tests/integration/milestone_test.go
@@ -38,5 +38,5 @@ func TestMilestonesCount(t *testing.T) {
 	closedCount := htmlDoc.doc.Find("a[data-test-name='closed-issue-count']").Text()
 	assert.Contains(t, closedCount, "1\u00a0Closed")
 
-	assert.Empty(t, htmlDoc.doc.Find("a[data-test-name='allissue-count']").Nodes)
+	assert.Empty(t, htmlDoc.doc.Find("a[data-test-name='all-issue-count']").Nodes)
 }

From 9d687f1069dfa6014947af85a80dbb5f8f22b20d Mon Sep 17 00:00:00 2001
From: 0ko <0ko@noreply.codeberg.org>
Date: Tue, 29 Oct 2024 05:31:49 +0000
Subject: [PATCH 241/443] feat(ui): link back to one-time code page from
 scratch code page (#5712)

Preview:
https://codeberg.org/attachments/b60c5d7c-103b-4227-9b0d-3d765dba2431

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5712
Reviewed-by: Gusted 
---
 options/locale/locale_en-US.ini        | 1 +
 templates/user/auth/twofa_scratch.tmpl | 1 +
 2 files changed, 2 insertions(+)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 013a684a7c..289b8aa17f 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -442,6 +442,7 @@ verify = Verify
 unauthorized_credentials = Credentials are incorrect or have expired. Retry your command or see %s for more information
 scratch_code = Scratch code
 use_scratch_code = Use a scratch code
+use_onetime_code = Use a one-time code
 twofa_scratch_used = You have used your scratch code. You have been redirected to the two-factor settings page so you may remove your device enrollment or generate a new scratch code.
 twofa_passcode_incorrect = Your passcode is incorrect. If you misplaced your device, use your scratch code to sign in.
 twofa_scratch_token_incorrect = Your scratch code is incorrect.
diff --git a/templates/user/auth/twofa_scratch.tmpl b/templates/user/auth/twofa_scratch.tmpl
index 23ad77f2a9..7d7e3c1b54 100644
--- a/templates/user/auth/twofa_scratch.tmpl
+++ b/templates/user/auth/twofa_scratch.tmpl
@@ -16,6 +16,7 @@
 
 					

 						
+						{{ctx.Locale.Tr "auth.use_onetime_code"}}
 					

 				

 			

From 76ed17453e0e1a3ae2d9307b0df182be9f82c310 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Tue, 29 Oct 2024 10:03:46 +0000
Subject: [PATCH 242/443] Update vitest monorepo to v2.1.4

---
 package-lock.json | 142 +++++++++++++++++++++++++---------------------
 package.json      |   4 +-
 2 files changed, 78 insertions(+), 68 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2841e704f6..d08c9b7c7c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -67,7 +67,7 @@
         "@stylistic/eslint-plugin-js": "2.9.0",
         "@stylistic/stylelint-plugin": "3.1.1",
         "@vitejs/plugin-vue": "5.1.4",
-        "@vitest/coverage-v8": "2.1.3",
+        "@vitest/coverage-v8": "2.1.4",
         "@vitest/eslint-plugin": "1.1.7",
         "@vue/test-utils": "2.4.6",
         "eslint": "9.13.0",
@@ -94,7 +94,7 @@
         "stylelint-value-no-unknown-custom-properties": "6.0.1",
         "svgo": "3.2.0",
         "vite-string-plugin": "1.3.4",
-        "vitest": "2.1.3"
+        "vitest": "2.1.4"
       },
       "engines": {
         "node": ">= 18.0.0"
@@ -4697,21 +4697,21 @@
       }
     },
     "node_modules/@vitest/coverage-v8": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-2.1.3.tgz",
-      "integrity": "sha512-2OJ3c7UPoFSmBZwqD2VEkUw6A/tzPF0LmW0ZZhhB8PFxuc+9IBG/FaSM+RLEenc7ljzFvGN+G0nGQoZnh7sy2A==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-2.1.4.tgz",
+      "integrity": "sha512-FPKQuJfR6VTfcNMcGpqInmtJuVXFSCd9HQltYncfR01AzXhLucMEtQ5SinPdZxsT5x/5BK7I5qFJ5/ApGCmyTQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.3.0",
         "@bcoe/v8-coverage": "^0.2.3",
-        "debug": "^4.3.6",
+        "debug": "^4.3.7",
         "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-report": "^3.0.1",
         "istanbul-lib-source-maps": "^5.0.6",
         "istanbul-reports": "^3.1.7",
-        "magic-string": "^0.30.11",
-        "magicast": "^0.3.4",
+        "magic-string": "^0.30.12",
+        "magicast": "^0.3.5",
         "std-env": "^3.7.0",
         "test-exclude": "^7.0.1",
         "tinyrainbow": "^1.2.0"
@@ -4720,8 +4720,8 @@
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "@vitest/browser": "2.1.3",
-        "vitest": "2.1.3"
+        "@vitest/browser": "2.1.4",
+        "vitest": "2.1.4"
       },
       "peerDependenciesMeta": {
         "@vitest/browser": {
@@ -4761,15 +4761,15 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.3.tgz",
-      "integrity": "sha512-SNBoPubeCJhZ48agjXruCI57DvxcsivVDdWz+SSsmjTT4QN/DfHk3zB/xKsJqMs26bLZ/pNRLnCf0j679i0uWQ==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.4.tgz",
+      "integrity": "sha512-DOETT0Oh1avie/D/o2sgMHGrzYUFFo3zqESB2Hn70z6QB1HrS2IQ9z5DfyTqU8sg4Bpu13zZe9V4+UTNQlUeQA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "2.1.3",
-        "@vitest/utils": "2.1.3",
-        "chai": "^5.1.1",
+        "@vitest/spy": "2.1.4",
+        "@vitest/utils": "2.1.4",
+        "chai": "^5.1.2",
         "tinyrainbow": "^1.2.0"
       },
       "funding": {
@@ -4777,22 +4777,21 @@
       }
     },
     "node_modules/@vitest/mocker": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.3.tgz",
-      "integrity": "sha512-eSpdY/eJDuOvuTA3ASzCjdithHa+GIF1L4PqtEELl6Qa3XafdMLBpBlZCIUCX2J+Q6sNmjmxtosAG62fK4BlqQ==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.4.tgz",
+      "integrity": "sha512-Ky/O1Lc0QBbutJdW0rqLeFNbuLEyS+mIPiNdlVlp2/yhJ0SbyYqObS5IHdhferJud8MbbwMnexg4jordE5cCoQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "2.1.3",
+        "@vitest/spy": "2.1.4",
         "estree-walker": "^3.0.3",
-        "magic-string": "^0.30.11"
+        "magic-string": "^0.30.12"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "@vitest/spy": "2.1.3",
-        "msw": "^2.3.5",
+        "msw": "^2.4.9",
         "vite": "^5.0.0"
       },
       "peerDependenciesMeta": {
@@ -4832,9 +4831,9 @@
       }
     },
     "node_modules/@vitest/pretty-format": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.3.tgz",
-      "integrity": "sha512-XH1XdtoLZCpqV59KRbPrIhFCOO0hErxrQCMcvnQete3Vibb9UeIOX02uFPfVn3Z9ZXsq78etlfyhnkmIZSzIwQ==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.4.tgz",
+      "integrity": "sha512-L95zIAkEuTDbUX1IsjRl+vyBSLh3PwLLgKpghl37aCK9Jvw0iP+wKwIFhfjdUtA2myLgjrG6VU6JCFLv8q/3Ww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4845,13 +4844,13 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.3.tgz",
-      "integrity": "sha512-JGzpWqmFJ4fq5ZKHtVO3Xuy1iF2rHGV4d/pdzgkYHm1+gOzNZtqjvyiaDGJytRyMU54qkxpNzCx+PErzJ1/JqQ==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.4.tgz",
+      "integrity": "sha512-sKRautINI9XICAMl2bjxQM8VfCMTB0EbsBc/EDFA57V6UQevEKY/TOPOF5nzcvCALltiLfXWbq4MaAwWx/YxIA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "2.1.3",
+        "@vitest/utils": "2.1.4",
         "pathe": "^1.1.2"
       },
       "funding": {
@@ -4859,14 +4858,14 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.3.tgz",
-      "integrity": "sha512-qWC2mWc7VAXmjAkEKxrScWHWFyCQx/cmiZtuGqMi+WwqQJ2iURsVY4ZfAK6dVo6K2smKRU6l3BPwqEBvhnpQGg==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.4.tgz",
+      "integrity": "sha512-3Kab14fn/5QZRog5BPj6Rs8dc4B+mim27XaKWFWHWA87R56AKjHTGcBFKpvZKDzC4u5Wd0w/qKsUIio3KzWW4Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "2.1.3",
-        "magic-string": "^0.30.11",
+        "@vitest/pretty-format": "2.1.4",
+        "magic-string": "^0.30.12",
         "pathe": "^1.1.2"
       },
       "funding": {
@@ -4884,27 +4883,27 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.3.tgz",
-      "integrity": "sha512-Nb2UzbcUswzeSP7JksMDaqsI43Sj5+Kry6ry6jQJT4b5gAK+NS9NED6mDb8FlMRCX8m5guaHCDZmqYMMWRy5nQ==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.4.tgz",
+      "integrity": "sha512-4JOxa+UAizJgpZfaCPKK2smq9d8mmjZVPMt2kOsg/R8QkoRzydHH1qHxIYNvr1zlEaFj4SXiaaJWxq/LPLKaLg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tinyspy": "^3.0.0"
+        "tinyspy": "^3.0.2"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.3.tgz",
-      "integrity": "sha512-xpiVfDSg1RrYT0tX6czgerkpcKFmFOF/gCr30+Mve5V2kewCy4Prn1/NDMSRwaSmT7PRaOF83wu+bEtsY1wrvA==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.4.tgz",
+      "integrity": "sha512-MXDnZn0Awl2S86PSNIim5PWXgIAx8CIkzu35mBdSApUip6RFOGXBCf3YFyeEu8n1IHk4bWD46DeYFu9mQlFIRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "2.1.3",
-        "loupe": "^3.1.1",
+        "@vitest/pretty-format": "2.1.4",
+        "loupe": "^3.1.2",
         "tinyrainbow": "^1.2.0"
       },
       "funding": {
@@ -9126,6 +9125,16 @@
         "node": ">=0.8.x"
       }
     },
+    "node_modules/expect-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.1.0.tgz",
+      "integrity": "sha512-bFi65yM+xZgk+u/KRIpekdSYkTB5W1pEf0Lt8Q8Msh7b+eQ7LXVtIB1Bkm4fvclDEL1b2CZkMhv2mOeF8tMdkA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -15553,14 +15562,14 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.3.tgz",
-      "integrity": "sha512-I1JadzO+xYX887S39Do+paRePCKoiDrWRRjp9kkG5he0t7RXNvPAJPCQSJqbGN4uCrFFeS3Kj3sLqY8NMYBEdA==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.4.tgz",
+      "integrity": "sha512-kqa9v+oi4HwkG6g8ufRnb5AeplcRw8jUF6/7/Qz1qRQOXHImG8YnLbB+LLszENwFnoBl9xIf9nVdCFzNd7GQEg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "cac": "^6.7.14",
-        "debug": "^4.3.6",
+        "debug": "^4.3.7",
         "pathe": "^1.1.2",
         "vite": "^5.0.0"
       },
@@ -15642,30 +15651,31 @@
       }
     },
     "node_modules/vitest": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.3.tgz",
-      "integrity": "sha512-Zrxbg/WiIvUP2uEzelDNTXmEMJXuzJ1kCpbDvaKByFA9MNeO95V+7r/3ti0qzJzrxdyuUw5VduN7k+D3VmVOSA==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.4.tgz",
+      "integrity": "sha512-eDjxbVAJw1UJJCHr5xr/xM86Zx+YxIEXGAR+bmnEID7z9qWfoxpHw0zdobz+TQAFOLT+nEXz3+gx6nUJ7RgmlQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/expect": "2.1.3",
-        "@vitest/mocker": "2.1.3",
-        "@vitest/pretty-format": "^2.1.3",
-        "@vitest/runner": "2.1.3",
-        "@vitest/snapshot": "2.1.3",
-        "@vitest/spy": "2.1.3",
-        "@vitest/utils": "2.1.3",
-        "chai": "^5.1.1",
-        "debug": "^4.3.6",
-        "magic-string": "^0.30.11",
+        "@vitest/expect": "2.1.4",
+        "@vitest/mocker": "2.1.4",
+        "@vitest/pretty-format": "^2.1.4",
+        "@vitest/runner": "2.1.4",
+        "@vitest/snapshot": "2.1.4",
+        "@vitest/spy": "2.1.4",
+        "@vitest/utils": "2.1.4",
+        "chai": "^5.1.2",
+        "debug": "^4.3.7",
+        "expect-type": "^1.1.0",
+        "magic-string": "^0.30.12",
         "pathe": "^1.1.2",
         "std-env": "^3.7.0",
         "tinybench": "^2.9.0",
-        "tinyexec": "^0.3.0",
-        "tinypool": "^1.0.0",
+        "tinyexec": "^0.3.1",
+        "tinypool": "^1.0.1",
         "tinyrainbow": "^1.2.0",
         "vite": "^5.0.0",
-        "vite-node": "2.1.3",
+        "vite-node": "2.1.4",
         "why-is-node-running": "^2.3.0"
       },
       "bin": {
@@ -15680,8 +15690,8 @@
       "peerDependencies": {
         "@edge-runtime/vm": "*",
         "@types/node": "^18.0.0 || >=20.0.0",
-        "@vitest/browser": "2.1.3",
-        "@vitest/ui": "2.1.3",
+        "@vitest/browser": "2.1.4",
+        "@vitest/ui": "2.1.4",
         "happy-dom": "*",
         "jsdom": "*"
       },
diff --git a/package.json b/package.json
index 66d0c428e5..c420353260 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "@stylistic/eslint-plugin-js": "2.9.0",
     "@stylistic/stylelint-plugin": "3.1.1",
     "@vitejs/plugin-vue": "5.1.4",
-    "@vitest/coverage-v8": "2.1.3",
+    "@vitest/coverage-v8": "2.1.4",
     "@vitest/eslint-plugin": "1.1.7",
     "@vue/test-utils": "2.4.6",
     "eslint": "9.13.0",
@@ -93,7 +93,7 @@
     "stylelint-value-no-unknown-custom-properties": "6.0.1",
     "svgo": "3.2.0",
     "vite-string-plugin": "1.3.4",
-    "vitest": "2.1.3"
+    "vitest": "2.1.4"
   },
   "browserslist": ["defaults"]
 }

From 8dc72589cafd0881e234af489c4b3d643422f7e9 Mon Sep 17 00:00:00 2001
From: Anbraten 
Date: Tue, 29 Oct 2024 11:47:39 +0100
Subject: [PATCH 243/443] Add typescript

---
 Makefile                                     |    7 +-
 eslint.config.mjs                            | 2260 +++++++++---------
 package-lock.json                            |  777 ++----
 package.json                                 |    8 +-
 playwright.config.js => playwright.config.ts |    1 -
 tsconfig.json                                |   30 +
 vitest.config.js => vitest.config.ts         |    0
 web_src/js/features/repo-legacy.js           |    7 +-
 web_src/js/webcomponents/overflow-menu.js    |    2 +-
 webpack.config.js                            |    4 +-
 10 files changed, 1354 insertions(+), 1742 deletions(-)
 rename playwright.config.js => playwright.config.ts (99%)
 create mode 100644 tsconfig.json
 rename vitest.config.js => vitest.config.ts (100%)

diff --git a/Makefile b/Makefile
index 62cf4e536d..309efe3875 100644
--- a/Makefile
+++ b/Makefile
@@ -164,9 +164,8 @@ TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(FOMAN
 GO_DIRS := build cmd models modules routers services tests
 WEB_DIRS := web_src/js web_src/css
 
-ESLINT_FILES := web_src/js tools *.js *.mjs tests/e2e/*.js tests/e2e/shared/*.js
 STYLELINT_FILES := web_src/css web_src/js/components/*.vue
-SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) docs/content templates options/locale/locale_en-US.ini .github $(wildcard *.go *.js *.md *.yml *.yaml *.toml)
+SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) docs/content templates options/locale/locale_en-US.ini .github $(wildcard *.go *.js *.ts *.vue *.md *.yml *.yaml *.toml)
 
 GO_SOURCES := $(wildcard *.go)
 GO_SOURCES += $(shell find $(GO_DIRS) -type f -name "*.go" ! -path modules/options/bindata.go ! -path modules/public/bindata.go ! -path modules/templates/bindata.go)
@@ -437,11 +436,11 @@ lint-codespell-fix-i:
 
 .PHONY: lint-js
 lint-js: node_modules
-	npx eslint --color --max-warnings=0 $(ESLINT_FILES)
+	npx eslint --color --max-warnings=0
 
 .PHONY: lint-js-fix
 lint-js-fix: node_modules
-	npx eslint --color --max-warnings=0 $(ESLINT_FILES) --fix
+	npx eslint --color --max-warnings=0 --fix
 
 .PHONY: lint-css
 lint-css: node_modules
diff --git a/eslint.config.mjs b/eslint.config.mjs
index ee2aa5da27..da1b2b5d49 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -14,1148 +14,1156 @@ import wc from 'eslint-plugin-wc';
 import globals from 'globals';
 import vue from 'eslint-plugin-vue';
 import vueScopedCss from 'eslint-plugin-vue-scoped-css';
+import tseslint from 'typescript-eslint';
 
-export default [{
-  ignores: ['web_src/js/vendor', 'web_src/fomantic', 'public/assets/js'],
-}, {
-  plugins: {
-    '@eslint-community/eslint-comments': eslintCommunityEslintPluginEslintComments,
-    '@stylistic/js': stylisticEslintPluginJs,
-    '@vitest': vitest,
-    'array-func': arrayFunc,
-    'import-x': eslintPluginImportX,
-    'no-jquery': noJquery,
-    'no-use-extend-native': noUseExtendNative,
-    regexp,
-    sonarjs,
-    unicorn,
-    playwright,
-    'vitest-globals': vitestGlobals,
-    vue,
-    'vue-scoped-css': vueScopedCss,
-    wc,
+export default tseslint.config(
+  ...tseslint.configs.recommended,
+  eslintPluginImportX.flatConfigs.typescript,
+  {
+    ignores: ['web_src/js/vendor', 'web_src/fomantic', 'public/assets/js'],
   },
-
-  linterOptions: {
-    reportUnusedDisableDirectives: true,
-  },
-
-  languageOptions: {
-    globals: {
-      ...globals.node,
+  {
+    plugins: {
+      '@eslint-community/eslint-comments': eslintCommunityEslintPluginEslintComments,
+      '@stylistic/js': stylisticEslintPluginJs,
+      '@vitest': vitest,
+      'array-func': arrayFunc,
+      'import-x': eslintPluginImportX,
+      'no-jquery': noJquery,
+      'no-use-extend-native': noUseExtendNative,
+      regexp,
+      sonarjs,
+      unicorn,
+      playwright,
+      'vitest-globals': vitestGlobals,
+      vue,
+      'vue-scoped-css': vueScopedCss,
+      wc,
     },
-    parserOptions: {
+
+    linterOptions: {
+      reportUnusedDisableDirectives: true,
+    },
+
+    languageOptions: {
+      globals: {
+        ...globals.node,
+      },
+      parserOptions: {
+        ecmaVersion: 'latest',
+      },
+
+      ecmaVersion: 'latest',
+      sourceType: 'module',
+    },
+    rules: {
+      '@typescript-eslint/no-unused-vars': 'off', // TODO: enable this rule again
+
+      '@eslint-community/eslint-comments/disable-enable-pair': [2],
+      '@eslint-community/eslint-comments/no-aggregating-enable': [2],
+      '@eslint-community/eslint-comments/no-duplicate-disable': [2],
+      '@eslint-community/eslint-comments/no-restricted-disable': [0],
+      '@eslint-community/eslint-comments/no-unlimited-disable': [2],
+      '@eslint-community/eslint-comments/no-unused-disable': [2],
+      '@eslint-community/eslint-comments/no-unused-enable': [2],
+      '@eslint-community/eslint-comments/no-use': [0],
+      '@eslint-community/eslint-comments/require-description': [0],
+      '@stylistic/js/array-bracket-newline': [0],
+      '@stylistic/js/array-bracket-spacing': [2, 'never'],
+      '@stylistic/js/array-element-newline': [0],
+      '@stylistic/js/arrow-parens': [2, 'always'],
+
+      '@stylistic/js/arrow-spacing': [2, {
+        before: true,
+        after: true,
+      }],
+
+      '@stylistic/js/block-spacing': [0],
+
+      '@stylistic/js/brace-style': [2, '1tbs', {
+        allowSingleLine: true,
+      }],
+
+      '@stylistic/js/comma-dangle': [2, 'always-multiline'],
+
+      '@stylistic/js/comma-spacing': [2, {
+        before: false,
+        after: true,
+      }],
+
+      '@stylistic/js/comma-style': [2, 'last'],
+      '@stylistic/js/computed-property-spacing': [2, 'never'],
+      '@stylistic/js/dot-location': [2, 'property'],
+      '@stylistic/js/eol-last': [2],
+      '@stylistic/js/function-call-spacing': [2, 'never'],
+      '@stylistic/js/function-call-argument-newline': [0],
+      '@stylistic/js/function-paren-newline': [0],
+      '@stylistic/js/generator-star-spacing': [0],
+      '@stylistic/js/implicit-arrow-linebreak': [0],
+
+      '@stylistic/js/indent': [2, 2, {
+        ignoreComments: true,
+        SwitchCase: 1,
+      }],
+
+      '@stylistic/js/key-spacing': [2],
+      '@stylistic/js/keyword-spacing': [2],
+      '@stylistic/js/linebreak-style': [2, 'unix'],
+      '@stylistic/js/lines-around-comment': [0],
+      '@stylistic/js/lines-between-class-members': [0],
+      '@stylistic/js/max-len': [0],
+      '@stylistic/js/max-statements-per-line': [0],
+      '@stylistic/js/multiline-ternary': [0],
+      '@stylistic/js/new-parens': [2],
+      '@stylistic/js/newline-per-chained-call': [0],
+      '@stylistic/js/no-confusing-arrow': [0],
+      '@stylistic/js/no-extra-parens': [0],
+      '@stylistic/js/no-extra-semi': [2],
+      '@stylistic/js/no-floating-decimal': [0],
+      '@stylistic/js/no-mixed-operators': [0],
+      '@stylistic/js/no-mixed-spaces-and-tabs': [2],
+
+      '@stylistic/js/no-multi-spaces': [2, {
+        ignoreEOLComments: true,
+
+        exceptions: {
+          Property: true,
+        },
+      }],
+
+      '@stylistic/js/no-multiple-empty-lines': [2, {
+        max: 1,
+        maxEOF: 0,
+        maxBOF: 0,
+      }],
+
+      '@stylistic/js/no-tabs': [2],
+      '@stylistic/js/no-trailing-spaces': [2],
+      '@stylistic/js/no-whitespace-before-property': [2],
+      '@stylistic/js/nonblock-statement-body-position': [2],
+      '@stylistic/js/object-curly-newline': [0],
+      '@stylistic/js/object-curly-spacing': [2, 'never'],
+      '@stylistic/js/object-property-newline': [0],
+      '@stylistic/js/one-var-declaration-per-line': [0],
+      '@stylistic/js/operator-linebreak': [2, 'after'],
+      '@stylistic/js/padded-blocks': [2, 'never'],
+      '@stylistic/js/padding-line-between-statements': [0],
+      '@stylistic/js/quote-props': [0],
+
+      '@stylistic/js/quotes': [2, 'single', {
+        avoidEscape: true,
+        allowTemplateLiterals: true,
+      }],
+
+      '@stylistic/js/rest-spread-spacing': [2, 'never'],
+
+      '@stylistic/js/semi': [2, 'always', {
+        omitLastInOneLineBlock: true,
+      }],
+
+      '@stylistic/js/semi-spacing': [2, {
+        before: false,
+        after: true,
+      }],
+
+      '@stylistic/js/semi-style': [2, 'last'],
+      '@stylistic/js/space-before-blocks': [2, 'always'],
+
+      '@stylistic/js/space-before-function-paren': [2, {
+        anonymous: 'ignore',
+        named: 'never',
+        asyncArrow: 'always',
+      }],
+
+      '@stylistic/js/space-in-parens': [2, 'never'],
+      '@stylistic/js/space-infix-ops': [2],
+      '@stylistic/js/space-unary-ops': [2],
+      '@stylistic/js/spaced-comment': [2, 'always'],
+      '@stylistic/js/switch-colon-spacing': [2],
+      '@stylistic/js/template-curly-spacing': [2, 'never'],
+      '@stylistic/js/template-tag-spacing': [2, 'never'],
+      '@stylistic/js/wrap-iife': [2, 'inside'],
+      '@stylistic/js/wrap-regex': [0],
+      '@stylistic/js/yield-star-spacing': [2, 'after'],
+      'accessor-pairs': [2],
+
+      'array-callback-return': [2, {
+        checkForEach: true,
+      }],
+
+      'array-func/avoid-reverse': [2],
+      'array-func/from-map': [2],
+      'array-func/no-unnecessary-this-arg': [2],
+      'array-func/prefer-array-from': [2],
+      'array-func/prefer-flat-map': [0],
+      'array-func/prefer-flat': [0],
+      'arrow-body-style': [0],
+      'block-scoped-var': [2],
+      camelcase: [0],
+      'capitalized-comments': [0],
+      'class-methods-use-this': [0],
+      complexity: [0],
+      'consistent-return': [0],
+      'consistent-this': [0],
+      'constructor-super': [2],
+      curly: [0],
+      'default-case-last': [2],
+      'default-case': [0],
+      'default-param-last': [0],
+      'dot-notation': [0],
+      eqeqeq: [2],
+      'for-direction': [2],
+      'func-name-matching': [2],
+      'func-names': [0],
+      'func-style': [0],
+      'getter-return': [2],
+      'grouped-accessor-pairs': [2],
+      'guard-for-in': [0],
+      'id-blacklist': [0],
+      'id-length': [0],
+      'id-match': [0],
+      'init-declarations': [0],
+      'line-comment-position': [0],
+      'logical-assignment-operators': [0],
+      'max-classes-per-file': [0],
+      'max-depth': [0],
+      'max-lines-per-function': [0],
+      'max-lines': [0],
+      'max-nested-callbacks': [0],
+      'max-params': [0],
+      'max-statements': [0],
+      'multiline-comment-style': [2, 'separate-lines'],
+      'new-cap': [0],
+      'no-alert': [0],
+      'no-array-constructor': [2],
+      'no-async-promise-executor': [0],
+      'no-await-in-loop': [0],
+      'no-bitwise': [0],
+      'no-buffer-constructor': [0],
+      'no-caller': [2],
+      'no-case-declarations': [2],
+      'no-class-assign': [2],
+      'no-compare-neg-zero': [2],
+      'no-cond-assign': [2, 'except-parens'],
+
+      'no-console': [1, {
+        allow: ['debug', 'info', 'warn', 'error'],
+      }],
+
+      'no-const-assign': [2],
+      'no-constant-binary-expression': [2],
+      'no-constant-condition': [0],
+      'no-constructor-return': [2],
+      'no-continue': [0],
+      'no-control-regex': [0],
+      'no-debugger': [1],
+      'no-delete-var': [2],
+      'no-div-regex': [0],
+      'no-dupe-args': [2],
+      'no-dupe-class-members': [2],
+      'no-dupe-else-if': [2],
+      'no-dupe-keys': [2],
+      'no-duplicate-case': [2],
+      'no-duplicate-imports': [2],
+      'no-else-return': [2],
+      'no-empty-character-class': [2],
+      'no-empty-function': [0],
+      'no-empty-pattern': [2],
+      'no-empty-static-block': [2],
+
+      'no-empty': [2, {
+        allowEmptyCatch: true,
+      }],
+
+      'no-eq-null': [2],
+      'no-eval': [2],
+      'no-ex-assign': [2],
+      'no-extend-native': [2],
+      'no-extra-bind': [2],
+      'no-extra-boolean-cast': [2],
+      'no-extra-label': [0],
+      'no-fallthrough': [2],
+      'no-func-assign': [2],
+      'no-global-assign': [2],
+      'no-implicit-coercion': [2],
+      'no-implicit-globals': [0],
+      'no-implied-eval': [2],
+      'no-import-assign': [2],
+      'no-inline-comments': [0],
+      'no-inner-declarations': [2],
+      'no-invalid-regexp': [2],
+      'no-invalid-this': [0],
+      'no-irregular-whitespace': [2],
+      'no-iterator': [2],
+      'no-jquery/no-ajax-events': [2],
+      'no-jquery/no-ajax': [2],
+      'no-jquery/no-and-self': [2],
+      'no-jquery/no-animate-toggle': [2],
+      'no-jquery/no-animate': [2],
+      'no-jquery/no-append-html': [2],
+      'no-jquery/no-attr': [2],
+      'no-jquery/no-bind': [2],
+      'no-jquery/no-box-model': [2],
+      'no-jquery/no-browser': [2],
+      'no-jquery/no-camel-case': [2],
+      'no-jquery/no-class-state': [2],
+      'no-jquery/no-class': [0],
+      'no-jquery/no-clone': [2],
+      'no-jquery/no-closest': [0],
+      'no-jquery/no-constructor-attributes': [2],
+      'no-jquery/no-contains': [2],
+      'no-jquery/no-context-prop': [2],
+      'no-jquery/no-css': [2],
+      'no-jquery/no-data': [0],
+      'no-jquery/no-deferred': [2],
+      'no-jquery/no-delegate': [2],
+      'no-jquery/no-each-collection': [0],
+      'no-jquery/no-each-util': [0],
+      'no-jquery/no-each': [0],
+      'no-jquery/no-error-shorthand': [2],
+      'no-jquery/no-error': [2],
+      'no-jquery/no-escape-selector': [2],
+      'no-jquery/no-event-shorthand': [2],
+      'no-jquery/no-extend': [2],
+      'no-jquery/no-fade': [2],
+      'no-jquery/no-filter': [0],
+      'no-jquery/no-find-collection': [0],
+      'no-jquery/no-find-util': [2],
+      'no-jquery/no-find': [0],
+      'no-jquery/no-fx-interval': [2],
+      'no-jquery/no-global-eval': [2],
+      'no-jquery/no-global-selector': [0],
+      'no-jquery/no-grep': [2],
+      'no-jquery/no-has': [2],
+      'no-jquery/no-hold-ready': [2],
+      'no-jquery/no-html': [0],
+      'no-jquery/no-in-array': [2],
+      'no-jquery/no-is-array': [2],
+      'no-jquery/no-is-empty-object': [2],
+      'no-jquery/no-is-function': [2],
+      'no-jquery/no-is-numeric': [2],
+      'no-jquery/no-is-plain-object': [2],
+      'no-jquery/no-is-window': [2],
+      'no-jquery/no-is': [2],
+      'no-jquery/no-jquery-constructor': [0],
+      'no-jquery/no-live': [2],
+      'no-jquery/no-load-shorthand': [2],
+      'no-jquery/no-load': [2],
+      'no-jquery/no-map-collection': [0],
+      'no-jquery/no-map-util': [2],
+      'no-jquery/no-map': [2],
+      'no-jquery/no-merge': [2],
+      'no-jquery/no-node-name': [2],
+      'no-jquery/no-noop': [2],
+      'no-jquery/no-now': [2],
+      'no-jquery/no-on-ready': [2],
+      'no-jquery/no-other-methods': [0],
+      'no-jquery/no-other-utils': [2],
+      'no-jquery/no-param': [2],
+      'no-jquery/no-parent': [0],
+      'no-jquery/no-parents': [2],
+      'no-jquery/no-parse-html-literal': [2],
+      'no-jquery/no-parse-html': [2],
+      'no-jquery/no-parse-json': [2],
+      'no-jquery/no-parse-xml': [2],
+      'no-jquery/no-prop': [2],
+      'no-jquery/no-proxy': [2],
+      'no-jquery/no-ready-shorthand': [2],
+      'no-jquery/no-ready': [2],
+      'no-jquery/no-selector-prop': [2],
+      'no-jquery/no-serialize': [2],
+      'no-jquery/no-size': [2],
+      'no-jquery/no-sizzle': [0],
+      'no-jquery/no-slide': [2],
+      'no-jquery/no-sub': [2],
+      'no-jquery/no-support': [2],
+      'no-jquery/no-text': [0],
+      'no-jquery/no-trigger': [0],
+      'no-jquery/no-trim': [2],
+      'no-jquery/no-type': [2],
+      'no-jquery/no-unique': [2],
+      'no-jquery/no-unload-shorthand': [2],
+      'no-jquery/no-val': [0],
+      'no-jquery/no-visibility': [2],
+      'no-jquery/no-when': [2],
+      'no-jquery/no-wrap': [2],
+      'no-jquery/variable-pattern': [2],
+      'no-label-var': [2],
+      'no-labels': [0],
+      'no-lone-blocks': [2],
+      'no-lonely-if': [0],
+      'no-loop-func': [0],
+      'no-loss-of-precision': [2],
+      'no-magic-numbers': [0],
+      'no-misleading-character-class': [2],
+      'no-multi-assign': [0],
+      'no-multi-str': [2],
+      'no-negated-condition': [0],
+      'no-nested-ternary': [0],
+      'no-new-func': [2],
+      'no-new-native-nonconstructor': [2],
+      'no-new-object': [2],
+      'no-new-symbol': [2],
+      'no-new-wrappers': [2],
+      'no-new': [0],
+      'no-nonoctal-decimal-escape': [2],
+      'no-obj-calls': [2],
+      'no-octal-escape': [2],
+      'no-octal': [2],
+      'no-param-reassign': [0],
+      'no-plusplus': [0],
+      'no-promise-executor-return': [0],
+      'no-proto': [2],
+      'no-prototype-builtins': [2],
+      'no-redeclare': [2],
+      'no-regex-spaces': [2],
+      'no-restricted-exports': [0],
+
+      'no-restricted-globals': [
+        2,
+        'addEventListener',
+        'blur',
+        'close',
+        'closed',
+        'confirm',
+        'defaultStatus',
+        'defaultstatus',
+        'error',
+        'event',
+        'external',
+        'find',
+        'focus',
+        'frameElement',
+        'frames',
+        'history',
+        'innerHeight',
+        'innerWidth',
+        'isFinite',
+        'isNaN',
+        'length',
+        'location',
+        'locationbar',
+        'menubar',
+        'moveBy',
+        'moveTo',
+        'name',
+        'onblur',
+        'onerror',
+        'onfocus',
+        'onload',
+        'onresize',
+        'onunload',
+        'open',
+        'opener',
+        'opera',
+        'outerHeight',
+        'outerWidth',
+        'pageXOffset',
+        'pageYOffset',
+        'parent',
+        'print',
+        'removeEventListener',
+        'resizeBy',
+        'resizeTo',
+        'screen',
+        'screenLeft',
+        'screenTop',
+        'screenX',
+        'screenY',
+        'scroll',
+        'scrollbars',
+        'scrollBy',
+        'scrollTo',
+        'scrollX',
+        'scrollY',
+        'self',
+        'status',
+        'statusbar',
+        'stop',
+        'toolbar',
+        'top',
+        '__dirname',
+        '__filename',
+      ],
+
+      'no-restricted-imports': [0],
+
+      'no-restricted-syntax': [
+        2,
+        'WithStatement',
+        'ForInStatement',
+        'LabeledStatement',
+        'SequenceExpression',
+        {
+          selector: "CallExpression[callee.name='fetch']",
+          message: 'use modules/fetch.js instead',
+        },
+      ],
+
+      'no-return-assign': [0],
+      'no-script-url': [2],
+
+      'no-self-assign': [2, {
+        props: true,
+      }],
+
+      'no-self-compare': [2],
+      'no-sequences': [2],
+      'no-setter-return': [2],
+      'no-shadow-restricted-names': [2],
+      'no-shadow': [0],
+      'no-sparse-arrays': [2],
+      'no-template-curly-in-string': [2],
+      'no-ternary': [0],
+      'no-this-before-super': [2],
+      'no-throw-literal': [2],
+      'no-undef-init': [2],
+
+      'no-undef': [2, {
+        typeof: true,
+      }],
+
+      'no-undefined': [0],
+      'no-underscore-dangle': [0],
+      'no-unexpected-multiline': [2],
+      'no-unmodified-loop-condition': [2],
+      'no-unneeded-ternary': [2],
+      'no-unreachable-loop': [2],
+      'no-unreachable': [2],
+      'no-unsafe-finally': [2],
+      'no-unsafe-negation': [2],
+      'no-unused-expressions': [2],
+      'no-unused-labels': [2],
+      'no-unused-private-class-members': [2],
+
+      'no-unused-vars': [2, {
+        args: 'all',
+        argsIgnorePattern: '^_',
+        varsIgnorePattern: '^_',
+        caughtErrorsIgnorePattern: '^_',
+        destructuredArrayIgnorePattern: '^_',
+        ignoreRestSiblings: false,
+      }],
+
+      'no-use-before-define': [2, {
+        functions: false,
+        classes: true,
+        variables: true,
+        allowNamedExports: true,
+      }],
+
+      'no-use-extend-native/no-use-extend-native': [2],
+      'no-useless-backreference': [2],
+      'no-useless-call': [2],
+      'no-useless-catch': [2],
+      'no-useless-computed-key': [2],
+      'no-useless-concat': [2],
+      'no-useless-constructor': [2],
+      'no-useless-escape': [2],
+      'no-useless-rename': [2],
+      'no-useless-return': [2],
+      'no-var': [2],
+      'no-void': [2],
+      'no-warning-comments': [0],
+      'no-with': [0],
+      'object-shorthand': [2, 'always'],
+      'one-var-declaration-per-line': [0],
+      'one-var': [0],
+      'operator-assignment': [2, 'always'],
+      'operator-linebreak': [2, 'after'],
+
+      'prefer-arrow-callback': [2, {
+        allowNamedFunctions: true,
+        allowUnboundThis: true,
+      }],
+
+      'prefer-const': [2, {
+        destructuring: 'all',
+        ignoreReadBeforeAssign: true,
+      }],
+
+      'prefer-destructuring': [0],
+      'prefer-exponentiation-operator': [2],
+      'prefer-named-capture-group': [0],
+      'prefer-numeric-literals': [2],
+      'prefer-object-has-own': [2],
+      'prefer-object-spread': [2],
+
+      'prefer-promise-reject-errors': [2, {
+        allowEmptyReject: false,
+      }],
+
+      'prefer-regex-literals': [2],
+      'prefer-rest-params': [2],
+      'prefer-spread': [2],
+      'prefer-template': [2],
+      radix: [2, 'as-needed'],
+      'regexp/confusing-quantifier': [2],
+      'regexp/control-character-escape': [2],
+      'regexp/hexadecimal-escape': [0],
+      'regexp/letter-case': [0],
+      'regexp/match-any': [2],
+      'regexp/negation': [2],
+      'regexp/no-contradiction-with-assertion': [0],
+      'regexp/no-control-character': [0],
+      'regexp/no-dupe-characters-character-class': [2],
+      'regexp/no-dupe-disjunctions': [2],
+      'regexp/no-empty-alternative': [2],
+      'regexp/no-empty-capturing-group': [2],
+      'regexp/no-empty-character-class': [0],
+      'regexp/no-empty-group': [2],
+      'regexp/no-empty-lookarounds-assertion': [2],
+      'regexp/no-empty-string-literal': [2],
+      'regexp/no-escape-backspace': [2],
+      'regexp/no-extra-lookaround-assertions': [0],
+      'regexp/no-invalid-regexp': [2],
+      'regexp/no-invisible-character': [2],
+      'regexp/no-lazy-ends': [2],
+      'regexp/no-legacy-features': [2],
+      'regexp/no-misleading-capturing-group': [0],
+      'regexp/no-misleading-unicode-character': [0],
+      'regexp/no-missing-g-flag': [2],
+      'regexp/no-non-standard-flag': [2],
+      'regexp/no-obscure-range': [2],
+      'regexp/no-octal': [2],
+      'regexp/no-optional-assertion': [2],
+      'regexp/no-potentially-useless-backreference': [2],
+      'regexp/no-standalone-backslash': [2],
+      'regexp/no-super-linear-backtracking': [0],
+      'regexp/no-super-linear-move': [0],
+      'regexp/no-trivially-nested-assertion': [2],
+      'regexp/no-trivially-nested-quantifier': [2],
+      'regexp/no-unused-capturing-group': [0],
+      'regexp/no-useless-assertions': [2],
+      'regexp/no-useless-backreference': [2],
+      'regexp/no-useless-character-class': [2],
+      'regexp/no-useless-dollar-replacements': [2],
+      'regexp/no-useless-escape': [2],
+      'regexp/no-useless-flag': [2],
+      'regexp/no-useless-lazy': [2],
+      'regexp/no-useless-non-capturing-group': [2],
+      'regexp/no-useless-quantifier': [2],
+      'regexp/no-useless-range': [2],
+      'regexp/no-useless-set-operand': [2],
+      'regexp/no-useless-string-literal': [2],
+      'regexp/no-useless-two-nums-quantifier': [2],
+      'regexp/no-zero-quantifier': [2],
+      'regexp/optimal-lookaround-quantifier': [2],
+      'regexp/optimal-quantifier-concatenation': [0],
+      'regexp/prefer-character-class': [0],
+      'regexp/prefer-d': [0],
+      'regexp/prefer-escape-replacement-dollar-char': [0],
+      'regexp/prefer-lookaround': [0],
+      'regexp/prefer-named-backreference': [0],
+      'regexp/prefer-named-capture-group': [0],
+      'regexp/prefer-named-replacement': [0],
+      'regexp/prefer-plus-quantifier': [2],
+      'regexp/prefer-predefined-assertion': [2],
+      'regexp/prefer-quantifier': [0],
+      'regexp/prefer-question-quantifier': [2],
+      'regexp/prefer-range': [2],
+      'regexp/prefer-regexp-exec': [2],
+      'regexp/prefer-regexp-test': [2],
+      'regexp/prefer-result-array-groups': [0],
+      'regexp/prefer-set-operation': [2],
+      'regexp/prefer-star-quantifier': [2],
+      'regexp/prefer-unicode-codepoint-escapes': [2],
+      'regexp/prefer-w': [0],
+      'regexp/require-unicode-regexp': [0],
+      'regexp/simplify-set-operations': [2],
+      'regexp/sort-alternatives': [0],
+      'regexp/sort-character-class-elements': [0],
+      'regexp/sort-flags': [0],
+      'regexp/strict': [2],
+      'regexp/unicode-escape': [0],
+      'regexp/use-ignore-case': [0],
+      'require-atomic-updates': [0],
+      'require-await': [0],
+      'require-unicode-regexp': [0],
+      'require-yield': [2],
+      'sonarjs/cognitive-complexity': [0],
+      'sonarjs/elseif-without-else': [0],
+      'sonarjs/max-switch-cases': [0],
+      'sonarjs/no-all-duplicated-branches': [2],
+      'sonarjs/no-collapsible-if': [0],
+      'sonarjs/no-collection-size-mischeck': [2],
+      'sonarjs/no-duplicate-string': [0],
+      'sonarjs/no-duplicated-branches': [0],
+      'sonarjs/no-element-overwrite': [2],
+      'sonarjs/no-empty-collection': [2],
+      'sonarjs/no-extra-arguments': [2],
+      'sonarjs/no-gratuitous-expressions': [2],
+      'sonarjs/no-identical-conditions': [2],
+      'sonarjs/no-identical-expressions': [2],
+      'sonarjs/no-identical-functions': [2, 5],
+      'sonarjs/no-ignored-return': [2],
+      'sonarjs/no-inverted-boolean-check': [2],
+      'sonarjs/no-nested-switch': [0],
+      'sonarjs/no-nested-template-literals': [0],
+      'sonarjs/no-one-iteration-loop': [2],
+      'sonarjs/no-redundant-boolean': [2],
+      'sonarjs/no-redundant-jump': [2],
+      'sonarjs/no-same-line-conditional': [2],
+      'sonarjs/no-small-switch': [0],
+      'sonarjs/no-unused-collection': [2],
+      'sonarjs/no-use-of-empty-return-value': [2],
+      'sonarjs/no-useless-catch': [2],
+      'sonarjs/non-existent-operator': [2],
+      'sonarjs/prefer-immediate-return': [0],
+      'sonarjs/prefer-object-literal': [0],
+      'sonarjs/prefer-single-boolean-return': [0],
+      'sonarjs/prefer-while': [2],
+      'sort-imports': [0],
+      'sort-keys': [0],
+      'sort-vars': [0],
+      strict: [0],
+      'symbol-description': [2],
+      'unicode-bom': [2, 'never'],
+      'unicorn/better-regex': [0],
+      'unicorn/catch-error-name': [0],
+      'unicorn/consistent-destructuring': [2],
+      'unicorn/consistent-empty-array-spread': [2],
+      'unicorn/consistent-existence-index-check': [2],
+      'unicorn/consistent-function-scoping': [2],
+      'unicorn/custom-error-definition': [0],
+      'unicorn/empty-brace-spaces': [2],
+      'unicorn/error-message': [0],
+      'unicorn/escape-case': [0],
+      'unicorn/expiring-todo-comments': [0],
+      'unicorn/explicit-length-check': [0],
+      'unicorn/filename-case': [0],
+      'unicorn/import-index': [0],
+      'unicorn/import-style': [0],
+      'unicorn/new-for-builtins': [2],
+      'unicorn/no-abusive-eslint-disable': [0],
+      'unicorn/no-anonymous-default-export': [0],
+      'unicorn/no-array-callback-reference': [0],
+      'unicorn/no-array-for-each': [2],
+      'unicorn/no-array-method-this-argument': [2],
+      'unicorn/no-array-push-push': [2],
+      'unicorn/no-array-reduce': [2],
+      'unicorn/no-await-expression-member': [0],
+      'unicorn/no-await-in-promise-methods': [2],
+      'unicorn/no-console-spaces': [0],
+      'unicorn/no-document-cookie': [2],
+      'unicorn/no-empty-file': [2],
+      'unicorn/no-for-loop': [0],
+      'unicorn/no-hex-escape': [0],
+      'unicorn/no-instanceof-array': [0],
+      'unicorn/no-invalid-fetch-options': [2],
+      'unicorn/no-invalid-remove-event-listener': [2],
+      'unicorn/no-keyword-prefix': [0],
+      'unicorn/no-length-as-slice-end': [2],
+      'unicorn/no-lonely-if': [2],
+      'unicorn/no-magic-array-flat-depth': [0],
+      'unicorn/no-negated-condition': [0],
+      'unicorn/no-negation-in-equality-check': [2],
+      'unicorn/no-nested-ternary': [0],
+      'unicorn/no-new-array': [0],
+      'unicorn/no-new-buffer': [0],
+      'unicorn/no-null': [0],
+      'unicorn/no-object-as-default-parameter': [0],
+      'unicorn/no-process-exit': [0],
+      'unicorn/no-single-promise-in-promise-methods': [2],
+      'unicorn/no-static-only-class': [2],
+      'unicorn/no-thenable': [2],
+      'unicorn/no-this-assignment': [2],
+      'unicorn/no-typeof-undefined': [2],
+      'unicorn/no-unnecessary-await': [2],
+      'unicorn/no-unnecessary-polyfills': [2],
+      'unicorn/no-unreadable-array-destructuring': [0],
+      'unicorn/no-unreadable-iife': [2],
+      'unicorn/no-unused-properties': [2],
+      'unicorn/no-useless-fallback-in-spread': [2],
+      'unicorn/no-useless-length-check': [2],
+      'unicorn/no-useless-promise-resolve-reject': [2],
+      'unicorn/no-useless-spread': [2],
+      'unicorn/no-useless-switch-case': [2],
+      'unicorn/no-useless-undefined': [0],
+      'unicorn/no-zero-fractions': [2],
+      'unicorn/number-literal-case': [0],
+      'unicorn/numeric-separators-style': [0],
+      'unicorn/prefer-add-event-listener': [2],
+      'unicorn/prefer-array-find': [2],
+      'unicorn/prefer-array-flat-map': [2],
+      'unicorn/prefer-array-flat': [2],
+      'unicorn/prefer-array-index-of': [2],
+      'unicorn/prefer-array-some': [2],
+      'unicorn/prefer-at': [0],
+      'unicorn/prefer-blob-reading-methods': [2],
+      'unicorn/prefer-code-point': [0],
+      'unicorn/prefer-date-now': [2],
+      'unicorn/prefer-default-parameters': [0],
+      'unicorn/prefer-dom-node-append': [2],
+      'unicorn/prefer-dom-node-dataset': [0],
+      'unicorn/prefer-dom-node-remove': [2],
+      'unicorn/prefer-dom-node-text-content': [2],
+      'unicorn/prefer-event-target': [2],
+      'unicorn/prefer-export-from': [0],
+      'unicorn/prefer-global-this': [0],
+      'unicorn/prefer-includes': [2],
+      'unicorn/prefer-json-parse-buffer': [0],
+      'unicorn/prefer-keyboard-event-key': [2],
+      'unicorn/prefer-logical-operator-over-ternary': [2],
+      'unicorn/prefer-math-min-max': [2],
+      'unicorn/prefer-math-trunc': [2],
+      'unicorn/prefer-modern-dom-apis': [0],
+      'unicorn/prefer-modern-math-apis': [2],
+      'unicorn/prefer-module': [2],
+      'unicorn/prefer-native-coercion-functions': [2],
+      'unicorn/prefer-negative-index': [2],
+      'unicorn/prefer-node-protocol': [2],
+      'unicorn/prefer-number-properties': [0],
+      'unicorn/prefer-object-from-entries': [2],
+      'unicorn/prefer-object-has-own': [0],
+      'unicorn/prefer-optional-catch-binding': [2],
+      'unicorn/prefer-prototype-methods': [0],
+      'unicorn/prefer-query-selector': [0],
+      'unicorn/prefer-reflect-apply': [0],
+      'unicorn/prefer-regexp-test': [2],
+      'unicorn/prefer-set-has': [0],
+      'unicorn/prefer-set-size': [2],
+      'unicorn/prefer-spread': [0],
+      'unicorn/prefer-string-raw': [0],
+      'unicorn/prefer-string-replace-all': [0],
+      'unicorn/prefer-string-slice': [0],
+      'unicorn/prefer-string-starts-ends-with': [2],
+      'unicorn/prefer-string-trim-start-end': [2],
+      'unicorn/prefer-structured-clone': [2],
+      'unicorn/prefer-switch': [0],
+      'unicorn/prefer-ternary': [0],
+      'unicorn/prefer-text-content': [2],
+      'unicorn/prefer-top-level-await': [0],
+      'unicorn/prefer-type-error': [0],
+      'unicorn/prevent-abbreviations': [0],
+      'unicorn/relative-url-style': [2],
+      'unicorn/require-array-join-separator': [2],
+      'unicorn/require-number-to-fixed-digits-argument': [2],
+      'unicorn/require-post-message-target-origin': [0],
+      'unicorn/string-content': [0],
+      'unicorn/switch-case-braces': [0],
+      'unicorn/template-indent': [2],
+      'unicorn/text-encoding-identifier-case': [0],
+      'unicorn/throw-new-error': [2],
+      'use-isnan': [2],
+
+      'valid-typeof': [2, {
+        requireStringLiterals: true,
+      }],
+
+      'vars-on-top': [0],
+      'wc/attach-shadow-constructor': [2],
+      'wc/define-tag-after-class-definition': [0],
+      'wc/expose-class-on-global': [0],
+      'wc/file-name-matches-element': [2],
+      'wc/guard-define-call': [0],
+      'wc/guard-super-call': [2],
+      'wc/max-elements-per-file': [0],
+      'wc/no-child-traversal-in-attributechangedcallback': [2],
+      'wc/no-child-traversal-in-connectedcallback': [2],
+      'wc/no-closed-shadow-root': [2],
+      'wc/no-constructor-attributes': [2],
+      'wc/no-constructor-params': [2],
+      'wc/no-constructor': [2],
+      'wc/no-customized-built-in-elements': [2],
+      'wc/no-exports-with-element': [0],
+      'wc/no-invalid-element-name': [2],
+      'wc/no-invalid-extends': [2],
+      'wc/no-method-prefixed-with-on': [2],
+      'wc/no-self-class': [2],
+      'wc/no-typos': [2],
+      'wc/require-listener-teardown': [2],
+      'wc/tag-name-matches-class': [2],
+      yoda: [2, 'never'],
+    },
+  },
+  {
+    ignores: ['*.vue', '**/*.vue'],
+    rules: {
+      'import-x/consistent-type-specifier-style': [0],
+      'import-x/default': [0],
+      'import-x/dynamic-import-chunkname': [0],
+      'import-x/export': [2],
+      'import-x/exports-last': [0],
+
+      'import-x/extensions': [2, 'always', {
+        ignorePackages: true,
+      }],
+
+      'import-x/first': [2],
+      'import-x/group-exports': [0],
+      'import-x/max-dependencies': [0],
+      'import-x/named': [2],
+      'import-x/namespace': [0],
+      'import-x/newline-after-import': [0],
+      'import-x/no-absolute-path': [0],
+      'import-x/no-amd': [2],
+      'import-x/no-anonymous-default-export': [0],
+      'import-x/no-commonjs': [2],
+
+      'import-x/no-cycle': [2, {
+        ignoreExternal: true,
+        maxDepth: 1,
+      }],
+
+      'import-x/no-default-export': [0],
+      'import-x/no-deprecated': [0],
+      'import-x/no-dynamic-require': [0],
+      'import-x/no-empty-named-blocks': [2],
+      'import-x/no-extraneous-dependencies': [2],
+      'import-x/no-import-module-exports': [0],
+      'import-x/no-internal-modules': [0],
+      'import-x/no-mutable-exports': [0],
+      'import-x/no-named-as-default-member': [0],
+      'import-x/no-named-as-default': [2],
+      'import-x/no-named-default': [0],
+      'import-x/no-named-export': [0],
+      'import-x/no-namespace': [0],
+      'import-x/no-nodejs-modules': [0],
+      'import-x/no-relative-packages': [0],
+      'import-x/no-relative-parent-imports': [0],
+      'import-x/no-restricted-paths': [0],
+      'import-x/no-self-import': [2],
+      'import-x/no-unassigned-import': [0],
+
+      'import-x/no-unresolved': [2, {
+        commonjs: true,
+        ignore: ['\\?.+$', '^vitest/'],
+      }],
+
+      'import-x/no-useless-path-segments': [2, {
+        commonjs: true,
+      }],
+
+      'import-x/no-webpack-loader-syntax': [2],
+      'import-x/order': [0],
+      'import-x/prefer-default-export': [0],
+      'import-x/unambiguous': [0],
+    },
+  },
+  {
+    files: ['web_src/**/*'],
+    languageOptions: {
+      globals: {
+        __webpack_public_path__: true,
+        process: false,
+      },
+    },
+  }, {
+    files: ['web_src/**/*', 'docs/**/*'],
+
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+      },
+    },
+  }, {
+    files: ['web_src/**/*worker.*'],
+
+    languageOptions: {
+      globals: {
+        ...globals.worker,
+      },
+    },
+
+    rules: {
+      'no-restricted-globals': [
+        2,
+        'addEventListener',
+        'blur',
+        'close',
+        'closed',
+        'confirm',
+        'defaultStatus',
+        'defaultstatus',
+        'error',
+        'event',
+        'external',
+        'find',
+        'focus',
+        'frameElement',
+        'frames',
+        'history',
+        'innerHeight',
+        'innerWidth',
+        'isFinite',
+        'isNaN',
+        'length',
+        'locationbar',
+        'menubar',
+        'moveBy',
+        'moveTo',
+        'name',
+        'onblur',
+        'onerror',
+        'onfocus',
+        'onload',
+        'onresize',
+        'onunload',
+        'open',
+        'opener',
+        'opera',
+        'outerHeight',
+        'outerWidth',
+        'pageXOffset',
+        'pageYOffset',
+        'parent',
+        'print',
+        'removeEventListener',
+        'resizeBy',
+        'resizeTo',
+        'screen',
+        'screenLeft',
+        'screenTop',
+        'screenX',
+        'screenY',
+        'scroll',
+        'scrollbars',
+        'scrollBy',
+        'scrollTo',
+        'scrollX',
+        'scrollY',
+        'status',
+        'statusbar',
+        'stop',
+        'toolbar',
+        'top',
+      ],
+    },
+  }, {
+    files: ['**/*.config.*'],
+    languageOptions: {
       ecmaVersion: 'latest',
     },
-
-    ecmaVersion: 'latest',
-    sourceType: 'module',
-  },
-  rules: {
-    '@eslint-community/eslint-comments/disable-enable-pair': [2],
-    '@eslint-community/eslint-comments/no-aggregating-enable': [2],
-    '@eslint-community/eslint-comments/no-duplicate-disable': [2],
-    '@eslint-community/eslint-comments/no-restricted-disable': [0],
-    '@eslint-community/eslint-comments/no-unlimited-disable': [2],
-    '@eslint-community/eslint-comments/no-unused-disable': [2],
-    '@eslint-community/eslint-comments/no-unused-enable': [2],
-    '@eslint-community/eslint-comments/no-use': [0],
-    '@eslint-community/eslint-comments/require-description': [0],
-    '@stylistic/js/array-bracket-newline': [0],
-    '@stylistic/js/array-bracket-spacing': [2, 'never'],
-    '@stylistic/js/array-element-newline': [0],
-    '@stylistic/js/arrow-parens': [2, 'always'],
-
-    '@stylistic/js/arrow-spacing': [2, {
-      before: true,
-      after: true,
-    }],
-
-    '@stylistic/js/block-spacing': [0],
-
-    '@stylistic/js/brace-style': [2, '1tbs', {
-      allowSingleLine: true,
-    }],
-
-    '@stylistic/js/comma-dangle': [2, 'always-multiline'],
-
-    '@stylistic/js/comma-spacing': [2, {
-      before: false,
-      after: true,
-    }],
-
-    '@stylistic/js/comma-style': [2, 'last'],
-    '@stylistic/js/computed-property-spacing': [2, 'never'],
-    '@stylistic/js/dot-location': [2, 'property'],
-    '@stylistic/js/eol-last': [2],
-    '@stylistic/js/function-call-spacing': [2, 'never'],
-    '@stylistic/js/function-call-argument-newline': [0],
-    '@stylistic/js/function-paren-newline': [0],
-    '@stylistic/js/generator-star-spacing': [0],
-    '@stylistic/js/implicit-arrow-linebreak': [0],
-
-    '@stylistic/js/indent': [2, 2, {
-      ignoreComments: true,
-      SwitchCase: 1,
-    }],
-
-    '@stylistic/js/key-spacing': [2],
-    '@stylistic/js/keyword-spacing': [2],
-    '@stylistic/js/linebreak-style': [2, 'unix'],
-    '@stylistic/js/lines-around-comment': [0],
-    '@stylistic/js/lines-between-class-members': [0],
-    '@stylistic/js/max-len': [0],
-    '@stylistic/js/max-statements-per-line': [0],
-    '@stylistic/js/multiline-ternary': [0],
-    '@stylistic/js/new-parens': [2],
-    '@stylistic/js/newline-per-chained-call': [0],
-    '@stylistic/js/no-confusing-arrow': [0],
-    '@stylistic/js/no-extra-parens': [0],
-    '@stylistic/js/no-extra-semi': [2],
-    '@stylistic/js/no-floating-decimal': [0],
-    '@stylistic/js/no-mixed-operators': [0],
-    '@stylistic/js/no-mixed-spaces-and-tabs': [2],
-
-    '@stylistic/js/no-multi-spaces': [2, {
-      ignoreEOLComments: true,
-
-      exceptions: {
-        Property: true,
+    rules: {
+      'import-x/no-unused-modules': [0],
+      'import-x/no-unresolved': [0],
+      'import-x/no-named-as-default': [0],
+    },
+  }, {
+    files: ['**/*.test.*', 'web_src/js/test/setup.js'],
+    languageOptions: {
+      globals: {
+        ...vitestGlobals.environments.env.globals,
       },
-    }],
+    },
 
-    '@stylistic/js/no-multiple-empty-lines': [2, {
-      max: 1,
-      maxEOF: 0,
-      maxBOF: 0,
-    }],
+    rules: {
+      '@vitest/consistent-test-filename': [0],
+      '@vitest/consistent-test-it': [0],
+      '@vitest/expect-expect': [0],
+      '@vitest/max-expects': [0],
+      '@vitest/max-nested-describe': [0],
+      '@vitest/no-alias-methods': [0],
+      '@vitest/no-commented-out-tests': [0],
+      '@vitest/no-conditional-expect': [0],
+      '@vitest/no-conditional-in-test': [0],
+      '@vitest/no-conditional-tests': [0],
+      '@vitest/no-disabled-tests': [0],
+      '@vitest/no-done-callback': [0],
+      '@vitest/no-duplicate-hooks': [0],
+      '@vitest/no-focused-tests': [0],
+      '@vitest/no-hooks': [0],
+      '@vitest/no-identical-title': [2],
+      '@vitest/no-interpolation-in-snapshots': [0],
+      '@vitest/no-large-snapshots': [0],
+      '@vitest/no-mocks-import': [0],
+      '@vitest/no-restricted-matchers': [0],
+      '@vitest/no-restricted-vi-methods': [0],
+      '@vitest/no-standalone-expect': [0],
+      '@vitest/no-test-prefixes': [0],
+      '@vitest/no-test-return-statement': [0],
+      '@vitest/prefer-called-with': [0],
+      '@vitest/prefer-comparison-matcher': [0],
+      '@vitest/prefer-each': [0],
+      '@vitest/prefer-equality-matcher': [0],
+      '@vitest/prefer-expect-resolves': [0],
+      '@vitest/prefer-hooks-in-order': [0],
+      '@vitest/prefer-hooks-on-top': [2],
+      '@vitest/prefer-lowercase-title': [0],
+      '@vitest/prefer-mock-promise-shorthand': [0],
+      '@vitest/prefer-snapshot-hint': [0],
+      '@vitest/prefer-spy-on': [0],
+      '@vitest/prefer-strict-equal': [0],
+      '@vitest/prefer-to-be': [0],
+      '@vitest/prefer-to-be-falsy': [0],
+      '@vitest/prefer-to-be-object': [0],
+      '@vitest/prefer-to-be-truthy': [0],
+      '@vitest/prefer-to-contain': [0],
+      '@vitest/prefer-to-have-length': [0],
+      '@vitest/prefer-todo': [0],
+      '@vitest/require-hook': [0],
+      '@vitest/require-to-throw-message': [0],
+      '@vitest/require-top-level-describe': [0],
+      '@vitest/valid-describe-callback': [2],
+      '@vitest/valid-expect': [2],
+      '@vitest/valid-title': [2],
+    },
+  }, {
+    files: ['web_src/js/modules/fetch.js', 'web_src/js/standalone/**/*'],
 
-    '@stylistic/js/no-tabs': [2],
-    '@stylistic/js/no-trailing-spaces': [2],
-    '@stylistic/js/no-whitespace-before-property': [2],
-    '@stylistic/js/nonblock-statement-body-position': [2],
-    '@stylistic/js/object-curly-newline': [0],
-    '@stylistic/js/object-curly-spacing': [2, 'never'],
-    '@stylistic/js/object-property-newline': [0],
-    '@stylistic/js/one-var-declaration-per-line': [0],
-    '@stylistic/js/operator-linebreak': [2, 'after'],
-    '@stylistic/js/padded-blocks': [2, 'never'],
-    '@stylistic/js/padding-line-between-statements': [0],
-    '@stylistic/js/quote-props': [0],
-
-    '@stylistic/js/quotes': [2, 'single', {
-      avoidEscape: true,
-      allowTemplateLiterals: true,
-    }],
-
-    '@stylistic/js/rest-spread-spacing': [2, 'never'],
-
-    '@stylistic/js/semi': [2, 'always', {
-      omitLastInOneLineBlock: true,
-    }],
-
-    '@stylistic/js/semi-spacing': [2, {
-      before: false,
-      after: true,
-    }],
-
-    '@stylistic/js/semi-style': [2, 'last'],
-    '@stylistic/js/space-before-blocks': [2, 'always'],
-
-    '@stylistic/js/space-before-function-paren': [2, {
-      anonymous: 'ignore',
-      named: 'never',
-      asyncArrow: 'always',
-    }],
-
-    '@stylistic/js/space-in-parens': [2, 'never'],
-    '@stylistic/js/space-infix-ops': [2],
-    '@stylistic/js/space-unary-ops': [2],
-    '@stylistic/js/spaced-comment': [2, 'always'],
-    '@stylistic/js/switch-colon-spacing': [2],
-    '@stylistic/js/template-curly-spacing': [2, 'never'],
-    '@stylistic/js/template-tag-spacing': [2, 'never'],
-    '@stylistic/js/wrap-iife': [2, 'inside'],
-    '@stylistic/js/wrap-regex': [0],
-    '@stylistic/js/yield-star-spacing': [2, 'after'],
-    'accessor-pairs': [2],
-
-    'array-callback-return': [2, {
-      checkForEach: true,
-    }],
-
-    'array-func/avoid-reverse': [2],
-    'array-func/from-map': [2],
-    'array-func/no-unnecessary-this-arg': [2],
-    'array-func/prefer-array-from': [2],
-    'array-func/prefer-flat-map': [0],
-    'array-func/prefer-flat': [0],
-    'arrow-body-style': [0],
-    'block-scoped-var': [2],
-    camelcase: [0],
-    'capitalized-comments': [0],
-    'class-methods-use-this': [0],
-    complexity: [0],
-    'consistent-return': [0],
-    'consistent-this': [0],
-    'constructor-super': [2],
-    curly: [0],
-    'default-case-last': [2],
-    'default-case': [0],
-    'default-param-last': [0],
-    'dot-notation': [0],
-    eqeqeq: [2],
-    'for-direction': [2],
-    'func-name-matching': [2],
-    'func-names': [0],
-    'func-style': [0],
-    'getter-return': [2],
-    'grouped-accessor-pairs': [2],
-    'guard-for-in': [0],
-    'id-blacklist': [0],
-    'id-length': [0],
-    'id-match': [0],
-    'init-declarations': [0],
-    'line-comment-position': [0],
-    'logical-assignment-operators': [0],
-    'max-classes-per-file': [0],
-    'max-depth': [0],
-    'max-lines-per-function': [0],
-    'max-lines': [0],
-    'max-nested-callbacks': [0],
-    'max-params': [0],
-    'max-statements': [0],
-    'multiline-comment-style': [2, 'separate-lines'],
-    'new-cap': [0],
-    'no-alert': [0],
-    'no-array-constructor': [2],
-    'no-async-promise-executor': [0],
-    'no-await-in-loop': [0],
-    'no-bitwise': [0],
-    'no-buffer-constructor': [0],
-    'no-caller': [2],
-    'no-case-declarations': [2],
-    'no-class-assign': [2],
-    'no-compare-neg-zero': [2],
-    'no-cond-assign': [2, 'except-parens'],
-
-    'no-console': [1, {
-      allow: ['debug', 'info', 'warn', 'error'],
-    }],
-
-    'no-const-assign': [2],
-    'no-constant-binary-expression': [2],
-    'no-constant-condition': [0],
-    'no-constructor-return': [2],
-    'no-continue': [0],
-    'no-control-regex': [0],
-    'no-debugger': [1],
-    'no-delete-var': [2],
-    'no-div-regex': [0],
-    'no-dupe-args': [2],
-    'no-dupe-class-members': [2],
-    'no-dupe-else-if': [2],
-    'no-dupe-keys': [2],
-    'no-duplicate-case': [2],
-    'no-duplicate-imports': [2],
-    'no-else-return': [2],
-    'no-empty-character-class': [2],
-    'no-empty-function': [0],
-    'no-empty-pattern': [2],
-    'no-empty-static-block': [2],
-
-    'no-empty': [2, {
-      allowEmptyCatch: true,
-    }],
-
-    'no-eq-null': [2],
-    'no-eval': [2],
-    'no-ex-assign': [2],
-    'no-extend-native': [2],
-    'no-extra-bind': [2],
-    'no-extra-boolean-cast': [2],
-    'no-extra-label': [0],
-    'no-fallthrough': [2],
-    'no-func-assign': [2],
-    'no-global-assign': [2],
-    'no-implicit-coercion': [2],
-    'no-implicit-globals': [0],
-    'no-implied-eval': [2],
-    'no-import-assign': [2],
-    'no-inline-comments': [0],
-    'no-inner-declarations': [2],
-    'no-invalid-regexp': [2],
-    'no-invalid-this': [0],
-    'no-irregular-whitespace': [2],
-    'no-iterator': [2],
-    'no-jquery/no-ajax-events': [2],
-    'no-jquery/no-ajax': [2],
-    'no-jquery/no-and-self': [2],
-    'no-jquery/no-animate-toggle': [2],
-    'no-jquery/no-animate': [2],
-    'no-jquery/no-append-html': [2],
-    'no-jquery/no-attr': [2],
-    'no-jquery/no-bind': [2],
-    'no-jquery/no-box-model': [2],
-    'no-jquery/no-browser': [2],
-    'no-jquery/no-camel-case': [2],
-    'no-jquery/no-class-state': [2],
-    'no-jquery/no-class': [0],
-    'no-jquery/no-clone': [2],
-    'no-jquery/no-closest': [0],
-    'no-jquery/no-constructor-attributes': [2],
-    'no-jquery/no-contains': [2],
-    'no-jquery/no-context-prop': [2],
-    'no-jquery/no-css': [2],
-    'no-jquery/no-data': [0],
-    'no-jquery/no-deferred': [2],
-    'no-jquery/no-delegate': [2],
-    'no-jquery/no-each-collection': [0],
-    'no-jquery/no-each-util': [0],
-    'no-jquery/no-each': [0],
-    'no-jquery/no-error-shorthand': [2],
-    'no-jquery/no-error': [2],
-    'no-jquery/no-escape-selector': [2],
-    'no-jquery/no-event-shorthand': [2],
-    'no-jquery/no-extend': [2],
-    'no-jquery/no-fade': [2],
-    'no-jquery/no-filter': [0],
-    'no-jquery/no-find-collection': [0],
-    'no-jquery/no-find-util': [2],
-    'no-jquery/no-find': [0],
-    'no-jquery/no-fx-interval': [2],
-    'no-jquery/no-global-eval': [2],
-    'no-jquery/no-global-selector': [0],
-    'no-jquery/no-grep': [2],
-    'no-jquery/no-has': [2],
-    'no-jquery/no-hold-ready': [2],
-    'no-jquery/no-html': [0],
-    'no-jquery/no-in-array': [2],
-    'no-jquery/no-is-array': [2],
-    'no-jquery/no-is-empty-object': [2],
-    'no-jquery/no-is-function': [2],
-    'no-jquery/no-is-numeric': [2],
-    'no-jquery/no-is-plain-object': [2],
-    'no-jquery/no-is-window': [2],
-    'no-jquery/no-is': [2],
-    'no-jquery/no-jquery-constructor': [0],
-    'no-jquery/no-live': [2],
-    'no-jquery/no-load-shorthand': [2],
-    'no-jquery/no-load': [2],
-    'no-jquery/no-map-collection': [0],
-    'no-jquery/no-map-util': [2],
-    'no-jquery/no-map': [2],
-    'no-jquery/no-merge': [2],
-    'no-jquery/no-node-name': [2],
-    'no-jquery/no-noop': [2],
-    'no-jquery/no-now': [2],
-    'no-jquery/no-on-ready': [2],
-    'no-jquery/no-other-methods': [0],
-    'no-jquery/no-other-utils': [2],
-    'no-jquery/no-param': [2],
-    'no-jquery/no-parent': [0],
-    'no-jquery/no-parents': [2],
-    'no-jquery/no-parse-html-literal': [2],
-    'no-jquery/no-parse-html': [2],
-    'no-jquery/no-parse-json': [2],
-    'no-jquery/no-parse-xml': [2],
-    'no-jquery/no-prop': [2],
-    'no-jquery/no-proxy': [2],
-    'no-jquery/no-ready-shorthand': [2],
-    'no-jquery/no-ready': [2],
-    'no-jquery/no-selector-prop': [2],
-    'no-jquery/no-serialize': [2],
-    'no-jquery/no-size': [2],
-    'no-jquery/no-sizzle': [0],
-    'no-jquery/no-slide': [2],
-    'no-jquery/no-sub': [2],
-    'no-jquery/no-support': [2],
-    'no-jquery/no-text': [0],
-    'no-jquery/no-trigger': [0],
-    'no-jquery/no-trim': [2],
-    'no-jquery/no-type': [2],
-    'no-jquery/no-unique': [2],
-    'no-jquery/no-unload-shorthand': [2],
-    'no-jquery/no-val': [0],
-    'no-jquery/no-visibility': [2],
-    'no-jquery/no-when': [2],
-    'no-jquery/no-wrap': [2],
-    'no-jquery/variable-pattern': [2],
-    'no-label-var': [2],
-    'no-labels': [0],
-    'no-lone-blocks': [2],
-    'no-lonely-if': [0],
-    'no-loop-func': [0],
-    'no-loss-of-precision': [2],
-    'no-magic-numbers': [0],
-    'no-misleading-character-class': [2],
-    'no-multi-assign': [0],
-    'no-multi-str': [2],
-    'no-negated-condition': [0],
-    'no-nested-ternary': [0],
-    'no-new-func': [2],
-    'no-new-native-nonconstructor': [2],
-    'no-new-object': [2],
-    'no-new-symbol': [2],
-    'no-new-wrappers': [2],
-    'no-new': [0],
-    'no-nonoctal-decimal-escape': [2],
-    'no-obj-calls': [2],
-    'no-octal-escape': [2],
-    'no-octal': [2],
-    'no-param-reassign': [0],
-    'no-plusplus': [0],
-    'no-promise-executor-return': [0],
-    'no-proto': [2],
-    'no-prototype-builtins': [2],
-    'no-redeclare': [2],
-    'no-regex-spaces': [2],
-    'no-restricted-exports': [0],
-
-    'no-restricted-globals': [
-      2,
-      'addEventListener',
-      'blur',
-      'close',
-      'closed',
-      'confirm',
-      'defaultStatus',
-      'defaultstatus',
-      'error',
-      'event',
-      'external',
-      'find',
-      'focus',
-      'frameElement',
-      'frames',
-      'history',
-      'innerHeight',
-      'innerWidth',
-      'isFinite',
-      'isNaN',
-      'length',
-      'location',
-      'locationbar',
-      'menubar',
-      'moveBy',
-      'moveTo',
-      'name',
-      'onblur',
-      'onerror',
-      'onfocus',
-      'onload',
-      'onresize',
-      'onunload',
-      'open',
-      'opener',
-      'opera',
-      'outerHeight',
-      'outerWidth',
-      'pageXOffset',
-      'pageYOffset',
-      'parent',
-      'print',
-      'removeEventListener',
-      'resizeBy',
-      'resizeTo',
-      'screen',
-      'screenLeft',
-      'screenTop',
-      'screenX',
-      'screenY',
-      'scroll',
-      'scrollbars',
-      'scrollBy',
-      'scrollTo',
-      'scrollX',
-      'scrollY',
-      'self',
-      'status',
-      'statusbar',
-      'stop',
-      'toolbar',
-      'top',
-      '__dirname',
-      '__filename',
-    ],
-
-    'no-restricted-imports': [0],
-
-    'no-restricted-syntax': [
-      2,
-      'WithStatement',
-      'ForInStatement',
-      'LabeledStatement',
-      'SequenceExpression',
-      {
-        selector: "CallExpression[callee.name='fetch']",
-        message: 'use modules/fetch.js instead',
+    rules: {
+      'no-restricted-syntax': [
+        2,
+        'WithStatement',
+        'ForInStatement',
+        'LabeledStatement',
+        'SequenceExpression',
+      ],
+    },
+  }, {
+    files: ['tests/e2e/**/*.js', 'tests/e2e/**/*.ts'],
+    languageOptions: {
+      globals: {
+        ...globals.browser,
       },
-    ],
 
-    'no-return-assign': [0],
-    'no-script-url': [2],
+      ecmaVersion: 'latest',
+      sourceType: 'module',
+    },
+    rules: {
+      ...playwright.configs['flat/recommended'].rules,
+      'playwright/no-conditional-in-test': [0],
+      'playwright/no-conditional-expect': [0],
+      'playwright/no-networkidle': [0],
 
-    'no-self-assign': [2, {
-      props: true,
-    }],
+      'playwright/no-skipped-test': [
+        2,
+        {
+          allowConditional: true,
+        },
+      ],
+      'playwright/no-useless-await': [2],
 
-    'no-self-compare': [2],
-    'no-sequences': [2],
-    'no-setter-return': [2],
-    'no-shadow-restricted-names': [2],
-    'no-shadow': [0],
-    'no-sparse-arrays': [2],
-    'no-template-curly-in-string': [2],
-    'no-ternary': [0],
-    'no-this-before-super': [2],
-    'no-throw-literal': [2],
-    'no-undef-init': [2],
-
-    'no-undef': [2, {
-      typeof: true,
-    }],
-
-    'no-undefined': [0],
-    'no-underscore-dangle': [0],
-    'no-unexpected-multiline': [2],
-    'no-unmodified-loop-condition': [2],
-    'no-unneeded-ternary': [2],
-    'no-unreachable-loop': [2],
-    'no-unreachable': [2],
-    'no-unsafe-finally': [2],
-    'no-unsafe-negation': [2],
-    'no-unused-expressions': [2],
-    'no-unused-labels': [2],
-    'no-unused-private-class-members': [2],
-
-    'no-unused-vars': [2, {
-      args: 'all',
-      argsIgnorePattern: '^_',
-      varsIgnorePattern: '^_',
-      caughtErrorsIgnorePattern: '^_',
-      destructuredArrayIgnorePattern: '^_',
-      ignoreRestSiblings: false,
-    }],
-
-    'no-use-before-define': [2, {
-      functions: false,
-      classes: true,
-      variables: true,
-      allowNamedExports: true,
-    }],
-
-    'no-use-extend-native/no-use-extend-native': [2],
-    'no-useless-backreference': [2],
-    'no-useless-call': [2],
-    'no-useless-catch': [2],
-    'no-useless-computed-key': [2],
-    'no-useless-concat': [2],
-    'no-useless-constructor': [2],
-    'no-useless-escape': [2],
-    'no-useless-rename': [2],
-    'no-useless-return': [2],
-    'no-var': [2],
-    'no-void': [2],
-    'no-warning-comments': [0],
-    'no-with': [0],
-    'object-shorthand': [2, 'always'],
-    'one-var-declaration-per-line': [0],
-    'one-var': [0],
-    'operator-assignment': [2, 'always'],
-    'operator-linebreak': [2, 'after'],
-
-    'prefer-arrow-callback': [2, {
-      allowNamedFunctions: true,
-      allowUnboundThis: true,
-    }],
-
-    'prefer-const': [2, {
-      destructuring: 'all',
-      ignoreReadBeforeAssign: true,
-    }],
-
-    'prefer-destructuring': [0],
-    'prefer-exponentiation-operator': [2],
-    'prefer-named-capture-group': [0],
-    'prefer-numeric-literals': [2],
-    'prefer-object-has-own': [2],
-    'prefer-object-spread': [2],
-
-    'prefer-promise-reject-errors': [2, {
-      allowEmptyReject: false,
-    }],
-
-    'prefer-regex-literals': [2],
-    'prefer-rest-params': [2],
-    'prefer-spread': [2],
-    'prefer-template': [2],
-    radix: [2, 'as-needed'],
-    'regexp/confusing-quantifier': [2],
-    'regexp/control-character-escape': [2],
-    'regexp/hexadecimal-escape': [0],
-    'regexp/letter-case': [0],
-    'regexp/match-any': [2],
-    'regexp/negation': [2],
-    'regexp/no-contradiction-with-assertion': [0],
-    'regexp/no-control-character': [0],
-    'regexp/no-dupe-characters-character-class': [2],
-    'regexp/no-dupe-disjunctions': [2],
-    'regexp/no-empty-alternative': [2],
-    'regexp/no-empty-capturing-group': [2],
-    'regexp/no-empty-character-class': [0],
-    'regexp/no-empty-group': [2],
-    'regexp/no-empty-lookarounds-assertion': [2],
-    'regexp/no-empty-string-literal': [2],
-    'regexp/no-escape-backspace': [2],
-    'regexp/no-extra-lookaround-assertions': [0],
-    'regexp/no-invalid-regexp': [2],
-    'regexp/no-invisible-character': [2],
-    'regexp/no-lazy-ends': [2],
-    'regexp/no-legacy-features': [2],
-    'regexp/no-misleading-capturing-group': [0],
-    'regexp/no-misleading-unicode-character': [0],
-    'regexp/no-missing-g-flag': [2],
-    'regexp/no-non-standard-flag': [2],
-    'regexp/no-obscure-range': [2],
-    'regexp/no-octal': [2],
-    'regexp/no-optional-assertion': [2],
-    'regexp/no-potentially-useless-backreference': [2],
-    'regexp/no-standalone-backslash': [2],
-    'regexp/no-super-linear-backtracking': [0],
-    'regexp/no-super-linear-move': [0],
-    'regexp/no-trivially-nested-assertion': [2],
-    'regexp/no-trivially-nested-quantifier': [2],
-    'regexp/no-unused-capturing-group': [0],
-    'regexp/no-useless-assertions': [2],
-    'regexp/no-useless-backreference': [2],
-    'regexp/no-useless-character-class': [2],
-    'regexp/no-useless-dollar-replacements': [2],
-    'regexp/no-useless-escape': [2],
-    'regexp/no-useless-flag': [2],
-    'regexp/no-useless-lazy': [2],
-    'regexp/no-useless-non-capturing-group': [2],
-    'regexp/no-useless-quantifier': [2],
-    'regexp/no-useless-range': [2],
-    'regexp/no-useless-set-operand': [2],
-    'regexp/no-useless-string-literal': [2],
-    'regexp/no-useless-two-nums-quantifier': [2],
-    'regexp/no-zero-quantifier': [2],
-    'regexp/optimal-lookaround-quantifier': [2],
-    'regexp/optimal-quantifier-concatenation': [0],
-    'regexp/prefer-character-class': [0],
-    'regexp/prefer-d': [0],
-    'regexp/prefer-escape-replacement-dollar-char': [0],
-    'regexp/prefer-lookaround': [0],
-    'regexp/prefer-named-backreference': [0],
-    'regexp/prefer-named-capture-group': [0],
-    'regexp/prefer-named-replacement': [0],
-    'regexp/prefer-plus-quantifier': [2],
-    'regexp/prefer-predefined-assertion': [2],
-    'regexp/prefer-quantifier': [0],
-    'regexp/prefer-question-quantifier': [2],
-    'regexp/prefer-range': [2],
-    'regexp/prefer-regexp-exec': [2],
-    'regexp/prefer-regexp-test': [2],
-    'regexp/prefer-result-array-groups': [0],
-    'regexp/prefer-set-operation': [2],
-    'regexp/prefer-star-quantifier': [2],
-    'regexp/prefer-unicode-codepoint-escapes': [2],
-    'regexp/prefer-w': [0],
-    'regexp/require-unicode-regexp': [0],
-    'regexp/simplify-set-operations': [2],
-    'regexp/sort-alternatives': [0],
-    'regexp/sort-character-class-elements': [0],
-    'regexp/sort-flags': [0],
-    'regexp/strict': [2],
-    'regexp/unicode-escape': [0],
-    'regexp/use-ignore-case': [0],
-    'require-atomic-updates': [0],
-    'require-await': [0],
-    'require-unicode-regexp': [0],
-    'require-yield': [2],
-    'sonarjs/cognitive-complexity': [0],
-    'sonarjs/elseif-without-else': [0],
-    'sonarjs/max-switch-cases': [0],
-    'sonarjs/no-all-duplicated-branches': [2],
-    'sonarjs/no-collapsible-if': [0],
-    'sonarjs/no-collection-size-mischeck': [2],
-    'sonarjs/no-duplicate-string': [0],
-    'sonarjs/no-duplicated-branches': [0],
-    'sonarjs/no-element-overwrite': [2],
-    'sonarjs/no-empty-collection': [2],
-    'sonarjs/no-extra-arguments': [2],
-    'sonarjs/no-gratuitous-expressions': [2],
-    'sonarjs/no-identical-conditions': [2],
-    'sonarjs/no-identical-expressions': [2],
-    'sonarjs/no-identical-functions': [2, 5],
-    'sonarjs/no-ignored-return': [2],
-    'sonarjs/no-inverted-boolean-check': [2],
-    'sonarjs/no-nested-switch': [0],
-    'sonarjs/no-nested-template-literals': [0],
-    'sonarjs/no-one-iteration-loop': [2],
-    'sonarjs/no-redundant-boolean': [2],
-    'sonarjs/no-redundant-jump': [2],
-    'sonarjs/no-same-line-conditional': [2],
-    'sonarjs/no-small-switch': [0],
-    'sonarjs/no-unused-collection': [2],
-    'sonarjs/no-use-of-empty-return-value': [2],
-    'sonarjs/no-useless-catch': [2],
-    'sonarjs/non-existent-operator': [2],
-    'sonarjs/prefer-immediate-return': [0],
-    'sonarjs/prefer-object-literal': [0],
-    'sonarjs/prefer-single-boolean-return': [0],
-    'sonarjs/prefer-while': [2],
-    'sort-imports': [0],
-    'sort-keys': [0],
-    'sort-vars': [0],
-    strict: [0],
-    'symbol-description': [2],
-    'unicode-bom': [2, 'never'],
-    'unicorn/better-regex': [0],
-    'unicorn/catch-error-name': [0],
-    'unicorn/consistent-destructuring': [2],
-    'unicorn/consistent-empty-array-spread': [2],
-    'unicorn/consistent-existence-index-check': [2],
-    'unicorn/consistent-function-scoping': [2],
-    'unicorn/custom-error-definition': [0],
-    'unicorn/empty-brace-spaces': [2],
-    'unicorn/error-message': [0],
-    'unicorn/escape-case': [0],
-    'unicorn/expiring-todo-comments': [0],
-    'unicorn/explicit-length-check': [0],
-    'unicorn/filename-case': [0],
-    'unicorn/import-index': [0],
-    'unicorn/import-style': [0],
-    'unicorn/new-for-builtins': [2],
-    'unicorn/no-abusive-eslint-disable': [0],
-    'unicorn/no-anonymous-default-export': [0],
-    'unicorn/no-array-callback-reference': [0],
-    'unicorn/no-array-for-each': [2],
-    'unicorn/no-array-method-this-argument': [2],
-    'unicorn/no-array-push-push': [2],
-    'unicorn/no-array-reduce': [2],
-    'unicorn/no-await-expression-member': [0],
-    'unicorn/no-await-in-promise-methods': [2],
-    'unicorn/no-console-spaces': [0],
-    'unicorn/no-document-cookie': [2],
-    'unicorn/no-empty-file': [2],
-    'unicorn/no-for-loop': [0],
-    'unicorn/no-hex-escape': [0],
-    'unicorn/no-instanceof-array': [0],
-    'unicorn/no-invalid-fetch-options': [2],
-    'unicorn/no-invalid-remove-event-listener': [2],
-    'unicorn/no-keyword-prefix': [0],
-    'unicorn/no-length-as-slice-end': [2],
-    'unicorn/no-lonely-if': [2],
-    'unicorn/no-magic-array-flat-depth': [0],
-    'unicorn/no-negated-condition': [0],
-    'unicorn/no-negation-in-equality-check': [2],
-    'unicorn/no-nested-ternary': [0],
-    'unicorn/no-new-array': [0],
-    'unicorn/no-new-buffer': [0],
-    'unicorn/no-null': [0],
-    'unicorn/no-object-as-default-parameter': [0],
-    'unicorn/no-process-exit': [0],
-    'unicorn/no-single-promise-in-promise-methods': [2],
-    'unicorn/no-static-only-class': [2],
-    'unicorn/no-thenable': [2],
-    'unicorn/no-this-assignment': [2],
-    'unicorn/no-typeof-undefined': [2],
-    'unicorn/no-unnecessary-await': [2],
-    'unicorn/no-unnecessary-polyfills': [2],
-    'unicorn/no-unreadable-array-destructuring': [0],
-    'unicorn/no-unreadable-iife': [2],
-    'unicorn/no-unused-properties': [2],
-    'unicorn/no-useless-fallback-in-spread': [2],
-    'unicorn/no-useless-length-check': [2],
-    'unicorn/no-useless-promise-resolve-reject': [2],
-    'unicorn/no-useless-spread': [2],
-    'unicorn/no-useless-switch-case': [2],
-    'unicorn/no-useless-undefined': [0],
-    'unicorn/no-zero-fractions': [2],
-    'unicorn/number-literal-case': [0],
-    'unicorn/numeric-separators-style': [0],
-    'unicorn/prefer-add-event-listener': [2],
-    'unicorn/prefer-array-find': [2],
-    'unicorn/prefer-array-flat-map': [2],
-    'unicorn/prefer-array-flat': [2],
-    'unicorn/prefer-array-index-of': [2],
-    'unicorn/prefer-array-some': [2],
-    'unicorn/prefer-at': [0],
-    'unicorn/prefer-blob-reading-methods': [2],
-    'unicorn/prefer-code-point': [0],
-    'unicorn/prefer-date-now': [2],
-    'unicorn/prefer-default-parameters': [0],
-    'unicorn/prefer-dom-node-append': [2],
-    'unicorn/prefer-dom-node-dataset': [0],
-    'unicorn/prefer-dom-node-remove': [2],
-    'unicorn/prefer-dom-node-text-content': [2],
-    'unicorn/prefer-event-target': [2],
-    'unicorn/prefer-export-from': [0],
-    'unicorn/prefer-global-this': [0],
-    'unicorn/prefer-includes': [2],
-    'unicorn/prefer-json-parse-buffer': [0],
-    'unicorn/prefer-keyboard-event-key': [2],
-    'unicorn/prefer-logical-operator-over-ternary': [2],
-    'unicorn/prefer-math-min-max': [2],
-    'unicorn/prefer-math-trunc': [2],
-    'unicorn/prefer-modern-dom-apis': [0],
-    'unicorn/prefer-modern-math-apis': [2],
-    'unicorn/prefer-module': [2],
-    'unicorn/prefer-native-coercion-functions': [2],
-    'unicorn/prefer-negative-index': [2],
-    'unicorn/prefer-node-protocol': [2],
-    'unicorn/prefer-number-properties': [0],
-    'unicorn/prefer-object-from-entries': [2],
-    'unicorn/prefer-object-has-own': [0],
-    'unicorn/prefer-optional-catch-binding': [2],
-    'unicorn/prefer-prototype-methods': [0],
-    'unicorn/prefer-query-selector': [0],
-    'unicorn/prefer-reflect-apply': [0],
-    'unicorn/prefer-regexp-test': [2],
-    'unicorn/prefer-set-has': [0],
-    'unicorn/prefer-set-size': [2],
-    'unicorn/prefer-spread': [0],
-    'unicorn/prefer-string-raw': [0],
-    'unicorn/prefer-string-replace-all': [0],
-    'unicorn/prefer-string-slice': [0],
-    'unicorn/prefer-string-starts-ends-with': [2],
-    'unicorn/prefer-string-trim-start-end': [2],
-    'unicorn/prefer-structured-clone': [2],
-    'unicorn/prefer-switch': [0],
-    'unicorn/prefer-ternary': [0],
-    'unicorn/prefer-text-content': [2],
-    'unicorn/prefer-top-level-await': [0],
-    'unicorn/prefer-type-error': [0],
-    'unicorn/prevent-abbreviations': [0],
-    'unicorn/relative-url-style': [2],
-    'unicorn/require-array-join-separator': [2],
-    'unicorn/require-number-to-fixed-digits-argument': [2],
-    'unicorn/require-post-message-target-origin': [0],
-    'unicorn/string-content': [0],
-    'unicorn/switch-case-braces': [0],
-    'unicorn/template-indent': [2],
-    'unicorn/text-encoding-identifier-case': [0],
-    'unicorn/throw-new-error': [2],
-    'use-isnan': [2],
-
-    'valid-typeof': [2, {
-      requireStringLiterals: true,
-    }],
-
-    'vars-on-top': [0],
-    'wc/attach-shadow-constructor': [2],
-    'wc/define-tag-after-class-definition': [0],
-    'wc/expose-class-on-global': [0],
-    'wc/file-name-matches-element': [2],
-    'wc/guard-define-call': [0],
-    'wc/guard-super-call': [2],
-    'wc/max-elements-per-file': [0],
-    'wc/no-child-traversal-in-attributechangedcallback': [2],
-    'wc/no-child-traversal-in-connectedcallback': [2],
-    'wc/no-closed-shadow-root': [2],
-    'wc/no-constructor-attributes': [2],
-    'wc/no-constructor-params': [2],
-    'wc/no-constructor': [2],
-    'wc/no-customized-built-in-elements': [2],
-    'wc/no-exports-with-element': [0],
-    'wc/no-invalid-element-name': [2],
-    'wc/no-invalid-extends': [2],
-    'wc/no-method-prefixed-with-on': [2],
-    'wc/no-self-class': [2],
-    'wc/no-typos': [2],
-    'wc/require-listener-teardown': [2],
-    'wc/tag-name-matches-class': [2],
-    yoda: [2, 'never'],
-  },
-},
-{
-  ignores: ['*.vue', '**/*.vue'],
-  rules: {
-    'import-x/consistent-type-specifier-style': [0],
-    'import-x/default': [0],
-    'import-x/dynamic-import-chunkname': [0],
-    'import-x/export': [2],
-    'import-x/exports-last': [0],
-
-    'import-x/extensions': [2, 'always', {
-      ignorePackages: true,
-    }],
-
-    'import-x/first': [2],
-    'import-x/group-exports': [0],
-    'import-x/max-dependencies': [0],
-    'import-x/named': [2],
-    'import-x/namespace': [0],
-    'import-x/newline-after-import': [0],
-    'import-x/no-absolute-path': [0],
-    'import-x/no-amd': [2],
-    'import-x/no-anonymous-default-export': [0],
-    'import-x/no-commonjs': [2],
-
-    'import-x/no-cycle': [2, {
-      ignoreExternal: true,
-      maxDepth: 1,
-    }],
-
-    'import-x/no-default-export': [0],
-    'import-x/no-deprecated': [0],
-    'import-x/no-dynamic-require': [0],
-    'import-x/no-empty-named-blocks': [2],
-    'import-x/no-extraneous-dependencies': [2],
-    'import-x/no-import-module-exports': [0],
-    'import-x/no-internal-modules': [0],
-    'import-x/no-mutable-exports': [0],
-    'import-x/no-named-as-default-member': [0],
-    'import-x/no-named-as-default': [2],
-    'import-x/no-named-default': [0],
-    'import-x/no-named-export': [0],
-    'import-x/no-namespace': [0],
-    'import-x/no-nodejs-modules': [0],
-    'import-x/no-relative-packages': [0],
-    'import-x/no-relative-parent-imports': [0],
-    'import-x/no-restricted-paths': [0],
-    'import-x/no-self-import': [2],
-    'import-x/no-unassigned-import': [0],
-
-    'import-x/no-unresolved': [2, {
-      commonjs: true,
-      ignore: ['\\?.+$', '^vitest/'],
-    }],
-
-    'import-x/no-useless-path-segments': [2, {
-      commonjs: true,
-    }],
-
-    'import-x/no-webpack-loader-syntax': [2],
-    'import-x/order': [0],
-    'import-x/prefer-default-export': [0],
-    'import-x/unambiguous': [0],
-  },
-},
-{
-  files: ['web_src/**/*'],
-  languageOptions: {
-    globals: {
-      __webpack_public_path__: true,
-      process: false,
+      'playwright/prefer-comparison-matcher': [2],
+      'playwright/prefer-equality-matcher': [2],
+      'playwright/prefer-native-locators': [2],
+      'playwright/prefer-to-contain': [2],
+      'playwright/prefer-to-have-length': [2],
+      'playwright/require-to-throw-message': [2],
     },
   },
-}, {
-  files: ['web_src/**/*', 'docs/**/*'],
-
-  languageOptions: {
-    globals: {
-      ...globals.browser,
-    },
-  },
-}, {
-  files: ['web_src/**/*worker.*'],
-
-  languageOptions: {
-    globals: {
-      ...globals.worker,
-    },
-  },
-
-  rules: {
-    'no-restricted-globals': [
-      2,
-      'addEventListener',
-      'blur',
-      'close',
-      'closed',
-      'confirm',
-      'defaultStatus',
-      'defaultstatus',
-      'error',
-      'event',
-      'external',
-      'find',
-      'focus',
-      'frameElement',
-      'frames',
-      'history',
-      'innerHeight',
-      'innerWidth',
-      'isFinite',
-      'isNaN',
-      'length',
-      'locationbar',
-      'menubar',
-      'moveBy',
-      'moveTo',
-      'name',
-      'onblur',
-      'onerror',
-      'onfocus',
-      'onload',
-      'onresize',
-      'onunload',
-      'open',
-      'opener',
-      'opera',
-      'outerHeight',
-      'outerWidth',
-      'pageXOffset',
-      'pageYOffset',
-      'parent',
-      'print',
-      'removeEventListener',
-      'resizeBy',
-      'resizeTo',
-      'screen',
-      'screenLeft',
-      'screenTop',
-      'screenX',
-      'screenY',
-      'scroll',
-      'scrollbars',
-      'scrollBy',
-      'scrollTo',
-      'scrollX',
-      'scrollY',
-      'status',
-      'statusbar',
-      'stop',
-      'toolbar',
-      'top',
-    ],
-  },
-}, {
-  files: ['**/*.config.*'],
-  languageOptions: {
-    ecmaVersion: 'latest',
-  },
-  rules: {
-    'import-x/no-unused-modules': [0],
-    'import-x/no-unresolved': [0],
-  },
-}, {
-  files: ['**/*.test.*', 'web_src/js/test/setup.js'],
-  languageOptions: {
-    globals: {
-      ...vitestGlobals.environments.env.globals,
-    },
-  },
-
-  rules: {
-    '@vitest/consistent-test-filename': [0],
-    '@vitest/consistent-test-it': [0],
-    '@vitest/expect-expect': [0],
-    '@vitest/max-expects': [0],
-    '@vitest/max-nested-describe': [0],
-    '@vitest/no-alias-methods': [0],
-    '@vitest/no-commented-out-tests': [0],
-    '@vitest/no-conditional-expect': [0],
-    '@vitest/no-conditional-in-test': [0],
-    '@vitest/no-conditional-tests': [0],
-    '@vitest/no-disabled-tests': [0],
-    '@vitest/no-done-callback': [0],
-    '@vitest/no-duplicate-hooks': [0],
-    '@vitest/no-focused-tests': [0],
-    '@vitest/no-hooks': [0],
-    '@vitest/no-identical-title': [2],
-    '@vitest/no-interpolation-in-snapshots': [0],
-    '@vitest/no-large-snapshots': [0],
-    '@vitest/no-mocks-import': [0],
-    '@vitest/no-restricted-matchers': [0],
-    '@vitest/no-restricted-vi-methods': [0],
-    '@vitest/no-standalone-expect': [0],
-    '@vitest/no-test-prefixes': [0],
-    '@vitest/no-test-return-statement': [0],
-    '@vitest/prefer-called-with': [0],
-    '@vitest/prefer-comparison-matcher': [0],
-    '@vitest/prefer-each': [0],
-    '@vitest/prefer-equality-matcher': [0],
-    '@vitest/prefer-expect-resolves': [0],
-    '@vitest/prefer-hooks-in-order': [0],
-    '@vitest/prefer-hooks-on-top': [2],
-    '@vitest/prefer-lowercase-title': [0],
-    '@vitest/prefer-mock-promise-shorthand': [0],
-    '@vitest/prefer-snapshot-hint': [0],
-    '@vitest/prefer-spy-on': [0],
-    '@vitest/prefer-strict-equal': [0],
-    '@vitest/prefer-to-be': [0],
-    '@vitest/prefer-to-be-falsy': [0],
-    '@vitest/prefer-to-be-object': [0],
-    '@vitest/prefer-to-be-truthy': [0],
-    '@vitest/prefer-to-contain': [0],
-    '@vitest/prefer-to-have-length': [0],
-    '@vitest/prefer-todo': [0],
-    '@vitest/require-hook': [0],
-    '@vitest/require-to-throw-message': [0],
-    '@vitest/require-top-level-describe': [0],
-    '@vitest/valid-describe-callback': [2],
-    '@vitest/valid-expect': [2],
-    '@vitest/valid-title': [2],
-  },
-}, {
-  files: ['web_src/js/modules/fetch.js', 'web_src/js/standalone/**/*'],
-
-  rules: {
-    'no-restricted-syntax': [
-      2,
-      'WithStatement',
-      'ForInStatement',
-      'LabeledStatement',
-      'SequenceExpression',
-    ],
-  },
-}, {
-  files: ['tests/e2e/**/*.js'],
-  languageOptions: {
-    globals: {
-      ...globals.browser,
-    },
-
-    ecmaVersion: 'latest',
-    sourceType: 'module',
-  },
-  rules: {
-    ...playwright.configs['flat/recommended'].rules,
-    'playwright/no-conditional-in-test': [0],
-    'playwright/no-conditional-expect': [0],
-    'playwright/no-networkidle': [0],
-
-    'playwright/no-skipped-test': [
-      2,
-      {
-        allowConditional: true,
+  ...vue.configs['flat/recommended'],
+  {
+    files: ['web_src/js/components/*.vue'],
+    languageOptions: {
+      globals: {
+        ...globals.browser,
       },
-    ],
-    'playwright/no-useless-await': [2],
 
-    'playwright/prefer-comparison-matcher': [2],
-    'playwright/prefer-equality-matcher': [2],
-    'playwright/prefer-native-locators': [2],
-    'playwright/prefer-to-contain': [2],
-    'playwright/prefer-to-have-length': [2],
-    'playwright/require-to-throw-message': [2],
-  },
-},
-...vue.configs['flat/recommended'],
-{
-  files: ['web_src/js/components/*.vue'],
-  languageOptions: {
-    globals: {
-      ...globals.browser,
+      ecmaVersion: 'latest',
+      sourceType: 'module',
+    },
+    rules: {
+      'vue/attributes-order': [0],
+      'vue/html-closing-bracket-spacing': [2, {
+        startTag: 'never',
+        endTag: 'never',
+        selfClosingTag: 'never',
+      }],
+      'vue/max-attributes-per-line': [0],
+      'vue-scoped-css/enforce-style-type': [0],
     },
-
-    ecmaVersion: 'latest',
-    sourceType: 'module',
   },
-  rules: {
-    'vue/attributes-order': [0],
-    'vue/html-closing-bracket-spacing': [2, {
-      startTag: 'never',
-      endTag: 'never',
-      selfClosingTag: 'never',
-    }],
-    'vue/max-attributes-per-line': [0],
-    'vue-scoped-css/enforce-style-type': [0],
-  },
-},
 
-];
+);
diff --git a/package-lock.json b/package-lock.json
index d08c9b7c7c..0206dc2ef8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -66,11 +66,13 @@
         "@stoplight/spectral-cli": "6.13.1",
         "@stylistic/eslint-plugin-js": "2.9.0",
         "@stylistic/stylelint-plugin": "3.1.1",
+        "@typescript-eslint/parser": "8.11.0",
         "@vitejs/plugin-vue": "5.1.4",
         "@vitest/coverage-v8": "2.1.4",
         "@vitest/eslint-plugin": "1.1.7",
         "@vue/test-utils": "2.4.6",
         "eslint": "9.13.0",
+        "eslint-import-resolver-typescript": "3.6.3",
         "eslint-plugin-array-func": "4.0.0",
         "eslint-plugin-import-x": "4.3.1",
         "eslint-plugin-no-jquery": "3.0.2",
@@ -93,6 +95,8 @@
         "stylelint-declaration-strict-value": "1.10.6",
         "stylelint-value-no-unknown-custom-properties": "6.0.1",
         "svgo": "3.2.0",
+        "typescript": "5.6.3",
+        "typescript-eslint": "8.11.0",
         "vite-string-plugin": "1.3.4",
         "vitest": "2.1.4"
       },
@@ -2485,262 +2489,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
-      "cpu": [
-        "ia32"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
-      "cpu": [
-        "loong64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
-      "cpu": [
-        "mips64el"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
-      "cpu": [
-        "ppc64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
-      "cpu": [
-        "s390x"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@esbuild/linux-x64": {
       "version": "0.21.5",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
@@ -2757,102 +2505,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
-      "cpu": [
-        "ia32"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@eslint-community/eslint-plugin-eslint-comments": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-4.4.0.tgz",
@@ -3502,6 +3154,16 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@nolyfill/is-core-module": {
+      "version": "1.0.39",
+      "resolved": "https://registry.npmjs.org/@nolyfill/is-core-module/-/is-core-module-1.0.39.tgz",
+      "integrity": "sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.4.0"
+      }
+    },
     "node_modules/@npmcli/fs": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
@@ -3614,188 +3276,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.2.tgz",
-      "integrity": "sha512-ufoveNTKDg9t/b7nqI3lwbCG/9IJMhADBNjjz/Jn6LxIZxD7T5L8l2uO/wD99945F1Oo8FvgbbZJRguyk/BdzA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.2.tgz",
-      "integrity": "sha512-iZoYCiJz3Uek4NI0J06/ZxUgwAfNzqltK0MptPDO4OR0a88R4h0DSELMsflS6ibMCJ4PnLvq8f7O1d7WexUvIA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.2.tgz",
-      "integrity": "sha512-/UhrIxobHYCBfhi5paTkUDQ0w+jckjRZDZ1kcBL132WeHZQ6+S5v9jQPVGLVrLbNUebdIRpIt00lQ+4Z7ys4Rg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.2.tgz",
-      "integrity": "sha512-1F/jrfhxJtWILusgx63WeTvGTwE4vmsT9+e/z7cZLKU8sBMddwqw3UV5ERfOV+H1FuRK3YREZ46J4Gy0aP3qDA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.24.2.tgz",
-      "integrity": "sha512-1YWOpFcGuC6iGAS4EI+o3BV2/6S0H+m9kFOIlyFtp4xIX5rjSnL3AwbTBxROX0c8yWtiWM7ZI6mEPTI7VkSpZw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.24.2.tgz",
-      "integrity": "sha512-3qAqTewYrCdnOD9Gl9yvPoAoFAVmPJsBvleabvx4bnu1Kt6DrB2OALeRVag7BdWGWLhP1yooeMLEi6r2nYSOjg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.2.tgz",
-      "integrity": "sha512-ArdGtPHjLqWkqQuoVQ6a5UC5ebdX8INPuJuJNWRe0RGa/YNhVvxeWmCTFQ7LdmNCSUzVZzxAvUznKaYx645Rig==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.2.tgz",
-      "integrity": "sha512-B6UHHeNnnih8xH6wRKB0mOcJGvjZTww1FV59HqJoTJ5da9LCG6R4SEBt6uPqzlawv1LoEXSS0d4fBlHNWl6iYw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.2.tgz",
-      "integrity": "sha512-kr3gqzczJjSAncwOS6i7fpb4dlqcvLidqrX5hpGBIM1wtt0QEVtf4wFaAwVv8QygFU8iWUMYEoJZWuWxyua4GQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.2.tgz",
-      "integrity": "sha512-TDdHLKCWgPuq9vQcmyLrhg/bgbOvIQ8rtWQK7MRxJ9nvaxKx38NvY7/Lo6cYuEnNHqf6rMqnivOIPIQt6H2AoA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.2.tgz",
-      "integrity": "sha512-xv9vS648T3X4AxFFZGWeB5Dou8ilsv4VVqJ0+loOIgDO20zIhYfDLkk5xoQiej2RiSQkld9ijF/fhLeonrz2mw==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.2.tgz",
-      "integrity": "sha512-tbtXwnofRoTt223WUZYiUnbxhGAOVul/3StZ947U4A5NNjnQJV5irKMm76G0LGItWs6y+SCjUn/Q0WaMLkEskg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.2.tgz",
-      "integrity": "sha512-gc97UebApwdsSNT3q79glOSPdfwgwj5ELuiyuiMY3pEWMxeVqLGKfpDFoum4ujivzxn6veUPzkGuSYoh5deQ2Q==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
       "version": "4.24.2",
       "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.2.tgz",
@@ -3824,48 +3304,6 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.2.tgz",
-      "integrity": "sha512-A+JAs4+EhsTjnPQvo9XY/DC0ztaws3vfqzrMNMKlwQXuniBKOIIvAAI8M0fBYiTCxQnElYu7mLk7JrhlQ+HeOw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.2.tgz",
-      "integrity": "sha512-ZhcrakbqA1SCiJRMKSU64AZcYzlZ/9M5LaYil9QWxx9vLnkQ9Vnkve17Qn4SjlipqIIBFKjBES6Zxhnvh0EAEw==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.2.tgz",
-      "integrity": "sha512-2mLH46K1u3r6uwc95hU+OR9q/ggYMpnS7pSp83Ece1HUQgF9Nh/QwTK5rcgbFnV9j+08yBrU5sA/P0RK2MSBNA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
     "node_modules/@rtsao/scc": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
@@ -4551,6 +3989,69 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.11.0.tgz",
+      "integrity": "sha512-KhGn2LjW1PJT2A/GfDpiyOfS4a8xHQv2myUagTM5+zsormOmBlYsnQ6pobJ8XxJmh6hnHwa2Mbe3fPrDJoDhbA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "8.11.0",
+        "@typescript-eslint/type-utils": "8.11.0",
+        "@typescript-eslint/utils": "8.11.0",
+        "@typescript-eslint/visitor-keys": "8.11.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.3.1",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "eslint": "^8.57.0 || ^9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.11.0.tgz",
+      "integrity": "sha512-lmt73NeHdy1Q/2ul295Qy3uninSqi6wQI18XwSpm8w0ZbQXUpjCAWP1Vlv/obudoBiIjJVjlztjQ+d/Md98Yxg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "8.11.0",
+        "@typescript-eslint/types": "8.11.0",
+        "@typescript-eslint/typescript-estree": "8.11.0",
+        "@typescript-eslint/visitor-keys": "8.11.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@typescript-eslint/scope-manager": {
       "version": "8.11.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.11.0.tgz",
@@ -4569,6 +4070,31 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.11.0.tgz",
+      "integrity": "sha512-ItiMfJS6pQU0NIKAaybBKkuVzo6IdnAhPFZA/2Mba/uBjuPQPet/8+zh5GtLHwmuFRShZx+8lhIs7/QeDHflOg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "8.11.0",
+        "@typescript-eslint/utils": "8.11.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@typescript-eslint/types": {
       "version": "8.11.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.11.0.tgz",
@@ -7908,6 +7434,42 @@
         "ms": "^2.1.1"
       }
     },
+    "node_modules/eslint-import-resolver-typescript": {
+      "version": "3.6.3",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.3.tgz",
+      "integrity": "sha512-ud9aw4szY9cCT1EWWdGv1L1XR6hh2PaRWif0j2QjQ0pgTY/69iw+W0Z4qZv5wHahOl8isEr+k/JnyAqNQkLkIA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@nolyfill/is-core-module": "1.0.39",
+        "debug": "^4.3.5",
+        "enhanced-resolve": "^5.15.0",
+        "eslint-module-utils": "^2.8.1",
+        "fast-glob": "^3.3.2",
+        "get-tsconfig": "^4.7.5",
+        "is-bun-module": "^1.0.2",
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts"
+      },
+      "peerDependencies": {
+        "eslint": "*",
+        "eslint-plugin-import": "*",
+        "eslint-plugin-import-x": "*"
+      },
+      "peerDependenciesMeta": {
+        "eslint-plugin-import": {
+          "optional": true
+        },
+        "eslint-plugin-import-x": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/eslint-module-utils": {
       "version": "2.12.0",
       "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
@@ -9349,20 +8911,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -10193,6 +9741,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-bun-module": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-bun-module/-/is-bun-module-1.2.1.tgz",
+      "integrity": "sha512-AmidtEM6D6NmUiLOvvU7+IePxjEjOzra2h0pSrsfSAcXwl/83zLLXDByafUJy9k/rKK0pvXMLdwKwGHlX2Ke6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.6.3"
+      }
+    },
     "node_modules/is-callable": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
@@ -15298,6 +14856,30 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/typescript-eslint": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.11.0.tgz",
+      "integrity": "sha512-cBRGnW3FSlxaYwU8KfAewxFK5uzeOAp0l2KebIlPDOT5olVi65KDG/yjBooPBG0kGW/HLkoz1c/iuBFehcS3IA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/eslint-plugin": "8.11.0",
+        "@typescript-eslint/parser": "8.11.0",
+        "@typescript-eslint/utils": "8.11.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/typo-js": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/typo-js/-/typo-js-1.2.4.tgz",
@@ -15597,21 +15179,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/vite/node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/vite/node_modules/rollup": {
       "version": "4.24.2",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.2.tgz",
diff --git a/package.json b/package.json
index c420353260..f852fbe9cd 100644
--- a/package.json
+++ b/package.json
@@ -65,11 +65,13 @@
     "@stoplight/spectral-cli": "6.13.1",
     "@stylistic/eslint-plugin-js": "2.9.0",
     "@stylistic/stylelint-plugin": "3.1.1",
+    "@typescript-eslint/parser": "8.11.0",
     "@vitejs/plugin-vue": "5.1.4",
     "@vitest/coverage-v8": "2.1.4",
     "@vitest/eslint-plugin": "1.1.7",
     "@vue/test-utils": "2.4.6",
     "eslint": "9.13.0",
+    "eslint-import-resolver-typescript": "3.6.3",
     "eslint-plugin-array-func": "4.0.0",
     "eslint-plugin-import-x": "4.3.1",
     "eslint-plugin-no-jquery": "3.0.2",
@@ -92,8 +94,12 @@
     "stylelint-declaration-strict-value": "1.10.6",
     "stylelint-value-no-unknown-custom-properties": "6.0.1",
     "svgo": "3.2.0",
+    "typescript": "5.6.3",
+    "typescript-eslint": "8.11.0",
     "vite-string-plugin": "1.3.4",
     "vitest": "2.1.4"
   },
-  "browserslist": ["defaults"]
+  "browserslist": [
+    "defaults"
+  ]
 }
diff --git a/playwright.config.js b/playwright.config.ts
similarity index 99%
rename from playwright.config.js
rename to playwright.config.ts
index 25e2a7ab71..194f7f7d36 100644
--- a/playwright.config.js
+++ b/playwright.config.ts
@@ -1,4 +1,3 @@
-// @ts-check
 import {devices} from '@playwright/test';
 
 const BASE_URL = process.env.GITEA_URL?.replace?.(/\/$/g, '') || 'http://localhost:3000';
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000000..88130812fe
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,30 @@
+{
+  "include": [
+    "*",
+    "tests/e2e/**/*",
+    "tools/**/*",
+    "web_src/js/**/*",
+  ],
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "lib": ["dom", "dom.iterable", "dom.asynciterable", "esnext"],
+    "allowImportingTsExtensions": true,
+    "allowJs": true,
+    "allowSyntheticDefaultImports": true,
+    "alwaysStrict": true,
+    "esModuleInterop": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "verbatimModuleSyntax": true,
+    "stripInternal": true,
+    "strict": false,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noPropertyAccessFromIndexSignature": false,
+    "exactOptionalPropertyTypes": false,
+  }
+}
diff --git a/vitest.config.js b/vitest.config.ts
similarity index 100%
rename from vitest.config.js
rename to vitest.config.ts
diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js
index 73aaa457f2..05120cb0cb 100644
--- a/web_src/js/features/repo-legacy.js
+++ b/web_src/js/features/repo-legacy.js
@@ -119,7 +119,7 @@ export function initRepoCommentForm() {
 
       hasUpdateAction = $listMenu.data('action') === 'update'; // Update the var
 
-      const clickedItem = this; // eslint-disable-line unicorn/no-this-assignment
+      const clickedItem = this; // eslint-disable-line unicorn/no-this-assignment, @typescript-eslint/no-this-alias
       const scope = this.getAttribute('data-scope');
 
       $(this).parent().find('.item').each(function () {
@@ -416,7 +416,10 @@ async function onEditContent(event) {
         context: editContentZone.getAttribute('data-context'),
         content_version: editContentZone.getAttribute('data-content-version'),
       });
-      for (const fileInput of dropzoneInst?.element.querySelectorAll('.files [name=files]')) params.append('files[]', fileInput.value);
+      const files = dropzoneInst?.element?.querySelectorAll('.files [name=files]') ?? [];
+      for (const fileInput of files) {
+        params.append('files[]', fileInput.value);
+      }
 
       const response = await POST(editContentZone.getAttribute('data-update-url'), {data: params});
       const data = await response.json();
diff --git a/web_src/js/webcomponents/overflow-menu.js b/web_src/js/webcomponents/overflow-menu.js
index a69ce1681c..54f8371927 100644
--- a/web_src/js/webcomponents/overflow-menu.js
+++ b/web_src/js/webcomponents/overflow-menu.js
@@ -4,7 +4,7 @@ import {isDocumentFragmentOrElementNode} from '../utils/dom.js';
 import octiconKebabHorizontal from '../../../public/assets/img/svg/octicon-kebab-horizontal.svg';
 
 window.customElements.define('overflow-menu', class extends HTMLElement {
-  updateItems = throttle(100, () => {
+  updateItems = throttle(100, () => { // eslint-disable-line unicorn/consistent-function-scoping
     if (!this.tippyContent) {
       const div = document.createElement('div');
       div.classList.add('tippy-target');
diff --git a/webpack.config.js b/webpack.config.js
index ebbc51a381..4662a30db5 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -178,13 +178,13 @@ export default {
         },
       },
       {
-        test: /\.js$/i,
+        test: /\.(js|ts)$/i,
         exclude: /node_modules/,
         use: [
           {
             loader: 'esbuild-loader',
             options: {
-              loader: 'js',
+              loader: 'ts',
               target: 'es2020',
             },
           },

From 031451e740020d9d994b67d6e5a6a35043fbfd70 Mon Sep 17 00:00:00 2001
From: Codeberg Translate 
Date: Wed, 30 Oct 2024 15:09:27 +0000
Subject: [PATCH 244/443] i18n: update of translations from Codeberg Translate
 (#5681)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: artnay 
Co-authored-by: emansije 
Co-authored-by: Gusted 
Co-authored-by: Outbreak2096 
Co-authored-by: Benedikt Straub 
Co-authored-by: Fjuro 
Co-authored-by: Juno Takano 
Co-authored-by: Bálint Gonda 
Co-authored-by: Wuzzy 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5681
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Codeberg Translate 
Co-committed-by: Codeberg Translate 
---
 options/locale/locale_cs-CZ.ini |  11 +-
 options/locale/locale_de-DE.ini |  11 +-
 options/locale/locale_fi-FI.ini | 704 ++++++++++++++++++++++++++++----
 options/locale/locale_fr-FR.ini |   2 +-
 options/locale/locale_hu-HU.ini |   3 +-
 options/locale/locale_nds.ini   |  15 +-
 options/locale/locale_nl-NL.ini |   2 +-
 options/locale/locale_pt-BR.ini |   7 +-
 options/locale/locale_pt-PT.ini |  61 +--
 options/locale/locale_ru-RU.ini |  13 +-
 options/locale/locale_zh-CN.ini |   8 +-
 11 files changed, 710 insertions(+), 127 deletions(-)

diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
index 49733e6ee1..829df0124f 100644
--- a/options/locale/locale_cs-CZ.ini
+++ b/options/locale/locale_cs-CZ.ini
@@ -479,6 +479,7 @@ sign_up_button = Zaregistrujte se nyní.
 back_to_sign_in = Zpět na přihlášení
 sign_in_openid = Pokračovat s OpenID
 unauthorized_credentials = Údaje jsou nesprávné nebo vypršely. Opakujte svůj příkaz nebo se podívejte na %s pro více informací
+use_onetime_code = Použít jednorázový kód
 
 [mail]
 view_it_on=Zobrazit na %s
@@ -1778,8 +1779,8 @@ issues.review.left_comment=zanechal komentář
 issues.review.content.empty=Je potřeba zanechat poznámku s uvedením požadované změny (požadovaných změn).
 issues.review.reject=požádal/a o změny %s
 issues.review.wait=byl/a požádán/a o posouzení %s
-issues.review.add_review_request=požádal/a o posouzení od %s %s
-issues.review.remove_review_request=odstranil/a žádost o posouzení na %s %s
+issues.review.add_review_request=požádal/a o kontrolu od %[1]s %[2]s
+issues.review.remove_review_request=odstranil/a žádost o kontrolu u %[1]s %[2]s
 issues.review.remove_review_request_self=odmítl/a posoudit %s
 issues.review.pending=Čekající
 issues.review.pending.tooltip=Tento komentář není momentálně viditelný pro ostatní uživatele. Chcete-li odeslat Vaše čekající komentáře, vyberte „%s“ → „%s/%s/%s“ v horní části stránky.
@@ -2846,6 +2847,12 @@ mirror_use_ssh.not_available = Ověřování SSH není dostupné.
 issues.new.assign_to_me = Přiřadit mně
 issues.all_title = Vše
 settings.discord_icon_url.exceeds_max_length = Adresa URL ikony musí mít méně než 2048 znaků
+issues.review.add_review_requests = požádal/a o kontroly od %[1]s %[2]s
+issues.review.remove_review_requests = odstranil/a žádosti o kontrolu u %[1]s %[2]s
+issues.review.add_remove_review_requests = požádal/a o kontroly od %[1]s a odstranil/a žádosti u %[2]s %[3]s
+pulls.delete_after_merge.head_branch.is_default = Větev hlavy, kterou chcete odstranit, je výchozí větví a nelze ji odstranit.
+pulls.delete_after_merge.head_branch.is_protected = Větev hlavy, kterou chcete odstranit, je chráněnou větví a nelze ji odstranit.
+pulls.delete_after_merge.head_branch.insufficient_branch = Nemáte oprávnění k odstranění větve hlavy.
 
 [graphs]
 component_loading_info = Tohle může chvíli trvat…
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
index 77a90e0fe4..997dd8c2a0 100644
--- a/options/locale/locale_de-DE.ini
+++ b/options/locale/locale_de-DE.ini
@@ -477,6 +477,7 @@ sign_in_openid = Mit OpenID fortfahren
 hint_login = Hast du bereits ein Konto? Jetzt anmelden!
 hint_register = Brauchst du ein Konto? Jetzt registrieren.
 unauthorized_credentials = Die Zugangsdaten sind inkorrekt oder abgelaufen. Versuchen es erneut oder siehe %s für mehr Informationen
+use_onetime_code = Einen One-Time-Code benutzen
 
 [mail]
 view_it_on=Auf %s ansehen
@@ -1772,8 +1773,8 @@ issues.review.left_comment=hat einen Kommentar hinterlassen
 issues.review.content.empty=Du musst einen Kommentar hinterlassen, der die gewünschte(n) Änderung(en) beschreibt.
 issues.review.reject=hat %s Änderungen angefragt
 issues.review.wait=wurde für ein Review %s angefragt
-issues.review.add_review_request=hat ein Review von %s %s angefragt
-issues.review.remove_review_request=hat die Aufforderung zum Review an %s %s entfernt
+issues.review.add_review_request=hat ein Review von %[1]s %[2]s angefragt
+issues.review.remove_review_request=hat die Aufforderung zum Review an %[1]s %[2]s entfernt
 issues.review.remove_review_request_self=hat das Review verweigert %s
 issues.review.pending=Ausstehend
 issues.review.pending.tooltip=Dieser Kommentar ist derzeit nicht für andere Benutzer sichtbar. Um deine ausstehenden Kommentare einzureichen, wähle „%s“ -> „%s/%s/%s“ oben auf der Seite.
@@ -2831,6 +2832,12 @@ mirror_use_ssh.not_available = SSH-Authentifizierung ist nicht verfügbar.
 issues.new.assign_to_me = Mir selbst zuweisen
 issues.all_title = Alle
 settings.discord_icon_url.exceeds_max_length = Die Icon-URL darf eine Länge von 2048 Zeichen nicht überschreiten
+issues.review.add_review_requests = hat Reviews von %[1]s %[2]s angefragt
+issues.review.remove_review_requests = hat Aufforderungen zum Review an %[1]s %[2]s entfernt
+issues.review.add_remove_review_requests = hat Reviews von %[1]s angefragt und hat die Aufforderungen zum Review an %[2]s %[3]s entfernt
+pulls.delete_after_merge.head_branch.is_default = Der Head-Branch, den Sie löschen wollen, ist der Standardbranch und kann nicht gelöscht werden.
+pulls.delete_after_merge.head_branch.is_protected = Der Head-Branch, den Sie löschen wollen, ist ein geschützter Branch und kann nicht gelöscht werden.
+pulls.delete_after_merge.head_branch.insufficient_branch = Sie haben keine Erlaubnis, den Head-Branch zu löschen.
 
 [graphs]
 
diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini
index 40a3f64880..2ccbbf0978 100644
--- a/options/locale/locale_fi-FI.ini
+++ b/options/locale/locale_fi-FI.ini
@@ -26,7 +26,7 @@ return_to_forgejo=Palaa Forgejohon
 username=Käyttäjätunnus
 email=Sähköpostiosoite
 password=Salasana
-access_token=Pääsymerkki
+access_token=Pääsypoletti
 re_type=Vahvista salasana
 captcha=CAPTCHA
 twofa=Kaksivaiheinen todennus
@@ -71,7 +71,7 @@ collaborative=Yhteistyössä
 forks=Haarat
 
 activities=Toimet
-pull_requests=Pull requestit
+pull_requests=Vetopyynnöt
 issues=Ongelmat
 milestones=Merkkipaalut
 
@@ -151,10 +151,10 @@ new_repo.title = Uusi repositorio
 new_org.title = Uusi organisaatio
 new_org.link = Uusi organisaatio
 new_repo.link = Uusi repositorio
-new_migrate.link = Uusi siirto
+new_migrate.link = Uusi migraatio
 rerun_all = Uudelleensuorita kaikki työt
 artifacts = Artifaktit
-confirm_delete_artifact = Oletko varma, että haluat poistaa artifaktin "%s" ?
+confirm_delete_artifact = Haluatko varmasti poistaa artifaktin "%s"?
 new_migrate.title = Uusi migraatio
 test = Testi
 concept_system_global = Globaali
@@ -170,6 +170,7 @@ filter.not_mirror = Ei peilattu
 footer.links = Linkit
 navbar = Navigaatiopalkki
 footer.software = Tietoja tästä ohjelmistosta
+footer = Alatunniste
 
 [heatmap]
 less = Vähemmän
@@ -178,6 +179,7 @@ number_of_contributions_in_the_last_12_months = %s kontribuutiota viimeisimmän
 contributions_zero = Ei kontribuutioita
 contributions_one = kontribuutio
 contributions_few = kontribuutiota
+contributions_format = {contributions} {day}. {month} {year}
 
 [editor]
 buttons.code.tooltip = Lisää koodia
@@ -193,6 +195,8 @@ buttons.list.ordered.tooltip = Lisää numeroitu lista
 buttons.switch_to_legacy.tooltip = Käytä vanhentunutta tekstieditoria
 buttons.indent.tooltip = Sisennä yhden tason verran
 buttons.quote.tooltip = Lainaa tekstiä
+buttons.enable_monospace_font = Käytä tasalevyistä fonttia
+buttons.ref.tooltip = Viittaa ongelmaa tai vetopyyntöä
 
 [filter]
 string.asc = A - Ö
@@ -205,24 +209,26 @@ invalid_csrf=Virheellinen pyyntö: Virheellinen CSRF-tunniste
 not_found=Kohdetta ei löytynyt.
 network_error=Verkkovirhe
 server_internal = Palvelinvirhe
+report_message = Jos uskot tämän olevan Forgejon virhe, etsi ongelmia Codebergissä tai avaa tarvittaessa uusi ongelma.
 
 [startpage]
 app_desc=Kivuton, itsehostattu Git-palvelu
 install=Helppo asentaa
 platform=Alustariippumaton
-platform_desc=Forgejo käy missä tahansa alustassa, johon Go kykenee kääntämään. Windows, macOS, Linux, ARM, jne. Valitse omasi!
+platform_desc=Forgejo on mahdollista suorittaa vapaissa käyttöjärjestelmissä kuten Linux ja FreeBSD, ja se toimii eri suoritinarkkitehtuureilla. Valitse omasi!
 lightweight=Kevyt
 lightweight_desc=Forgejolla on vähäiset vähimmäisvaatimukset, joten se toimii jopa halvassa Raspberry Pi:ssä. Säästä koneesi energiaa!
 license=Avoin lähdekoodi
 license_desc=Mene osoitteeseen Forgejo! Liity mukaan tekemään projektista entistäkin parempi. Älä ujostele avustamista!
+install_desc = Suorita alustallesi suunnattu binääritiedosto, jaa se kontitettuna tai hanki se pakattuna.
 
 [install]
 install=Asennus
 title=Alkuperäiset asetukset
 docker_helper=Jos ajat Forgejoa Dockerin sisällä, lue ohjeet ennen minkään asetuksen muuttamista.
-require_db_desc=Forgejo tarvitsee toimiakseen MySQL, PostgreSQL, SQLite3 tai TiDB (MySQL protokolla) tietokannan.
-db_title=Tietokanta-asetukset
-db_type=Tietokantatyyppi
+require_db_desc=Forgejo tarvitsee toimiakseen MySQL-, PostgreSQL-, SQLite3- tai TiDB- (MySQL-protokolla) tietokannan.
+db_title=Tietokannan asetukset
+db_type=Tietokannan tyyppi
 host=Isäntä
 user=Käyttäjätunnus
 password=Salasana
@@ -244,8 +250,8 @@ err_admin_name_is_reserved=Ylläpitäjän käyttäjätunnus on virheellinen: kä
 err_admin_name_is_invalid=Ylläpitäjän käyttäjätunnus on virheellinen
 
 general_title=Yleiset asetukset
-app_name=Sivuston otsikko
-app_name_helper=Voit syöttää yrityksesi nimen tähän.
+app_name=Instanssin otsikko
+app_name_helper=Syötä instanssin nimi tähän. Se näytetään kaikilla sivuilla.
 repo_path=Repositorion juuren polku
 repo_path_helper=Muualla olevat git-repositoriot tullaan tallentamaan tähän kansioon.
 lfs_path=Git LFS -juuripolku
@@ -255,7 +261,7 @@ domain=Palvelimen verkkotunnus
 ssh_port=SSH-palvelimen portti
 ssh_port_helper=Porttinumero, jossa SSH-palvelimesi kuuntelee. Jätä tyhjäksi kytkeäksesi SSH-palvelimen pois päältä.
 http_port=HTTP-kuunteluportti
-http_port_helper=Portti, jossa Forgejon web-palvelin kuuntelee.
+http_port_helper=Portti, jota Forgejon web-palvelin käyttää.
 app_url=Juuriosoite
 app_url_helper=Juuriosoite HTTP(S)-klooniosoitteille ja sähköpostimuistutuksille.
 log_root_path=Lokitiedostojen polku
@@ -263,7 +269,7 @@ log_root_path_helper=Lokitiedostot kirjoitetaan tähän kansioon.
 
 optional_title=Valinnaiset asetukset
 email_title=Sähköpostiasetukset
-smtp_addr=SMTP isäntä
+smtp_addr=SMTP-isäntä
 smtp_port=SMTP-portti
 smtp_from=Lähetä sähköpostit osoitteella
 smtp_from_helper=Sähköpostiosoite, jota Forgejo käyttää. Kirjoita osoite ”nimi”  -muodossa.
@@ -328,6 +334,8 @@ allow_only_external_registration = Salli rekisteröinti vain ulkoisia palveluja
 default_allow_create_organization = Salli organisaatioiden luonti oletuksena
 allow_dots_in_usernames = Salli pisteiden käyttö käyttäjänimissä. Ei vaikuta olemassaoleviin käyttäjiin.
 enable_update_checker = Ota päivitystentarkistus käyttöön
+app_slogan = Instanssin tunnuslause
+app_slogan_helper = Syötä instanssin tunnuslause tähän. Jätä tyhjäksi poistaaksesi käytöstä.
 
 [home]
 uname_holder=Käyttäjätunnus tai sähköpostiosoite
@@ -465,6 +473,11 @@ release.download.zip=Lähdekoodi (ZIP)
 release.download.targz=Lähdekoodi (TAR.GZ)
 
 repo.transfer.to_you=sinä
+password_change.subject = Salasanasi on vaihdettu
+password_change.text_1 = Tilisi salasana vaihdettiin juuri hetki sitten.
+removed_security_key.subject = Turva-avain on poistettu
+removed_security_key.text_1 = Turva-avain "%[1]s" on poistettu tililtäsi.
+team_invite.text_2 = Napsauta seuraavaa linkkiä liittyäksesi tiimiin:
 
 
 
@@ -530,13 +543,14 @@ auth_failed=Todennus epäonnistui: %v
 
 
 target_branch_not_exist=Kohde branchia ei ole olemassa.
+Pronouns = Pronomini
 
 
 [user]
 change_avatar=Vaihda profiilikuvasi…
 repositories=Repot
 activity=Julkinen toiminta
-followers_few=%d seuraajat
+followers_few=%d seuraajaa
 starred=Tähdelliset repot
 projects=Projektit
 overview=Yleiskatsaus
@@ -544,6 +558,15 @@ following_few=%d seurataan
 follow=Seuraa
 unfollow=Lopeta seuraaminen
 user_bio=Elämäkerta
+settings = Käyttäjäasetukset
+email_visibility.limited = Sähköpostiosoitteesi näkyy kaikille tunnistautuneille käyttäjille
+followers_one = %d seuraaja
+public_activity.visibility_hint.self_public = Toimintasi on näkyvissä kaikille, lukuun ottamatta vuorovaikutusta yksityisissä tiloissa. Määritä asetukset.
+followers.title.one = seuraaja
+followers.title.few = seuraajaa
+following.title.one = Seurataan
+following.title.few = Seurataan
+joined_on = Liittynyt %s
 
 
 [settings]
@@ -553,7 +576,7 @@ appearance=Ulkoasu
 password=Salasana
 security=Turvallisuus
 avatar=Profiilikuva
-ssh_gpg_keys=SSH / GPG-avaimet
+ssh_gpg_keys=SSH-/GPG-avaimet
 social=Sosiaaliset tilit
 applications=Sovellukset
 orgs=Hallitse organisaatioita
@@ -566,7 +589,7 @@ webauthn=Turva-avaimet
 
 public_profile=Julkinen profiili
 password_username_disabled=Ei-paikalliset käyttäjät eivät voi muuttaa käyttäjätunnustaan. Ole hyvä ja ota yhteyttä sivuston ylläpitäjään saadaksesi lisätietoa.
-full_name=Kokonimi
+full_name=Koko nimi
 website=Nettisivut
 location=Sijainti
 update_theme=Päivitä teema
@@ -641,8 +664,8 @@ add_openid_success=Uusi OpenID-osoite on lisätty.
 keep_email_private=Piilota sähköpostiosoite
 openid_desc=OpenID mahdollistaa todentamisen delegoinnin ulkopuoliselle palvelun tarjoajalle.
 
-manage_ssh_keys=Hallitse SSH avaimia
-manage_gpg_keys=Hallitse GPG avaimia
+manage_ssh_keys=Hallitse SSH-avaimia
+manage_gpg_keys=Hallitse GPG-avaimia
 add_key=Lisää avain
 ssh_desc=Nämä julkiset SSH-avaimet on liitetty tiliisi. Vastaavat yksityiset avaimet antavat täyden pääsyn repoihisi.
 gpg_desc=Nämä julkiset GPG-avaimet on liitetty tiliisi. Pidä yksityiset avaimet turvassa, koska ne mahdollistavat committien todentamisen.
@@ -704,9 +727,9 @@ access_token_deletion_confirm_action=Poista
 permission_read=Luettu
 
 edit_oauth2_application=Muokkaa OAuth2 sovellusta
-remove_oauth2_application=Poista OAuth2 sovellus
+remove_oauth2_application=Poista OAuth2-sovellus
 remove_oauth2_application_success=Sovellus on poistettu.
-create_oauth2_application=Luo uusi OAuth2 sovellus
+create_oauth2_application=Luo uusi OAuth2-sovellus
 create_oauth2_application_button=Luo sovellus
 oauth2_application_name=Sovelluksen nimi
 save_application=Tallenna
@@ -747,6 +770,37 @@ visibility=Käyttäjän näkyvyys
 visibility.public=Julkinen
 visibility.limited=Rajattu
 visibility.private=Yksityinen
+hints = Vihjeet
+user_block_success = Käyttäjä on estetty.
+biography_placeholder = Kerro jotain itsestäsi! (Voit käyttää Markdownia)
+keep_activity_private = Piilota toiminta profiilisivulla
+update_oauth2_application_success = Päivitit OAuth2-sovelluksen.
+webauthn_delete_key = Poista turva-avain
+delete_account_desc = Haluatko varmasti poistaa tämän käyttäjätilin pysyvästi?
+visibility.public_tooltip = Näkyvissä kaikille
+pronouns = Pronomini
+pronouns_custom = Mukautettu
+language.title = Oletuskieli
+webauthn_delete_key_desc = Jos poistat turva-avaimen, et voi enää kirjautua sillä. Jatketaanko?
+authorized_oauth2_applications = Valtuutetut OAuth2-sovellukset
+pronouns_unspecified = Määrittämätön
+update_hints = Päivitä vihjeet
+language.description = Tämä kieli tallennetaan tilillesi ja sitä käytetään oletuksena sisäänkirjautumisen jälkeen.
+language.localization_project = Auta suomentamaan Forgejo! Lue lisää.
+blocked_users_none = Käyttäjiä ei ole estetty.
+location_placeholder = Jaa likimääräinen sijaintisi muiden kanssa
+retype_new_password = Vahvista uusi salasana
+create_oauth2_application_success = Loit uuden OAuth2-sovelluksen.
+repos_none = Et omista yhtäkään repositoriota.
+visibility.limited_tooltip = Näkyvissä vain tunnistautuneille käyttäjille
+email_notifications.disable = Poista sähköposti-ilmoitukset käytöstä
+webauthn_register_key = Lisää turva-avain
+blocked_users = Estetyt käyttäjät
+profile_desc = Määritä, miten muut näkevät profiilisi. Ensisijaista sähköpostiosoitettasi käytetään ilmoitusten ja salasanan palautuspyyntöjen lähettämiseen sekä verkkosivupohjaisiin Git-operaatioihin.
+change_password_success = Salasanasi on päivitetty. Kirjaudu jatkossa käyttäen uutta salasanaa.
+manage_oauth2_applications = Hallitse OAuth2-sovelluksia
+change_password = Vaihda salasana
+webauthn_key_loss_warning = Jos kadotat turva-avaimesi, menetät pääsyn tilillesi.
 
 [repo]
 owner=Omistaja
@@ -776,7 +830,7 @@ license_helper=Valitse lisenssitiedosto.
 readme=README
 auto_init=Alusta repo (Luo .gitignore, License ja README)
 create_repo=Luo repo
-default_branch=Oletus branch
+default_branch=Oletushaara
 mirror_prune=Karsi
 watchers=Tarkkailijat
 stargazers=Tähtiharrastajat
@@ -806,7 +860,7 @@ migrate_items_labels=Tunnisteet
 migrate_items_issues=Ongelmat
 migrate_items_pullrequests=Vetopyynnöt
 migrate_items_releases=Julkaisut
-migrate_repo=Siirrä repo
+migrate_repo=Tee repomigraatio
 migrate.clone_address=Migraation / Kloonaa URL osoitteesta
 migrate.github_token_desc=Voit laittaa yhden tai useamman pääsymerkin pilkulla erotellen tähän nopeuttaaksesi migraatiota GitHub APIn vauhtirajojen takia. VAROITUS: Tämän ominaisuuden väärinkäyttö voi rikkoa palveluntarjoajan ehtoja ja johtaa tilin estämiseen.
 migrate.permission_denied=Sinun ei sallita tuovan paikallisia repoja.
@@ -852,8 +906,8 @@ file_history=Historia
 file_view_raw=Näytä raaka
 file_permalink=Pysyvä linkki
 
-video_not_supported_in_browser=Selaimesi ei tue HTML5 video-tagia.
-audio_not_supported_in_browser=Selaimesi ei tue HTML5 audio-tagia.
+video_not_supported_in_browser=Selaimesi ei tue HTML5:n video-tagia.
+audio_not_supported_in_browser=Selaimesi ei tue HTML5:n audio-tagia.
 blame=Selitys
 download_file=Lataa tiedosto
 normal_view=Normaali näkymä
@@ -872,8 +926,8 @@ editor.filename_help=Lisää hakemisto kirjoittamalla sen nimi ja sen jälkeen k
 editor.or=tai
 editor.cancel_lower=Peru
 editor.commit_signed_changes=Commitoi vahvistetut muutokset
-editor.commit_changes=Commitoi muutokset
-editor.add_tmpl=Lisää ''
+editor.commit_changes=Kommitoi muutokset
+editor.add_tmpl=Lisää ""
 editor.commit_directly_to_this_branch=Commitoi suoraan %s haaraan.
 editor.create_new_branch=Luo uusi haara tälle commitille ja aloita vetopyyntö.
 editor.create_new_branch_np=Luo uusi haara tälle commitille.
@@ -909,9 +963,9 @@ projects.new=Uusi projekti
 projects.deletion=Poista projekti
 projects.deletion_success=Projekti on poistettu.
 projects.edit=Muokkaa projektia
-projects.modify=Päivitä projekti
-projects.type.basic_kanban=Yksinkertainen Kanban
-projects.template.desc=Malli
+projects.modify=Muokkaa projektia
+projects.type.basic_kanban=Yksinkertainen kanban
+projects.template.desc=Mallipohja
 projects.type.uncategorized=Luokittelematon
 projects.column.edit_title=Nimi
 projects.column.new_title=Nimi
@@ -923,7 +977,7 @@ issues.filter_assignees=Suodata käyttäjiä
 issues.filter_milestones=Suodata merkkipaalu
 issues.new=Uusi ongelma
 issues.new.labels=Tunnisteet
-issues.new.no_label=Ei tunnistetta
+issues.new.no_label=Ei tunnisteita
 issues.new.clear_labels=Tyhjennä tunnisteet
 issues.new.projects=Projektit
 issues.new.no_items=Ei kohteita
@@ -938,7 +992,7 @@ issues.new.no_assignees=Ei käsittelijää
 issues.choose.open_external_link=Avaa
 issues.choose.blank=Oletus
 issues.no_ref=Haaraa/tagia ei määritelty
-issues.create=Ilmoita ongelma
+issues.create=Luo ongelma
 issues.new_label=Uusi tunniste
 issues.new_label_placeholder=Tunnisteen nimi
 issues.new_label_desc_placeholder=Kuvaus
@@ -996,7 +1050,7 @@ issues.commented_at=`kommentoi %s`
 issues.delete_comment_confirm=Haluatko varmasti poistaa tämän kommentin?
 issues.context.copy_link=Kopioi linkki
 issues.context.quote_reply=Vastaa lainaamalla
-issues.context.reference_issue=Viittaa uudesa ongelmassa
+issues.context.reference_issue=Viittaa uudessa ongelmassa
 issues.context.edit=Muokkaa
 issues.context.delete=Poista
 issues.close_comment_issue=Kommentoi ja sulje
@@ -1093,7 +1147,7 @@ pulls.no_results=Tuloksia ei löytynyt.
 pulls.nothing_to_compare=Nämä haarat vastaavat toisiaan. Ei ole tarvetta luoda vetopyyntöä.
 pulls.nothing_to_compare_and_allow_empty_pr=Nämä haarat vastaavat toisiaan. Vetopyyntö tulee olemaan tyhjä.
 pulls.has_pull_request=`Vetopyyntö haarojen välillä on jo olemassa: %[2]s#%[3]d`
-pulls.create=Luo Pull-pyyntö
+pulls.create=Luo vetopyyntö
 pulls.title_desc_few=haluaa yhdistää %[1]d committia lähteestä %[2]s kohteeseen %[3]s
 pulls.merged_title_desc_few=yhdistetty %[1]d committia lähteestä %[2]s kohteeseen %[3]s %[4]s
 pulls.tab_conversation=Keskustelu
@@ -1158,17 +1212,17 @@ activity.period.quarterly=3 kuukautta
 activity.period.semiyearly=6 kuukautta
 activity.period.yearly=1 vuosi
 activity.overview=Yleiskatsaus
-activity.active_prs_count_1=%d Aktiivinen vetopyyntö
-activity.active_prs_count_n=%d Aktiivista vetopyyntöä
+activity.active_prs_count_1=%d aktiivinen vetopyyntö
+activity.active_prs_count_n=%d aktiivista vetopyyntöä
 activity.merged_prs_label=Yhdistetty
-activity.active_issues_count_1=%d Aktiivinen ongelma
-activity.active_issues_count_n=%d Aktiivista ongelmaa
-activity.closed_issues_count_1=Suljettu ongelma
-activity.closed_issues_count_n=Suljettua ongelmaa
+activity.active_issues_count_1=%d aktiivinen ongelma
+activity.active_issues_count_n=%d aktiivista ongelmaa
+activity.closed_issues_count_1=suljettu ongelma
+activity.closed_issues_count_n=suljettua ongelmaa
 activity.title.issues_created_by=%s luonnut %s
 activity.closed_issue_label=Suljettu
 activity.new_issues_count_1=Uusi ongelma
-activity.new_issues_count_n=Uutta ongelmaa
+activity.new_issues_count_n=uutta ongelmaa
 activity.new_issue_label=Avoinna
 activity.unresolved_conv_label=Auki
 activity.published_release_label=Julkaistu
@@ -1181,7 +1235,7 @@ activity.git_stats_and_deletions=ja
 activity.git_stats_deletion_1=%d poisto
 activity.git_stats_deletion_n=%d poistoa
 
-contributors.contribution_type.commits=Commitit
+contributors.contribution_type.commits=Kommitit
 
 search=Haku
 search.match=Osuma
@@ -1195,16 +1249,16 @@ settings.collaboration.read=Lue
 settings.collaboration.owner=Omistaja
 settings.collaboration.undefined=Määrittelemätön
 settings.hooks=Webkoukut
-settings.githooks=Git koukut
+settings.githooks=Git-koukut
 settings.basic_settings=Perusasetukset
 settings.mirror_settings=Peilauksen asetukset
 
 settings.site=Nettisivu
-settings.update_settings=Päivitä asetukset
+settings.update_settings=Tallenna asetukset
 settings.advanced_settings=Lisäasetukset
 settings.use_internal_wiki=Käytä sisäänrakennettua wikiä
 settings.use_external_wiki=Käytä ulkoista wikiä
-settings.external_wiki_url=Ulkoinen Wiki URL
+settings.external_wiki_url=Ulkoisen wikin URL-osoite
 settings.external_wiki_url_desc=Wiki-välilehden klikkaus ohjaa vierailijat ulkoisen wiki-URL-osoitteeseen.
 settings.tracker_url_format=Ulkoisen vikaseurannan URL muoto
 settings.tracker_issue_style.numeric=Numeerinen
@@ -1266,7 +1320,7 @@ settings.event_issues_desc=Ongelma avattu, suljettu, avattu uudelleen tai muokat
 settings.event_issue_assign=Ongelma määritetty
 settings.event_issue_assign_desc=Ongelma osoitettu tai osoitus poistettu.
 settings.event_issue_label_desc=Ongelman tunnisteet päivitetty tai tyhjennetty.
-settings.event_issue_milestone_desc=Ongelma merkkipaaluteettu tai merkkipaalu-osoitus poistettu.
+settings.event_issue_milestone_desc=Merkkipaalu lisätty, poistettu tai muokattu.
 settings.event_issue_comment_desc=Ongelman kommentti luotu, muokattu tai poistettu.
 settings.event_header_pull_request=Vetopyyntöjen tapahtumat
 settings.event_pull_request=Vetopyyntö
@@ -1276,7 +1330,7 @@ settings.add_hook_success=Uusi webkoukku on lisätty.
 settings.update_webhook=Päivitä webkoukku
 settings.delete_webhook=Poista webkoukku
 settings.recent_deliveries=Viimeisimmät toimitukset
-settings.hook_type=Koukkutyyppi
+settings.hook_type=Koukun tyyppi
 settings.slack_token=Pääsymerkki
 settings.slack_domain=Verkkotunnus
 settings.slack_channel=Kanava
@@ -1306,14 +1360,14 @@ settings.deploy_key_deletion_desc=Julkaisuavaimen poistaminen kumoaa sen pääsy
 settings.deploy_key_deletion_success=Julkaisuavain on poistettu.
 settings.branches=Haarat
 settings.protected_branch=Haaran suojaus
-settings.branch_protection=Haaran '%s' suojaus
+settings.branch_protection=Haaran "%s" suojaussäännöt
 settings.protect_this_branch=Ota haaran suojaus käyttöön
 settings.protect_whitelist_deploy_keys=Lisää julkaisuavaimet sallittujen listalle mahdollistaaksesi repohin kirjoituksen.
 settings.protect_whitelist_users=Lista käyttäjistä joilla työntö oikeus:
 settings.protect_whitelist_search_users=Etsi käyttäjiä…
 settings.protect_merge_whitelist_committers_desc=Salli vain listaan merkittyjen käyttäjien ja tiimien yhdistää vetopyynnöt tähän haaraan.
 settings.protect_merge_whitelist_users=Lista käyttäjistä joilla yhdistämis-oikeus:
-settings.protect_required_approvals=Vaadittavat hyväksynnät:
+settings.protect_required_approvals=Vaadittavat hyväksynnät
 settings.protect_approvals_whitelist_users=Sallittujen tarkastajien lista:
 settings.choose_branch=Valitse haara…
 settings.no_protected_branch=Suojattuja haaroja ei ole.
@@ -1390,16 +1444,16 @@ release.releases=Julkaisut
 release.tags=Tagit
 release.new_release=Uusi julkaisu
 release.draft=Työversio
-release.prerelease=Esiversio
+release.prerelease=Esijulkaisu
 release.stable=Vakaa
-release.edit=muokkaa
+release.edit=Muokkaa
 release.source_code=Lähdekoodi
 release.new_subheader=Julkaisut organisoivat projektien versioita.
 release.edit_subheader=Julkaisut organisoivat projektien versioita.
 release.tag_name=Taginimi
 release.target=Kohde
 release.tag_helper=Valitse olemassa oleva tagi tai luo uusi tagi.
-release.prerelease_desc=Merkitse ensijulkaisuksi
+release.prerelease_desc=Merkitse esijulkaisuksi
 release.prerelease_helper=Merkitse tämä julkaisu epäsopivaksi tuotantokäyttöön.
 release.cancel=Peruuta
 release.publish=Julkaise versio
@@ -1443,14 +1497,301 @@ settings.branches.add_new_rule = Lisää uusi sääntö
 n_commit_few = %s kommittia
 issues.force_push_compare = Vertaa
 commits.desc = Selaa lähdekoodin muutoshistoriaa.
+clone_helper = Tarvitseko apua kloonauksen kanssa? Siirry tukisivulle.
+settings.mirror_settings.push_mirror.copy_public_key = Kopioi julkinen avain
+object_format = Objektimuoto
+editor.fail_to_update_file_summary = Virheviesti:
+n_branch_one = %s haara
+issues.content_history.delete_from_history_confirm = Poistetaanko historiasta?
+editor.new_patch = Uusi paikkaus
+pulls.merged_success = Vetopyyntö yhdistetty onnistuneesti ja suljettu
+pulls.manually_merged = Manuaalisesti yhdistetty
+pulls.merged_info_text = Haaran %s voi nyt poistaa.
+pulls.status_checks_requested = Vaadittu
+signing.wont_sign.not_signed_in = Et ole kirjautunut sisään.
+tag.create_tag = Luo tagi %s
+release.tag_already_exist = Tämä tagin nimi on jo olemassa.
+activity.git_stats_additions = ja
+release = Julkaisu
+issues.num_comments_1 = %d kommentti
+activity.title.issues_n = %d ongelmaa
+release.detail = Julkaisun tiedot
+diff.hide_file_tree = Piilota tiedostopuu
+issues.role.owner_helper = Tämä käyttäjä on tämän repositorion omistaja.
+issues.all_title = Kaikki
+issues.label_archived_filter = Näytä arkistoidut tunnisteet
+pulls.close = Sulje vetopyyntö
+branch.already_exists = Haara nimellä "%s" on jo olemassa.
+diff.show_file_tree = Näytä tiedostopuu
+branch.deletion_failed = Haaran "%s" poistaminen epäonnistui.
+branch.deletion_success = Haara "%s" on poistettu.
+branch.delete_html = Poista haara
+branch.restore_success = Haara "%s" on palautettu.
+branch.restore_failed = Haaran "%s" palauttaminen epäonnistui.
+mirror_public_key = Julkinen SSH-avain
+mirror_use_ssh.text = Käytä SSH-todennusta
+diff.show_more = Näytä enemmän
+release.deletion_success = Tämä julkaisu on poistettu.
+issues.filter_milestone_closed = Suljetut merkkipaalut
+file_copy_permalink = Kopioi pysyväislinkki
+empty_message = Tässä repossa ei ole sisältöä.
+activity.git_stats_files_changed_n = on muutettu
+settings.event_pull_request_milestone_desc = Merkkipaalu lisätty, poistettu tai muokattu.
+settings.event_pull_request_comment = Kommentit
+settings.event_issue_comment = Kommentit
+diff.download_patch = Lataa patch-tiedosto
+issues.filter_milestone_none = Ei merkkipaaluja
+issues.filter_milestone_open = Avoimet merkkipaalut
+new_repo_helper = Repositorio eli tietovarasto sisältää kaikki projektin tiedostot, mukaan lukien versiohistorian. Onko sinulla repo jo jossain muualla? Tee repomigraatio.
+use_template = Käytä tätä mallipohjaa
+star_guest_user = Kirjaudu sisään lisätäksesi tähden tähän repoon.
+watch_guest_user = Kirjaudu sisään tarkkaillaksesi tätä repoa.
+activity.git_stats_author_n = %d tekijää
+issues.dependency.add_error_dep_exists = Riippuvuus on jo olemassa.
+wiki.page_content = Sivun sisältö
+wiki.page_title = Sivun otsikko
+activity.navbar.contributors = Kontribuuttorit
+n_release_few = %s julkaisua
+n_release_one = %s julkaisu
+symbolic_link = Symbolinen linkki
+mirror_last_synced = Viimeksi synkronoitu
+find_file.go_to_file = Löydä tiedosto
+find_tag = Etsi tagi
+settings.protected_branch.save_rule = Tallenna sääntö
+pulls.merge_manually = Manuaalisesti yhdistetty
+diff.stats_desc_file = %d muutosta: %d lisäystä ja %d poistoa
+branch.included_desc = Tämä haara on osa oletushaaraa
+branch.confirm_create_branch = Luo haara
+projects.column.edit = Muokkaa saraketta
+editor.add_file = Lisää tiedosto
+milestones.deletion_success = Merkkipaalu on poistettu.
+project = Projektit
+pulls.delete.title = Poistetaanko tämä vetopyyntö?
+activity.title.issues_1 = %d ongelma
+contributors.contribution_type.filter_label = Kontribuution tyyppi:
+settings.protected_branch.delete_rule = Poista sääntö
+settings.archive.success = Repo arkistoitiin onnistuneesti.
+diff.comment.placeholder = Jätä kommentti
+release.message = Kuvaile tätä julkaisua
+branch.delete_desc = Haaran poistaminen on pysyvä toimenpide. Vaikka poistettu haara voi jäädä olemaan lyhyeksi ajaksi, ennen kuin todellisesti poistetaan, poistoa EI VOI perua useimmiten. Jatketaanko?
+branch.protected_deletion_failed = Haara "%s" on suojattu. Sitä ei voi poistaa.
+open_with_editor = Avaa sovelluksella %s
+download_bundle = Lataa BUNDLE
+pulls.num_conflicting_files_1 = %d ristiriitainen tiedosto
+editor.update = Päivitä %s
+editor.add = Lisää %s
+activity.published_prerelease_label = Esijulkaisu
+activity.published_tag_label = Tagi
+diff.download_diff = Lataa diff-tiedosto
+settings.event_package = Paketti
+issues.new.closed_projects = Suljetut projektit
+settings.event_issue_milestone = Merkkipaalut
+branch.branch_already_exists = Haara "%s" on jo olemassa repossa.
+projects.card_type.images_and_text = Kuvat ja teksti
+default_branch_helper = Oletusarvoinen haara on oletushaara vetopyynnöille ja koodikommiteille.
+author_search_tooltip = Näyttää enintään 30 käyttäjää
+migrate_options_mirror_helper = Tästä reposta tulee peili
+commit_graph.color = Väri
+commit_graph.hide_pr_refs = Piilota vetopyynnöt
+executable_file = Suoritettava tiedosto
+editor.file_already_exists = Tiedosto nimeltä "%s" on jo olemassa tässä repossa.
+branch.restore = Palauta haara "%s"
+branch.default_deletion_failed = Haara "%s" on oletushaara. Sitä ei voi poistaa.
+branch.new_branch = Luo uusi haara
+tag.create_success = Tagi "%s" luotu.
+issues.sign_in_require_desc = Kirjaudu sisään liittyäksesi keskusteluun.
+wiki.cancel = Peruuta
+issues.dependency.remove_header = Poista riippuvuus
+issues.dependency.issue_remove_text = Riippuvuus poistetaan tästä ongelmasta. Jatketaanko?
+issues.dependency.pr_remove_text = Riippuvuus poistetaan tästä vetopyynnöstä. Jatketaanko?
+release.download_count_few = %s latausta
+diff.data_not_available = Diff-sisältö ei ole saatavilla
+diff.image.side_by_side = Rinnakkain
+release.ahead.target = projektiin %s tämän julkaisun jälkeen
+issues.close = Sulje ongelma
+issues.no_content = Ei kuvausta.
+pulls.reject_count_1 = %d muutospyyntö
+pulls.update_branch_success = Haarapäivitys onnistui
+milestones.completeness = %d%% valmiina
+contributors.contribution_type.additions = Lisäykset
+contributors.contribution_type.deletions = Poistot
+settings.webhook_deletion_success = Webkoukku on poistettu.
+settings.event_pull_request_milestone = Merkkipaalut
+find_file.no_matching = Vastaavaa tiedostoa ei löytynyt
+editor.file_delete_success = Tiedosto "%s" on poistettu.
+settings.transfer.button = Siirrä omistajuus
+settings.slack_color = Väri
+release.tag_name_already_exist = Julkaisu tällä taginimellä on jo olemassa.
+pulls.allow_edits_from_maintainers_err = Päivittäminen epäonnistui
+stars = Tähdet
+editor.branch_already_exists = Haara "%s" on jo olemassa tässä repossa.
+projects.column.delete = Poista sarake
+projects.column.color = Väri
+settings.admin_settings = Ylläpitäjän asetukset
+file_too_large = Tiedosto on liian suuri näytettäväksi.
+readme_helper = Valitse README-tiedoston mallipohja
+settings.default_merge_style_desc = Oletusarvoinen yhdistämistyyli
+wiki.back_to_wiki = Takaisin wikisivulle
+wiki.delete_page_notice_1 = Wikisivun "%s" poistamista ei voi perua. Jatketaanko?
+activity.merged_prs_count_1 = yhdistetty vetopyyntö
+activity.merged_prs_count_n = yhdistettyä vetopyyntöä
+activity.opened_prs_count_1 = ehdotettu vetopyyntö
+activity.opened_prs_count_n = ehdotettua vetopyyntöä
+activity.title.user_1 = %d käyttäjä
+activity.title.prs_n = %d vetopyyntöä
+settings.sourcehut_builds.secrets = Salaisuudet
+commit_graph = Kommittikaavio
+visibility_helper = Tee reposta yksityinen
+pulls.approve_count_1 = %d hyväksyntä
+settings.confirm_delete = Poista repositorio
+milestones.new_subheader = Merkkipaalut auttavat hallinnoimaan ongelmia ja seuraamaan niiden korjausten edistymistä.
+activity.title.user_n = %d käyttäjää
+activity.title.prs_1 = %d vetopyyntö
+activity.navbar.code_frequency = Koodifrekvenssi
+activity.navbar.pulse = Pulssi
+wiki.no_search_results = Ei tuloksia
+settings.federation_settings = Federaation asetukset
+pull.deleted_branch = (poistettu):%s
+settings.transfer.rejected = Repositorion siirto hylättiin.
+settings.transfer.modal.title = Siirrä omistajuus
+settings.event_pull_request_sync = Synkronoitu
+editor.commit_empty_file_text = Tiedosto, jonka olet aikeissa kommitoida, on tyhjä. Jatketaanko?
+diff.load = Lataa diff
+branch.create_branch_operation = Luo haara
+activity.title.releases_n = %d julkaisua
+projects.column.new = Uusi sarake
+projects.column.new_submit = Luo sarake
+issues.new.open_projects = Avoimet projektit
+issues.filter_project_all = Kaikki projektit
+milestones.update_ago = Päivitetty %s
+pulls.update_not_allowed = Sinulla ei ole oikeutta päivittää haaraa
+pulls.is_closed = Vetopyyntö on suljettu.
+pulls.cannot_merge_work_in_progress = Vetopyyntö on merkitty keskeneräiseksi.
+pulls.still_in_progress = Vielä keskeneräinen?
+pulls.expand_files = Laajenna kaikki tiedostot
+issues.content_history.delete_from_history = Poista historiasta
+milestones.filter_sort.name = Nimi
+issues.filter_milestone_all = Kaikki merkkipaalut
+issues.filter_label_select_no_label = Ei tunnistetta
+projects.column.set_default = Aseta oletukseksi
+projects.edit_success = Projekti "%s" on päivitetty.
+desc.sha256 = SHA256
+n_commit_one = %s kommitti
+transfer.accept = Hyväksy siirto
+transfer.reject = Hylkää siirto
+default_branch_label = oletus
+repo_desc_helper = Kirjoita lyhyt kuvaus (valinnainen)
+create_new_repo_command = Uuden repon luominen komentoriviltä
+subscribe.issue.guest.tooltip = Kirjaudu sisään tilataksesi tämän ongelman päivitykset.
+subscribe.pull.guest.tooltip = Kirjaudu sisään tilataksesi tämän vetopyynnön päivitykset.
+migrate.migrating_failed_no_addr = Migraatio epäonnistui.
+need_auth = Valtuutus
+migrate_options = Migraatioasetukset
+projects.create_success = Projekti "%s" on luotu.
+projects.description = Kuvaus (valinnainen)
+editor.commit_empty_file_header = Kommitoi tyhjä tiedosto
+editor.branch_does_not_exist = Haaraa "%s" ei ole olemassa repossa.
+editor.delete = Poista %s
+editor.patching = Paikkaus:
+editor.patch = Toteuta paikkaus
+issues.filter_poster_no_select = Kaikki tekijät
+issues.filter_project_none = Ei projektia
+issues.new.no_projects = Ei projektia
+projects.card_type.text_only = Vain teksti
+issues.comment_on_locked = Et voi kommentoida lukittua ongelmaa.
+pulls.collapse_files = Supista kaikki tiedostot
+pulls.view = Näytä vetopyynnöt
+issues.dependency.add_error_dep_not_exist = Riippuvuutta ei ole olemassa.
+pulls.reject_count_n = %d muutospyyntöä
+pulls.waiting_count_1 = %d odottava katselmointi
+pulls.waiting_count_n = %d odottavaa katselmointia
+pulls.approve_count_n = %d hyväksyntää
+pulls.num_conflicting_files_n = %d ristiriitaista tiedostoa
+pulls.closed = Vetopyyntö suljettu
+milestones.create_success = Merkkipaalu "%s" on luotu.
+milestones.edit_success = Merkkipaalu "%s" on päivitetty.
+milestones.filter_sort.least_complete = Vähiten valmis
+milestones.filter_sort.most_complete = Eniten valmis
+activity.title.releases_1 = %d julkaisu
+settings.branches.update_default_branch = Päivitä oletushaara
+settings.transfer.success = Repositorion siirto onnistui.
+settings.transfer_abort = Peru siirto
+settings.sync_mirror = Synkronoi nyt
+settings.mirror_settings.docs.doc_link_title = Miten peilaan repoja?
+tag.create_tag_operation = Luo tagi
+branch.rename = Nimeä haara "%s" uudelleen
+branch.download = Lataa haara "%s"
+branch.deleted_by = Poistanut %s
+branch.create_success = Haara "%s" on luotu.
+branch.delete = Poista haara "%s"
+release.add_tag = Luo tagi
+diff.show_diff_stats = Näytä tilastot
+settings.rename_branch = Nimeä haara uudelleen
+settings.rename_branch_success = Haaran %s uudeksi nimeksi asetettiin %s.
+settings.rename_branch_failed_not_exist = Haaraa %s ei voi nimetä uudelleen, koska sitä ei ole olemassa.
+readme_helper_desc = Tähän voit kirjoittaa projektisi koko kuvauksen.
+milestones.deletion = Poista merkkipaalu
+more_operations = Lisää toimintoja
+settings.branches.switch_default_branch = Vaihda oletushaara
+tag.confirm_create_tag = Luo tagi
+n_tag_one = %s tagi
+branch.renamed = Haaran %s uudeksi nimeksi asetettiin %s.
+release.tag_name_protected = Tagin nimi on suojattu.
+pulls.merge_conflict_summary = Virheviesti
+issues.delete.title = Poistetaanko tämä ongelma?
+migrate.github.description = Tee datamigraatio github.comista tai GitHub Enterprise -palvelimelta.
+settings.merge_style_desc = Yhdistämistyylit
+settings.protected_branch_deletion = Poista haaran suojaus
+settings.deletion_success = Repositorio on poistettu.
+editor.filename_is_invalid = Tiedoston nimi on virheellinen: "%s".
+push_exist_repo = Olemassa olevan repon työntäminen komentoriviltä
+issues.new.title_empty = Otsikko ei voi olla tyhjä
+settings.transfer_perform = Suorita siirto
+activity.git_stats_pushed_n = on työntänyt
+settings.mirror_settings.last_update = Viimeisin päivitys
+settings.new_owner_blocked_doer = Uusi omistaja on estänyt sinut.
+issues.lock_duplicate = Ongelmaa ei voi lukita kahdesti.
+ext_wiki = Ulkoinen wiki
+wiki.file_revision = Sivun versio
+stored_lfs = Talletettu Git LFS:llä
+activity.git_stats_author_1 = %d tekijä
+issues.choose.blank_about = Luo ongelma oletusarvoisesta mallipohjasta.
+pulls.made_using_agit = AGit
+editor.cannot_edit_lfs_files = LFS-tiedostoja ei voi muokata web-käyttöliittymässä.
+pulls.cmd_instruction_hint = Näytä komentoriviohjeet
+settings.wiki_globally_editable = Salli kenen tahansa muokata wikiä
+pulls.rebase_conflict_summary = Virheviesti
+wiki.search = Etsi wikistä
+activity.commit = Kommittitoiminta
+editor.cannot_edit_non_text_files = Binääritiedostoja ei voi muokata web-käyttöliittymässä.
+projects.template.desc_helper = Valitse projektin mallipohja aloittaaksesi
+commit.contained_in_default_branch = Tämä kommitti on osa oletushaaraa
+activity.git_stats_exclude_merges = Poissulkien yhdistämiset
+activity.no_git_activity = Tällä ajanjaksolla ei ole ollut kommitointitoimintaa.
+activity.git_stats_commit_1 = %d kommitin
+activity.git_stats_push_to_all_branches = kaikkiin haaroihin.
+settings.graphql_url = GraphQL:n URL-osoite
+branch.create_new_branch = Luo haara haarasta:
+settings.archive.error_ismirror = Et voi arkistoida peilattua repoa.
+branch.warning_rename_default_branch = Olet nimeämässä oletushaaran uudelleen.
+settings.web_hook_name_msteams = Microsoft Teams
+release.download_count_one = %s lataus
+settings.update_hook_success = Webkoukku on päivitetty.
+diff.file_before = Ennen
+diff.file_after = Jälkeen
+settings.protect_new_rule = Luo uusi haaran suojaussääntö
+settings.branch_filter = Haarasuodatin
 
 
 
 [graphs]
+component_loading_info = Tämä saattaa kestää hetken…
+component_failed_to_load = Odottamaton virhe.
+component_loading = Ladataan %s...
 
 [org]
-org_name_holder=Organisaatio
-org_full_name_holder=Organisaation täydellinen nimi
+org_name_holder=Organisaation nimi
+org_full_name_holder=Organisaation koko nimi
 org_name_helper=Organisaation nimen tulisi olla lyhyt ja mieleenpainuva.
 create_org=Luo organisaatio
 repo_updated=Päivitetty %s
@@ -1471,7 +1812,7 @@ team_unit_desc=Salli pääsy repon osioihin
 
 settings=Asetukset
 settings.options=Organisaatio
-settings.full_name=Kokonimi
+settings.full_name=Koko nimi
 settings.website=Nettisivu
 settings.location=Sijainti
 settings.permission=Käyttöoikeudet
@@ -1514,7 +1855,7 @@ teams.admin_access_helper=Tiimin jäsenet voivat työntää (push) ja vetää (p
 teams.no_desc=Tällä tiimillä ei ole kuvausta
 teams.settings=Asetukset
 teams.owners_permission_desc=Omistajilla on täydet käyttöoikeudet kaikkiin organisaation repoihin sekä organisaation ylläpitäjän oikeudet.
-teams.members=Ryhmän jäsenet
+teams.members=Tiimin jäsenet
 teams.update_settings=Päivitä asetukset
 teams.delete_team=Poista tiimi
 teams.add_team_member=Lisää tiimin jäsen
@@ -1527,6 +1868,21 @@ teams.admin_permission_desc=Tämä tiimi myöntää jäsenille Ylläpito
 teams.repositories=Tiimin repot
 teams.members.none=Ei jäseniä tässä tiimissä.
 teams.all_repositories=Kaikki repot
+teams.invite.by = Kutsunut %s
+members.leave.detail = Haluatko varmasti poistua organisaatiosta "%s"?
+teams.add_all_repos_title = Lisää kaikki repot
+teams.invite_team_member.list = Odottavat kutsut
+teams.invite.description = Napsauta alla olevaa painiketta liittyäksesi tiimiin.
+settings.update_setting_success = Organisaatioasetukset on päivitetty.
+form.create_org_not_allowed = Sinulla ei ole oikeutta luoda organisaatiota.
+teams.leave.detail = Haluatko varmasti poistua tiimistä "%s"?
+teams.invite.title = Sinut on kutsuttu tiimiin %s organisaatiossa %s.
+teams.add_duplicate_users = Käyttäjä on jo tiimijäsen.
+settings.visibility.limited = Rajattu (näkyvissä vain tunnistautuneille käyttäjille)
+code = Koodi
+teams.remove_all_repos_title = Poista kaikki tiimin repot
+form.name_reserved = Organisaation nimi "%s" on varattu.
+settings.delete_org_desc = Organisaatio poistetaan pysyvästi. Jatketaanko?
 
 [admin]
 dashboard=Kojelauta
@@ -1578,10 +1934,10 @@ dashboard.total_gc_pause=Yhteensä GC tauko
 dashboard.last_gc_pause=Viime GC tauko
 dashboard.gc_times=GC aikoja
 
-users.user_manage_panel=Tilien hallinta
+users.user_manage_panel=Käyttäjätilien hallinta
 users.new_account=Luo käyttäjätili
 users.name=Käyttäjätunnus
-users.full_name=Kokonimi
+users.full_name=Koko nimi
 users.activated=Aktivoitu
 users.admin=Ylläpito
 users.restricted=Rajoitettu
@@ -1595,16 +1951,16 @@ users.auth_source=Todennuslähde
 users.local=Paikallinen
 users.password_helper=Jätä salasanakenttä tyhjäksi jos haluat pitää sen muuttamattomana.
 users.update_profile_success=Käyttäjän tili on päivitetty.
-users.edit_account=Muokkaa käyttäjän tiliä
+users.edit_account=Muokkaa käyttäjätiliä
 users.max_repo_creation_desc=(Aseta -1 käyttääksesi globaalia oletusrajaa.)
 users.is_activated=Käyttäjätili on aktivoitu
 users.prohibit_login=Ota sisäänkirjautuminen pois käytöstä
-users.is_admin=Ylläpitäjä
+users.is_admin=Ylläpitäjätili
 users.is_restricted=Rajoitettu tili
-users.allow_git_hook=Voi luoda Git koukkuja
+users.allow_git_hook=Voi luoda Git-koukkuja
 users.allow_create_organization=Voi luoda organisaatioita
-users.update_profile=Päivitä käyttäjän tili
-users.delete_account=Poista käyttäjän tili
+users.update_profile=Päivitä käyttäjätili
+users.delete_account=Poista käyttäjätili
 users.list_status_filter.menu_text=Suodata
 users.list_status_filter.reset=Tyhjennä
 users.list_status_filter.is_active=Aktiivinen
@@ -1670,11 +2026,11 @@ auths.search_page_size=Sivukoko
 auths.filter=Käyttäjäsuodatin
 auths.admin_filter=Ylläpitosuodatin
 auths.restricted_filter=Rajoitettu suodatin
-auths.smtp_auth=SMTP todennustyyppi
-auths.smtphost=SMTP isäntä
-auths.smtpport=SMTP portti
+auths.smtp_auth=SMTP-todennustyyppi
+auths.smtphost=SMTP-isäntä
+auths.smtpport=SMTP-portti
 auths.allowed_domains=Sallitut verkkotunnukset
-auths.skip_tls_verify=Ohita TLS tarkistaminen
+auths.skip_tls_verify=Ohita TLS-vahvistus
 auths.pam_service_name=PAM palvelun nimi
 auths.oauth2_tokenURL=Pääsymerkki URL
 auths.enable_auto_register=Ota käyttöön automaattinen rekisteröinti
@@ -1688,17 +2044,17 @@ auths.delete_auth_title=Todennuslähteen poisto
 auths.delete_auth_desc=Todennuslähteen poisto estää käyttäjiä käyttämästä sitä kirjautumiseen. Jatketaanko?
 auths.deletion_success=Todennuslähde on poistettu.
 
-config.server_config=Palvelin asetukset
-config.app_name=Sivuston otsikko
-config.app_ver=Forgejo versio
+config.server_config=Palvelimen asetukset
+config.app_name=Instanssin otsikko
+config.app_ver=Forgejo-versio
 config.disable_router_log=Poista käytöstä reitittimen loki
 config.run_mode=Suoritustila
-config.git_version=Git versio
+config.git_version=Git-versio
 config.repo_root_path=Repon juuren polku
 config.script_type=Komentosarjan tyyppi
 config.reverse_auth_user=Käänteinen todennus käyttäjä
 
-config.ssh_config=SSH asetukset
+config.ssh_config=SSH-asetukset
 config.ssh_enabled=Käytössä
 config.ssh_port=Portti
 config.ssh_listen_port=Kuuntele porttia
@@ -1718,24 +2074,24 @@ config.db_user=Käyttäjätunnus
 config.db_ssl_mode=SSL
 config.db_path=Polku
 
-config.service_config=Palvelu asetukset
-config.show_registration_button=Näytä rekisteröidy painike
+config.service_config=Palveluasetukset
+config.show_registration_button=Näytä rekisteröitymispainike
 config.enable_captcha=Ota CAPTCHA käyttöön
-config.active_code_lives=Aktiivinen koodi elämät ennen vanhenemista
+config.active_code_lives=Aktivointikoodin vanhenemisaika
 config.default_keep_email_private=Piilota sähköpostiosoitteet oletuksena
 config.default_visibility_organization=Uuden organisaation oletusnäkyvyys
 
-config.webhook_config=Webkoukku asetukset
+config.webhook_config=Webkoukkujen asetukset
 config.queue_length=Jonon pituus
 config.deliver_timeout=Toimitus aikakatkaisu
 
 config.mailer_enabled=Käytössä
 config.mailer_name=Nimi
-config.mailer_smtp_addr=SMTP osoite
-config.mailer_smtp_port=SMTP portti
+config.mailer_smtp_addr=SMTP-isäntä
+config.mailer_smtp_port=SMTP-portti
 config.mailer_user=Käyttäjä
 
-config.oauth_config=OAuth asetukset
+config.oauth_config=OAuth-asetukset
 config.oauth_enabled=Käytössä
 
 config.cache_config=Välimuistin asetukset
@@ -1752,7 +2108,7 @@ config.session_life_time=Istunnon elinikä
 config.https_only=Vain HTTPS
 config.cookie_life_time=Evästeen elinikä
 
-config.picture_service=Kuva palvelu
+config.picture_service=Kuvapalvelu
 config.disable_gravatar=Poista käytöstä Gravatar
 
 config.git_gc_args=Roskienkeruun parametrit
@@ -1761,12 +2117,12 @@ config.git_mirror_timeout=Peilauspäivitys aikakatkaistiin
 config.git_clone_timeout=Kloonaus aikakatkaistiin
 config.git_gc_timeout=Roskienkeruu aikakatkaistiin
 
-config.log_config=Loki asetukset
+config.log_config=Lokiasetukset
 config.disabled_logger=Pois käytöstä
 
 
 
-monitor.cron=Cron tehtävät
+monitor.cron=Cron-tehtävät
 monitor.name=Nimi
 monitor.schedule=Aikataulu
 monitor.next=Seuraava aika
@@ -1792,6 +2148,79 @@ notices.type=Tyyppi
 notices.type_1=Repo
 notices.desc=Kuvaus
 notices.op=Toiminta
+auths.sspi_auto_create_users = Luo käyttäjät automaattisesti
+integrations = Integraatiot
+emails.change_email_header = Päivitä sähköpostiominaisuudet
+emails.change_email_text = Haluatko varmasti päivittää tämän sähköpostiosoitteen?
+emails.updated = Sähköpostiosoite päivitetty
+users.organization_creation.description = Salli uusien organisaatioiden luonti.
+users.deletion_success = Käyttäjätili on poistettu.
+users.reset_2fa = Nollaa 2FA
+packages.published = Julkaistu
+packages.version = Versio
+auths.tip.oauth2_provider = OAuth2-palveluntarjoaja
+hooks = Webkoukut
+identity_access = Identiteetti ja pääsy
+config.test_email_placeholder = Sähköposti (esim. test@example.com)
+auths.force_smtps = Pakota SMTPS
+config.mailer_use_sendmail = Käytä Sendmailia
+users.new_success = Käyttäjätili "%s" on luotu.
+config.disable_register = Poista itserekisteröinti käytöstä
+config.enable_openid_signin = Käytä OpenID-kirjautumista
+config.enable_openid_signup = Käytä OpenID-itserekisteröintiä
+monitor.queue.settings.changed = Asetukset päivitetty
+config.db_schema = Skeema
+settings = Ylläpitäjän asetukset
+emails.delete = Poista sähköpostiosoite
+emails.deletion_success = Sähköpostiosoite on poistettu.
+emails.delete_desc = Haluatko varmasti poistaa tämän sähköpostiosoitteen?
+users.cannot_delete_self = Et voi poistaa itseäsi
+packages.package_manage_panel = Hallitse paketteja
+config.ssh_start_builtin_server = Käytä sisäänrakennettua palvelinta
+notices.type_2 = Tehtävä
+emails.delete_primary_email_error = Et voi poistaa ensisijaista sähköpostiosoitetta.
+users.details = Käyttäjän tiedot
+config_summary = Yhteenveto
+config.send_test_mail = Lähetä testisähköposti
+auths.oauth2_icon_url = Kuvakkeen URL-osoite
+config.mail_notify = Käytä sähköposti-ilmoituksia
+config.send_test_mail_submit = Lähetä
+systemhooks = Järjestelmän webkoukut
+packages.total_size = Koko yhteensä: %s
+auths.oauth2_provider = OAuth2-palveluntarjoaja
+auths.tips.gmail_settings = Gmail-asetukset:
+config.mailer_sendmail_path = Sendmail-polku
+auths.sspi_default_language = Käyttäjän oletuskieli
+config_settings = Asetukset
+monitor.queue.settings.remove_all_items = Poista kaikki
+config.skip_tls_verify = Ohita TLS-vahvistus
+auths.sspi_auto_activate_users = Aktivoi käyttäjät automaattisesti
+dashboard.new_version_hint = Forgejo %s on nyt saatavilla. Käytössäsi on %s. Lue lisätietoja blogista.
+defaulthooks.add_webhook = Lisää oletusarvoinen webkoukku
+monitor.execute_times = Suoritukset
+defaulthooks = Oletusarvoiset webkoukut
+systemhooks.update_webhook = Päivitä järjestelmän webkoukku
+systemhooks.add_webhook = Lisää järjestelmän webkoukku
+config.domain = Palvelimen verkkotunnus
+monitor.process.cancel = Peru prosessi
+config.allow_only_internal_registration = Salli rekisteröinti vain Forgejon kautta
+config.allow_only_external_registration = Salli rekisteröinti vain ulkoisten palvelujen kautta
+config.require_sign_in_view = Vaadi sisäänkirjautuminen sisällön katselemiseksi
+config.git_config = Git-asetukset
+monitor.stats = Tilastot
+repos.lfs_size = LFS:n koko
+config.lfs_config = LFS-asetukset
+config.register_email_confirm = Vaadi sähköpostivahvistus rekisteröitymiseen
+config.ssh_domain = SSH-palvelimen verkkotunnus
+config.app_slogan = Instanssin tunnuslause
+config.lfs_content_path = LFS-sisällön polku
+users.max_repo_creation = Repojen enimmäismäärä
+defaulthooks.update_webhook = Päivitä oletusarvoinen webkoukku
+auths.auth_manage_panel = Todennuslähteiden hallinta
+config.custom_conf = Asetustiedoston polku
+config.reset_password_code_lives = Palautuskoodin vanhenemisaika
+monitor.processes_count = %d prosessia
+config.default_allow_create_organization = Salli organisaatioiden luominen oletuksena
 
 
 [action]
@@ -1804,6 +2233,7 @@ compare_commits_general=Vertaa committeja
 create_branch=loi haaran %[3]s repossa %[4]s
 compare_commits = Vertaa %d kommittia
 compare_branch = Vertaa
+review_dismissed_reason = Syy:
 
 [tool]
 now=nyt
@@ -1839,10 +2269,15 @@ pin=Merkitse ilmoitus
 mark_as_read=Merkitse luetuksi
 mark_as_unread=Merkitse lukemattomaksi
 mark_all_as_read=Merkitse kaikki luetuiksi
+watching = Tarkkaillaan
+no_subscriptions = Ei tilauksia
+subscriptions = Tilaukset
 
 [gpg]
 error.no_committer_account=Committaajan sähköpostiosoitteeseen ei ole linkitetty tiliä
 error.not_signed_commit=Ei allekirjoitettu committi
+error.extract_sign = Allekirjoituksen purkaminen epäonnistui
+default_key = Allekirjoitettu oletusavaimella
 
 [units]
 
@@ -1859,8 +2294,99 @@ alpine.repository.branches=Haarat
 alpine.repository.repositories=Repot
 conan.details.repository=Repo
 owner.settings.cleanuprules.enabled=Käytössä
+details.license = Lisenssi
+about = Tietoja tästä paketista
+debian.install = Asenna paketti seuraavalla komennolla:
+owner.settings.cleanuprules.edit = Muokkaa siivoussääntöä
+arch.version.groups = Ryhmä
+details.project_site = Projektin verkkosivusto
+details.repository_site = Repositorion verkkosivusto
+container.pull = Vedä levykuva komentoriviltä:
+generic.download = Lataa paketti komentoriviltä:
+dependency.version = Versio
+keywords = Avainsanat
+dependencies = Riippuvuudet
+container.labels.key = Avain
+container.labels.value = Arvo
+pypi.install = Asenna paketti pipillä seuraavalla komennolla:
+npm.install = Asenna paketti npm:llä seuraavalla komennolla:
+npm.install2 = tai lisää se package.json-tiedostoon:
+empty.documentation = Lisätietoja pakettirekisteristä on saatavilla dokumentaatiossa.
+helm.install = Asenna paketti seuraavalla komennolla:
+owner.settings.chef.keypair = Luo avainpari
+settings.delete.error = Paketin poistaminen epäonnistui.
+requirements = Vaatimukset
+published_by_in = Julkaistu %[1]s, julkaisija %[3]s projektissa %[5]s
+pypi.requires = Vaatii Pythonin
+alpine.install = Asenna paketti seuraavalla komennolla:
+debian.repository.components = Komponentit
+cran.install = Asenna paketti seuraavalla komennolla:
+settings.link.select = Valitse repo
+owner.settings.chef.title = Chef-rekisteri
+owner.settings.cleanuprules.add = Lisää siivoussääntö
+versions = Versiot
+versions.view_all = Näytä kaikki
+debian.repository.architectures = Arkkitehtuurit
+container.details.type = Levykuvan tyyppi
+arch.version.properties = Version ominaisuudet
+rpm.install = Asenna paketti seuraavalla komennolla:
+owner.settings.cleanuprules.none = Siivoussääntöjä ei vielä ole.
+container.details.platform = Alusta
+npm.dependencies = Riippuvuudet
+owner.settings.cleanuprules.title = Siivoussäännöt
+arch.version.depends = Riippuu
+settings.delete = Poista paketti
+arch.version.description = Kuvaus
+settings.delete.success = Paketti on poistettu.
+npm.dependencies.optional = Valinnaiset riippuvuudet
+debian.repository.distributions = Jakelut
+composer.dependencies = Riippuvuudet
+chef.install = Asenna paketti seuraavalla komennolla:
+details.documentation_site = Dokumentaation verkkosivusto
+go.install = Asenna paketti komentoriviltä:
+alpine.repository.architectures = Arkkitehtuurit
+composer.registry = Määritä tämä rekisteri ~/.composer/config.json-tiedostossa:
+debian.registry = Määritä tämä rekisteri komentoriviltä:
+rpm.registry = Määritä rekisteri komentoriviltä:
+maven.install = Käytä pakettia sisällyttämällä seuraava dependencies-lohkoon pom.xml-tiedostossa:
+npm.registry = Määritä rekisteri projektin .npmrc-tiedostossa:
+alpine.repository = Repositorion tiedot
+cargo.registry = Määritä tämä rekisteri Cargon asetustiedostossa (esimerkiksi ~/.cargo/config.toml):
+cargo.install = Asenna paketti Cargolla suorittamalla seuraava komento:
+composer.install = Asenna paketti Composerilla suorittamalla seuraava komento:
+rpm.distros.redhat = RedHatiin pohjautuvilla jakeluilla
+rpm.distros.suse = SUSE:en pohjautuvilla jakeluilla
+rpm.repository.architectures = Arkkitehtuurit
+cran.registry = Määritä rekisteri Rprofile.site-tiedostossa:
+swift.install2 = ja suorita seuraava komento:
+maven.registry = Määritä tämä rekisteri projektin pom.xml-tiedostossa:
+maven.install2 = Suorita komentoriviltä:
+nuget.registry = Määritä rekisteri komentoriviltä:
+nuget.install = Asenna paketti NuGetillä suorittamalla seuraava komento:
+rubygems.install = Asenna paketti gemillä suorittamalla seuraava komento:
+rubygems.install2 = tai lisää se Gemfileen:
+swift.registry = Määritä rekisteri komentoriviltä:
+swift.install = Lisää paketti Package.swift-tiedostoon:
+owner.settings.cleanuprules.keep.count.1 = 1 versio per paketti
+owner.settings.cleanuprules.keep.count.n = %d versiota per paketti
+conan.install = Asenna paketti Conanilla suorittamalla seuraava komento:
+chef.registry = Määritä tämä rekisteri ~/.chef/config.rb-tiedostossa:
+conan.registry = Määritä tämä rekisteri komentoriviltä:
+conda.install = Asenna paketti Condalla suorittamalla seuraava komento:
+helm.registry = Määritä tämä rekisteri komentoriviltä:
+pub.install = Asenna paketti Dartilla suorittamalla seuraava komento:
 
 [secrets]
+creation.failed = Salaisuuden lisääminen epäonnistui.
+deletion = Poista salaisuus
+creation.success = Salaisuus "%s" on päivitetty.
+creation = Lisää salaisuus
+none = Ei salaisuuksia vielä.
+management = Hallitse salaisuuksia
+deletion.failed = Salaisuuden poistaminen epäonnistui.
+secrets = Salaisuudet
+deletion.description = Salaisuuden poistaminen on pysyvä toimenpide, eikä sitä voi perua. Jatketaanko?
+deletion.success = Salaisuus on poistettu.
 
 [actions]
 
@@ -1903,7 +2429,7 @@ runners.delete_runner_failed = Testinajajan poisto epäonnistui
 runners.delete_runner_header = Varmista testinajajan poisto
 runners.task_list.status = Tila
 runners.reset_registration_token_success = Testiajajan rekisteröintiavain uudelleenasetettu onnistuneesti
-variables.none = Muuttujia ei ole vielä määritelty.
+variables.none = Ei muuttujia vielä.
 runners.id = Tunniste
 runners.status = Tila
 runners.task_list = Ajajan viimeisimmät tehtävät
@@ -1935,6 +2461,19 @@ variables.creation.failed = Muuttujan lisäys epäonnistui.
 variables.update.failed = Muuttujan muokkaus epäonnistui.
 variables.update.success = Muuttuja muokattu.
 variables.id_not_exist = Muuttujaa tunnisteella %d ei ole olemassa.
+runs.all_workflows = Kaikki työnkulut
+workflow.dispatch.run = Suorita työnkulku
+workflow.enable = Käytä työnkulkua
+runs.no_workflows = Ei työnkulkuja vielä.
+runs.actors_no_select = Kaikki toimijat
+runs.workflow = Työnkulku
+workflow.enable_success = Työnkulku "%s" otettu käyttöön.
+workflow.disabled = Työnkulku on poistettu käytöstä.
+runs.actor = Toimija
+workflow.disable = Poista työnkulku käytöstä
+workflow.disable_success = Työnkulku "%s" on poistettu käytöstä.
+runs.no_job = Työnkulun tulee sisältää vähintään yksi työ
+runs.invalid_workflow_helper = Työnkulun asetustiedosto on virheellinen. Tarkista asetustiedosto: %s
 
 
 
@@ -1977,4 +2516,5 @@ branch_kind = Etsi haaroja...
 issue_kind = Etsi ongelmia...
 milestone_kind = Etsi merkkipaaluja...
 pull_kind = Etsi pull-vetoja...
-commit_kind = Etsi kommitteja...
\ No newline at end of file
+commit_kind = Etsi kommitteja...
+fuzzy = Sumea
\ No newline at end of file
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
index c6a3557475..e26a36867d 100644
--- a/options/locale/locale_fr-FR.ini
+++ b/options/locale/locale_fr-FR.ini
@@ -3291,7 +3291,7 @@ auths.tips=Conseils
 auths.tips.oauth2.general=Authentification OAuth2
 auths.tips.oauth2.general.tip=Lors de l'enregistrement d'une nouvelle authentification OAuth2, l'URL de rappel/redirection doit être :
 auths.tip.oauth2_provider=Fournisseur OAuth2
-auths.tip.bitbucket=`Créez un nouveau jeton OAuth sur %s
+auths.tip.bitbucket=Créez un nouveau jeton OAuth sur %s
 auths.tip.nextcloud=`Enregistrez un nouveau consommateur OAuth sur votre instance en utilisant le menu "Paramètres -> Sécurité -> Client OAuth 2.0"`
 auths.tip.dropbox=Créez une nouvelle application sur %s
 auths.tip.facebook=`Enregistrez une nouvelle application sur %s et ajoutez le produit "Facebook Login"`
diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini
index 2fe7495c43..fd6d48d8b0 100644
--- a/options/locale/locale_hu-HU.ini
+++ b/options/locale/locale_hu-HU.ini
@@ -493,7 +493,7 @@ avatar=Profilkép
 ssh_gpg_keys=SSH / GPG kulcsok
 social=Közösségi fiókok
 applications=Alkalmazások
-orgs=Szervezetek kezelése
+orgs=Szervezetek
 repos=Tárolók
 delete=Fiók törlése
 twofa=Kétlépcsős hitelesítés
@@ -665,6 +665,7 @@ email_notifications.submit=E-mail beállítások megadása
 
 visibility.public=Nyilvános
 visibility.private=Privát
+appearance = Megjelenés
 
 [repo]
 owner=Tulajdonos
diff --git a/options/locale/locale_nds.ini b/options/locale/locale_nds.ini
index 32aded1935..f59e0151a3 100644
--- a/options/locale/locale_nds.ini
+++ b/options/locale/locale_nds.ini
@@ -335,6 +335,7 @@ oauth.signin.error = Bi’m Verarbeiden vun de Anmellens-Anfraag is een Fehler u
 openid_connect_desc = De utköört OpenID-URI is unbekannt. Verbinn dat hier mit eenem nejen Konto.
 openid_signin_desc = Giff diene OpenID-URI in. To’n Bispööl: alice.openid.example.org of https://openid.example.org/alice.
 password_pwned = Dat Passwoord, wat du utköört hest, is up eener List vun klaut Passwoorden, wat tovör in publiken Datenbröken blootmaakt worden is. Bidde versöök dat noch eenmaal mit eenem anner Passwoord, un överlegg di, of du deeses Passwoord ok annerwaar ännern willst.
+use_onetime_code = Een Eenmaal-Bruuk-Passwoord bruken
 
 [mail]
 view_it_on = Up %s wiesen
@@ -1140,7 +1141,7 @@ editor.file_already_exists = Eene Datei mit de Naam »%s« gifft dat in deesem R
 editor.commit_id_not_matching = De Datei is ännert worden, as du se bewarkt hest. Kommitteer up eenen nejen Twieg un föhr dann tosamen.
 editor.push_out_of_date = De Schuuv schient verollt to wesen.
 editor.commit_empty_file_header = Eene lege Datei kommitteren
-editor.no_changes_to_show = 't gifft keene Ännerns to wiesen.
+editor.no_changes_to_show = ’t gifft keene Ännerns to wiesen.
 editor.fail_to_update_file_summary = Fehler-Naricht:
 editor.push_rejected_summary = Kumpleete Oflehnens-Naricht:
 editor.add_subdir = Verteeknis hentofögen …
@@ -1526,7 +1527,7 @@ issues.review.dismissed_label = Ofseggt
 issues.review.left_comment = hett kommenteert
 issues.review.content.empty = Du muttst eenen Kommentaar geven, wat för Ännerns du hebben willst.
 issues.review.reject = hett %s um Ännerns beden
-issues.review.remove_review_request = hett de Nakieken-Anfraag för %s %s wegdaan
+issues.review.remove_review_request = hett %[2]s de Nakieken-Anfraag för %[1]s wegdaan
 issues.review.remove_review_request_self = hett %s dat Nakieken verweigert
 issues.unlock_error = Kann een Gefall nich upsluten, wenn ’t nich tosloten is.
 issues.lock_with_reason = hett dat um %s %s tosluten un Snack up Mitarbeiders begrenzt
@@ -1567,7 +1568,7 @@ issues.review.option.hide_outdated_comments = Verollte Kommentarens verbargen
 issues.due_date_form = JJJJ-MM-DD
 issues.dependency.added_dependency = `hett %s eene neje Ofhangen hentoföögt`
 issues.review.wait = is %s um een Nakieken anfraggt worden
-issues.review.add_review_request = hett um een Nakieken vun %s %s anfraggt
+issues.review.add_review_request = hett %[2]s um een Nakieken vun %[1]s anfraggt
 issues.review.show_outdated = Wies verollt
 issues.review.hide_outdated = Verbarg verollt
 issues.content_history.options = Instellens
@@ -2524,11 +2525,17 @@ settings.sourcehut_builds.access_token_helper = Togang-Teken, wat de Verlöövni
 settings.protect_unprotected_file_patterns_desc = Nich schütt Dateien, wat stracks ännert worden düren, wenn de Bruker Schriev-Togriep hett, an de Schuuv-Schüttens-Örders vörbi. Mennig Musters könen mit Semikolon (»;«) trennt worden. Kiek de Dokumenteren för ">%[2]s för de Syntax an. Bispölen: .drone.yml, /docs/**/*.txt.
 settings.protected_branch_required_rule_name = Ördernaam is nödig
 settings.protect_protected_file_patterns_desc = Schütt Dateien, wat nich stracks ännert worden düren, sülvst wenn de Bruker dat Recht hett, Dateien in deesem Twieg hentotofögen, to bewarken of to lösken. Mennig Musters könen mit Semikolon (»;«) trennt worden. Kiek de Dokumenteren för ">%[2]s för de Syntax an. Bispölen: .drone.yml, /docs/**/*.txt.
-settings.branch_filter_desc = Twieg-Verlöövnis-List för Vörfallen över dat Schuven un dat Maken un Lösken vun Twiegen, angeven as een Glob-Muster. Wenn leeg of * worden Vörfallen för all Twiegen mellt. Kiek de Dokumenteren för ">%[2]s för de Syntax an. Bispölen: master, {master,release*}.
+settings.branch_filter_desc = Twieg-Verlöövnis-List för Vörfallen över dat Schuven un dat Maken un Lösken vun Twiegen, angeven as een Glob-Muster. Wenn leeg of * worden Vörfallen för all Twiegen mellt. Kiek de Dokumenteren för %[2]s för de Syntax an. Bispölen: master, {master,release*}.
 settings.matrix.room_id_helper = De Ruum-ID kann vun de Element-Internett-Sied unner Ruum-Instellens → Verwiedert → Binnere Ruum-ID haalt worden. Bispööl: %s.
 settings.tags.protection.pattern.description = Du kannst eenen enkelt Naam bruken of een Glob-Muster of Regel-Utdruck, um up mennig Markens to passen. Lees mehr in de Inföhren över schütt Markens.
 error.broken_git_hook = Git-Hakens in deesem Repositorium schienen kaputt to wesen. Bidde folg de Dokumenteren, um se to repareren, dann schuuv een paar Kommitterens, um de Tostand to vernejen.
 settings.matrix.access_token_helper = Dat word anraden, daarföör eegens een Matrix-Konto intorichten. Dat Togangs-Teken kann in de Element-Internett-Sied (in eener privaaten/anonymen Karteikaart) unner Brukermenü (boven links) → All Instellens → Hülp & Över → Togangs-Teken (stracks unner de Heimaadserver-URL) haalt worden. Maak de privaate/anonyme Karteikaart dicht (wenn du di avmellst, word dat Teken ungültig).
+issues.review.add_remove_review_requests = hett %[3]s um Nakiekens vun %[1]s anfraggt un de Nakiekens-Anfragen för %[2]s wegdaan
+issues.review.add_review_requests = hett %[2]s um Nakiekens vun %[1]s anfraggt
+issues.review.remove_review_requests = hett %[2]s de Nakieken-Anfragen för %[1]s wegdaan
+pulls.delete_after_merge.head_branch.is_protected = De Kopp-Twieg, wat du lösken willst, is een schütt Twieg un kann nich lösket worden.
+pulls.delete_after_merge.head_branch.insufficient_branch = Du hest nich dat Recht, de Kopp-Twieg to lösken.
+pulls.delete_after_merge.head_branch.is_default = De Kopp-Twieg, wat du lösken willst, is de Höövd-Twieg un kann nich lösket worden.
 
 [repo.permissions]
 code.read = Lesen: De Quelltext vun deesem Repositorium ankieken un klonen.
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
index 27bbb885e9..cbf418f9be 100644
--- a/options/locale/locale_nl-NL.ini
+++ b/options/locale/locale_nl-NL.ini
@@ -659,7 +659,7 @@ unable_verify_ssh_key = Kan de SSH-sleutel niet verifiëren, controleer deze voo
 still_own_repo = Uw account is eigenaar van één of meer repositories, verwijder of draag deze eerst over.
 admin_cannot_delete_self = U kan uzelf niet verwijderen als u een beheerder bent. Verwijder eerst uw beheerdersrechten.
 username_error_no_dots = ` kan alleen alfanumerieke karakters ("0-9","a-z","A-Z"), streepje ("-") en liggend streepje ("_") bevatten. Niet-alfanumerieke karakters aan het begin of eind zijn verboden en aaneenvolgende niet alfanumerieke karakters zijn ook verboden.`
-invalid_group_team_map_error = ` mapping is ongeldig: %s"
+invalid_group_team_map_error = ` mapping is ongeldig: %s`
 org_still_own_repo = Deze organisatie is eigenaar van één of meer repositories, verwijder of draag deze eerst over.
 org_still_own_packages = Deze organisatie is eigenaar van één of meer pakketten, verwijder deze eerst.
 unset_password = De inloggebruiker heeft het wachtwoord niet ingesteld.
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
index 2179e4fb33..73211f7139 100644
--- a/options/locale/locale_pt-BR.ini
+++ b/options/locale/locale_pt-BR.ini
@@ -1752,8 +1752,8 @@ issues.review.left_comment=deixou um comentário
 issues.review.content.empty=Você precisa deixar um comentário indicando as alterações solicitadas.
 issues.review.reject=solicitou alterações %s
 issues.review.wait=foi solicitado(a) para revisar %s
-issues.review.add_review_request=solicitou uma revisão de %s %s
-issues.review.remove_review_request=removeu a solicitação de revisão para %s %s
+issues.review.add_review_request=solicitou revisão de %[1]s %[2]s
+issues.review.remove_review_request=removeu a solicitação de revisão para %[1]s %[2]s
 issues.review.remove_review_request_self=recusou-se a revisar %s
 issues.review.pending=Pendente
 issues.review.pending.tooltip=Este comentário não está atualmente visível para outros usuários. Para enviar seus comentários pendentes, selecione "%s" -> "%s/%s/%s" no topo da página.
@@ -2827,6 +2827,9 @@ release.deletion_desc = Eliminar um release apenas o remove do Forgejo. Isso nã
 issues.all_title = Tudo
 issues.new.assign_to_me = Designar a mim
 settings.discord_icon_url.exceeds_max_length = A URL do ícone precisa ter 2048 caracteres ou menos
+issues.review.add_review_requests = solicitou revisões de %[1]s %[2]s
+issues.review.remove_review_requests = removeu pedidos de revisão para %[1]s %[2]s
+issues.review.add_remove_review_requests = solicitou revisões de %[1]s e removeu pedidos de revisão para %[2]s %[3]s
 
 [graphs]
 
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
index 59dcd6bffd..d368402a6a 100644
--- a/options/locale/locale_pt-PT.ini
+++ b/options/locale/locale_pt-PT.ini
@@ -476,6 +476,7 @@ hint_register = Precisa de uma conta? Faça uma inscrição agora.<
 sign_up_button = Faça uma inscrição agora.
 back_to_sign_in = Voltar ao iniciar a sessão
 sign_in_openid = Prosseguir com OpenID
+unauthorized_credentials = As credenciais estão erradas ou expiraram. Tente o comando de novo ou veja %s para mais informação
 
 [mail]
 view_it_on=Ver em %s
@@ -715,6 +716,7 @@ public_activity.visibility_hint.self_public = O seu trabalho está visível para
 public_activity.visibility_hint.admin_public = Este trabalho está visível para todos, mas como administrador/a pode também ver o que consta em espaços privados.
 public_activity.visibility_hint.self_private = O seu trabalho apenas está visível para si e para os administradores da instância. Configurar.
 public_activity.visibility_hint.admin_private = Este trabalho está visível para si porque é um/a administrador/a, mas o/a utilizador/a quer permanecer privado/a.
+public_activity.visibility_hint.self_private_profile = O seu trabalho está visível somente para si e para os administradores da instância porque o seu perfil é privado. Configure.
 
 [settings]
 profile=Perfil
@@ -1037,7 +1039,7 @@ hints = Sugestões
 blocked_users = Utilizadores bloqueados
 blocked_since = Bloqueado desde %s
 user_block_success = O utilizador foi bloqueado com sucesso.
-additional_repo_units_hint_description = Mostrar um botão "Adicionar mais unidades..." para repositórios que não têm todas as unidades disponíveis habilitadas.
+additional_repo_units_hint_description = Mostrar uma sugestão "Habilitar mais" para repositórios que não têm todas as unidades disponíveis habilitadas.
 update_hints_success = As sugestões foram modificadas.
 blocked_users_none = Não há utilizadores bloqueados.
 user_unblock_success = O utilizador foi desbloqueado com sucesso.
@@ -1426,7 +1428,7 @@ commitstatus.failure=Falha
 commitstatus.pending=Pendente
 commitstatus.success=Sucesso
 
-ext_issues=Acesso a questões externas
+ext_issues=Questões externas
 ext_issues.desc=Ligação para um rastreador de questões externo.
 
 projects=Planeamentos
@@ -1607,9 +1609,9 @@ issues.no_content=Nenhuma descrição fornecida.
 issues.close=Encerrar questão
 issues.comment_pull_merged_at=cometimento %[1]s integrado em %[2]s %[3]s
 issues.comment_manually_pull_merged_at=cometimento %[1]s integrado manualmente em %[2]s %[3]s
-issues.close_comment_issue=Comentar e fechar
+issues.close_comment_issue=Fechar com comentário
 issues.reopen_issue=Reabrir
-issues.reopen_comment_issue=Comentar e reabrir
+issues.reopen_comment_issue=Reabrir com comentário
 issues.create_comment=Comentar
 issues.closed_at=`encerrou esta questão %[2]s`
 issues.reopened_at=`reabriu esta questão %[2]s`
@@ -1999,7 +2001,7 @@ signing.wont_sign.commitssigned=A integração não irá ser assinada, uma vez q
 signing.wont_sign.approved=A integração não irá ser assinada, uma vez que o pedido de integração não foi assinado.
 signing.wont_sign.not_signed_in=Não tem a sessão iniciada.
 
-ext_wiki=Acesso a wiki externo
+ext_wiki=Wiki externo
 ext_wiki.desc=Ligação para um wiki externo.
 
 wiki=Wiki
@@ -2329,32 +2331,32 @@ settings.event_push_desc=Envio do Git para um repositório.
 settings.event_repository=Repositório
 settings.event_repository_desc=Repositório criado ou eliminado.
 settings.event_header_issue=Eventos da questão
-settings.event_issues=Questões
+settings.event_issues=Modificação
 settings.event_issues_desc=Questão aberta, fechada, reaberta ou editada.
-settings.event_issue_assign=Questão atribuída
+settings.event_issue_assign=Atribuição
 settings.event_issue_assign_desc=Encarregado atribuído ou retirado à questão.
-settings.event_issue_label=Questão com rótulo
-settings.event_issue_label_desc=Rótulos modificados ou retirados às questões.
-settings.event_issue_milestone=Questão com etapa atribuída
-settings.event_issue_milestone_desc=Etapa atribuída ou retirada à questão.
-settings.event_issue_comment=Comentário da questão
+settings.event_issue_label=Rótulos
+settings.event_issue_label_desc=Rótulos adicionados ou retirados às questões.
+settings.event_issue_milestone=Etapas
+settings.event_issue_milestone_desc=Etapa atribuída, removida ou modificada.
+settings.event_issue_comment=Comentários
 settings.event_issue_comment_desc=Comentário da questão criado, editado ou eliminado.
 settings.event_header_pull_request=Eventos de pedidos de integração
-settings.event_pull_request=Pedido de integração
+settings.event_pull_request=Modificação
 settings.event_pull_request_desc=Pedido de integração aberto, fechado, reaberto ou editado.
-settings.event_pull_request_assign=Encarregado atribuído ao pedido de integração
+settings.event_pull_request_assign=Atribuição
 settings.event_pull_request_assign_desc=Encarregado atribuído ou retirado ao pedido de integração.
-settings.event_pull_request_label=Rótulo atribuído ao pedido de integração
-settings.event_pull_request_label_desc=Rótulos modificados ou retirados aos pedidos de integração.
-settings.event_pull_request_milestone=Etapa atribuída ao pedido de integração
-settings.event_pull_request_milestone_desc=Etapa atribuída ou retirada ao pedido de integração.
-settings.event_pull_request_comment=Comentário do pedido de integração
+settings.event_pull_request_label=Rótulos
+settings.event_pull_request_label_desc=Rótulos adicionados ou retirados aos pedidos de integração.
+settings.event_pull_request_milestone=Etapas
+settings.event_pull_request_milestone_desc=Etapas adicionadas, removidas ou modificadas.
+settings.event_pull_request_comment=Comentários
 settings.event_pull_request_comment_desc=Comentário do pedido de integração criado, editado ou eliminado.
-settings.event_pull_request_review=Pedido de integração revisto
+settings.event_pull_request_review=Revisões
 settings.event_pull_request_review_desc=Pedido de integração aprovado, rejeitado ou comentado na revisão.
-settings.event_pull_request_sync=Pedido de integração sincronizado
-settings.event_pull_request_sync_desc=Pedido de integração sincronizado.
-settings.event_pull_request_review_request=Solicitada a revisão do pedido de integração
+settings.event_pull_request_sync=Sincronizado
+settings.event_pull_request_sync_desc=Ramo sincronizado automaticamente com o ramo de destino.
+settings.event_pull_request_review_request=Pedidos de revisão
 settings.event_pull_request_review_request_desc=A revisão do pedido de integração foi solicitada ou a solicitação de revisão foi removida.
 settings.event_pull_request_approvals=Aprovações do pedido de integração
 settings.event_pull_request_merge=Integração constante no pedido
@@ -2612,7 +2614,7 @@ release.draft=Rascunho
 release.prerelease=Pré-lançamento
 release.stable=Estável
 release.compare=Comparar
-release.edit=editar
+release.edit=Editar
 release.ahead.commits=%d cometimentos
 release.ahead.target=para %s desde este lançamento
 tag.ahead.target=para o ramo %s desde esta etiqueta
@@ -2734,7 +2736,7 @@ commits.search_branch = Este ramo
 pulls.title_desc_one = quer integrar %[1]d cometimento do ramo %[2]s no ramo %[3]s
 pulls.reopen_failed.base_branch = O pedido de integração não pode ser reaberto porque o ramo base já não existe.
 activity.navbar.code_frequency = Frequência de programação
-settings.units.add_more = Adicionar mais...
+settings.units.add_more = Habilitar mais
 settings.wiki_rename_branch_main_desc = Renomear o ramo usado internamente pelo Wiki para "%s". Esta operação é permanente e não poderá ser revertida.
 settings.add_collaborator_blocked_our = Não foi possível adicionar o/a colaborador/a porque o/a proprietário/a do repositório bloqueou-os.
 settings.add_webhook.invalid_path = A localização não pode conter "." ou ".." ou ficar em branco. Não pode começar ou terminar com uma barra.
@@ -2757,7 +2759,7 @@ release.download_count_one = %s descarga
 release.download_count_few = %s descargas
 release.system_generated = Este anexo é gerado automaticamente.
 pulls.ready_for_review = Pronto/a para rever?
-settings.units.units = Unidades do repositório
+settings.units.units = Unidades
 error.broken_git_hook = Os automatismos git deste repositório parecem estar danificados. Consulte a documentação sobre como os consertar e depois envie alguns cometimentos para refrescar o estado.
 settings.rename_branch_failed_protected = Não é possível renomear o ramo %s porque é um ramo protegido.
 settings.units.overview = Visão geral
@@ -2822,6 +2824,9 @@ settings.mirror_settings.push_mirror.none_ssh = Nenhuma
 settings.protect_new_rule = Criar uma nova regra de salvaguarda do ramo
 mirror_use_ssh.helper = O Forgejo irá replicar o repositório via Git sobre SSH e criar um par de chaves para si quando escolher esta opção. Tem que se certificar que a chave pública gerada está autorizada a enviar para o repositório de destino. Não pode usar a autorização baseada numa senha quando escolher isto.
 mirror_use_ssh.not_available = A autenticação por SSH não está disponível.
+issues.new.assign_to_me = Atribuir a mim
+issues.all_title = Todas
+settings.discord_icon_url.exceeds_max_length = O URL do ícone tem que ter 2048 caracteres ou menos
 
 [graphs]
 component_loading=A carregar %s...
@@ -3793,7 +3798,7 @@ management=Gerir segredos
 [actions]
 actions=Operações
 
-unit.desc=Gerir sequências CI/CD integradas com Forgejo Actions
+unit.desc=Gerir sequências CI/CD integradas com Forgejo Actions.
 
 status.unknown=Desconhecido
 status.waiting=Aguardando
@@ -3938,7 +3943,7 @@ pull_kind = Procurar pedidos de integração...
 union = Palavras-chave
 union_tooltip = Incluir resultados correspondentes a qualquer das palavras-chave separadas por espaços em branco
 milestone_kind = Procurar etapas...
-regexp_tooltip = Interpreta o termo de pesquisa como um expressão regular
+regexp_tooltip = Interpreta o termo de pesquisa como uma expressão regular
 regexp = ExpReg
 
 [munits.data]
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
index 0bc633b008..2324567c45 100644
--- a/options/locale/locale_ru-RU.ini
+++ b/options/locale/locale_ru-RU.ini
@@ -477,6 +477,7 @@ back_to_sign_in = Назад ко входу
 sign_in_openid = Продолжить с OpenID
 hint_login = Уже есть учётная запись? Войдите!
 unauthorized_credentials = Учётные данные неверны или истекли. Попробуйте повторить команду или ознакомьтесь с подробностями по ссылке: %s
+use_onetime_code = Использовать одноразовый код
 
 [mail]
 view_it_on=Посмотреть на %s
@@ -1757,8 +1758,8 @@ issues.review.left_comment=оставил комментарий
 issues.review.content.empty=Запрашивая изменения, вы обязаны оставить комментарий с пояснением своих пожеланий относительно запроса на слияние.
 issues.review.reject=запрошены изменения %s
 issues.review.wait=был запрошен для отзыва %s
-issues.review.add_review_request=запрошена рецензия у %s %s
-issues.review.remove_review_request=отменён запрос рецензии для %s %s
+issues.review.add_review_request=запрошена рецензия от %[1]s %[2]s
+issues.review.remove_review_request=отменён запрос рецензии от %[1]s %[2]s
 issues.review.remove_review_request_self=отказ от рецензирования %s
 issues.review.pending=Ожидание
 issues.review.pending.tooltip=Этот комментарий в настоящее время не виден другим пользователям. Чтобы отправить отложенные комментарии, выберите «%s» → «%s/%s/%s» в верхней части страницы.
@@ -2129,7 +2130,7 @@ settings.use_external_issue_tracker=Использовать внешнюю си
 settings.external_tracker_url=Ссылка на внешнюю систему задач
 settings.external_tracker_url_error=URL внешнего баг-трекера не является корректным URL.
 settings.external_tracker_url_desc=Посетители будут перенаправлены по указанному адресу трекера задач при открытии вкладки.
-settings.tracker_url_format=Формат ссылки внешней системы задач
+settings.tracker_url_format=Формат ссылок внешней системы задач
 settings.tracker_url_format_error=Формат URL внешнего баг-трекера некорректен.
 settings.tracker_issue_style=Формат нумерации во внешней системе задач
 settings.tracker_issue_style.numeric=Цифровой
@@ -2830,6 +2831,12 @@ settings.mirror_settings.push_mirror.copy_public_key = Копировать пу
 issues.new.assign_to_me = Назначить себе
 issues.all_title = Все
 settings.discord_icon_url.exceeds_max_length = URL иконки не может быть длиннее 2048 символов
+issues.review.add_review_requests = запрошены рецензии от %[1]s %[2]s
+issues.review.remove_review_requests = отменены запросы рецензий от %[1]s %[2]s
+issues.review.add_remove_review_requests = запрошены рецензии от %[1]s и отменены запросы рецензий от %[2]s %[3]s
+pulls.delete_after_merge.head_branch.is_default = Головная ветвь, которую вы попытались удалить, является ветвью по умолчанию и не может быть удалена.
+pulls.delete_after_merge.head_branch.is_protected = Головная ветвь, которую вы попытались удалить, защищена от этого и не может быть удалена.
+pulls.delete_after_merge.head_branch.insufficient_branch = Отсутствует разрешение для удаления головной ветви.
 
 [graphs]
 
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index f4ad6754ef..492a43b63b 100644
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -2456,7 +2456,7 @@ settings.ignore_stale_approvals_desc=对旧提交（过期审核）的批准将
 settings.require_signed_commits=需要签名提交
 settings.require_signed_commits_desc=拒绝推送未签名或无法验证的提交到分支
 settings.protect_branch_name_pattern=受保护的分支名称正则
-settings.protect_branch_name_pattern_desc=分支保护的名称匹配规则。语法请参阅文档 。如：main, release/**
+settings.protect_branch_name_pattern_desc=受保护的分支名称正则。语法请参阅文档 。如：main, release/**
 settings.protect_patterns=规则
 settings.protect_protected_file_patterns=受保护的文件模式（使用半角分号“;”分隔）
 settings.protect_protected_file_patterns_desc=即使用户有权添加、编辑或删除此分支中的文件，也不允许直接更改受保护的文件。 可以使用半角分号（“;”）分隔多个模式。 见%s文档了解模式语法。例如： .drone.yml, /docs/**/*.txt。
@@ -2841,6 +2841,12 @@ mirror_use_ssh.not_available = SSH 验证不可用。
 issues.new.assign_to_me = 指派给我
 issues.all_title = 全部
 settings.discord_icon_url.exceeds_max_length = 图标 URL 必须小于或等于 2048 个字符
+issues.review.remove_review_requests = 于 %[2]s 取消对 %[1]s 的评审请求
+issues.review.add_review_requests = 于 %[2]s 请求 %[1]s 评审
+issues.review.add_remove_review_requests = 于 %[3]s 请求 %[1]s 评审，并取消对 %[2]s 的评审请求
+pulls.delete_after_merge.head_branch.is_protected = 您要删除的头部分支是受保护的分支，无法删除。
+pulls.delete_after_merge.head_branch.insufficient_branch = 您没有权限删除头部分支。
+pulls.delete_after_merge.head_branch.is_default = 您要删除的头部分支是默认分支，无法删除。
 
 [graphs]
 component_loading=正在加载 %s...

From dfe3ffc581eb2fb2137aa9f1530d1296bc6a2801 Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Wed, 30 Oct 2024 15:59:48 +0000
Subject: [PATCH 245/443] feat: harden localization against malicious HTML
 (#5703)

- Add a new script that proccess the localization files and verify that
they only contain HTML according to our strictly defined rules.
- This should make adding malicious HTML near-impossible.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5703
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Gusted 
Co-committed-by: Gusted 
---
 Makefile                                      |   6 +-
 build/lint-locale.go                          | 156 ++++++++++++++++++
 build/lint-locale_test.go                     |  65 ++++++++
 options/locale/locale_ar.ini                  |   6 +-
 options/locale/locale_bg.ini                  |   6 +-
 options/locale/locale_cs-CZ.ini               |  10 +-
 options/locale/locale_de-DE.ini               |  10 +-
 options/locale/locale_el-GR.ini               |  10 +-
 options/locale/locale_en-US.ini               |  10 +-
 options/locale/locale_eo.ini                  |   1 -
 options/locale/locale_es-ES.ini               |  10 +-
 options/locale/locale_fa-IR.ini               |   7 +-
 options/locale/locale_fi-FI.ini               |   6 +-
 options/locale/locale_fil.ini                 |  10 +-
 options/locale/locale_fr-FR.ini               |  12 +-
 options/locale/locale_gl.ini                  |   3 +-
 options/locale/locale_hu-HU.ini               |   5 +-
 options/locale/locale_id-ID.ini               |   5 +-
 options/locale/locale_is-IS.ini               |   3 +-
 options/locale/locale_it-IT.ini               |  11 +-
 options/locale/locale_ja-JP.ini               |  11 +-
 options/locale/locale_ko-KR.ini               |   5 +-
 options/locale/locale_lv-LV.ini               |   9 +-
 options/locale/locale_nds.ini                 |  10 +-
 options/locale/locale_nl-NL.ini               |  10 +-
 options/locale/locale_pl-PL.ini               |   4 +-
 options/locale/locale_pt-BR.ini               |  11 +-
 options/locale/locale_pt-PT.ini               |  10 +-
 options/locale/locale_ru-RU.ini               |  10 +-
 options/locale/locale_si-LK.ini               |  21 ++-
 options/locale/locale_sk-SK.ini               |   3 +-
 options/locale/locale_sl.ini                  |   2 +-
 options/locale/locale_sr-SP.ini               |   2 +-
 options/locale/locale_sv-SE.ini               |   4 +-
 options/locale/locale_tr-TR.ini               |   9 +-
 options/locale/locale_uk-UA.ini               |   6 +-
 options/locale/locale_zh-CN.ini               |  10 +-
 options/locale/locale_zh-HK.ini               |   2 +-
 options/locale/locale_zh-TW.ini               |  11 +-
 templates/repo/editor/commit_form.tmpl        |   2 +-
 .../repo/issue/view_content/comments.tmpl     |   2 +-
 templates/repo/issue/view_title.tmpl          |   4 +-
 templates/user/settings/applications.tmpl     |   2 +-
 43 files changed, 361 insertions(+), 151 deletions(-)
 create mode 100644 build/lint-locale.go
 create mode 100644 build/lint-locale_test.go

diff --git a/Makefile b/Makefile
index 62cf4e536d..f9c02cfbf3 100644
--- a/Makefile
+++ b/Makefile
@@ -418,7 +418,7 @@ lint-frontend: lint-js lint-css
 lint-frontend-fix: lint-js-fix lint-css-fix
 
 .PHONY: lint-backend
-lint-backend: lint-go lint-go-vet lint-editorconfig lint-renovate
+lint-backend: lint-go lint-go-vet lint-editorconfig lint-renovate lint-locale
 
 .PHONY: lint-backend-fix
 lint-backend-fix: lint-go-fix lint-go-vet lint-editorconfig
@@ -461,6 +461,10 @@ lint-renovate: node_modules
 	@if grep --quiet --extended-regexp -e '^( WARN:|ERROR:)' .lint-renovate ; then cat .lint-renovate ; rm .lint-renovate ; exit 1 ; fi
 	@rm .lint-renovate
 
+.PHONY: lint-locale
+lint-locale:
+	$(GO) run build/lint-locale.go
+
 .PHONY: lint-md
 lint-md: node_modules
 	npx markdownlint docs *.md
diff --git a/build/lint-locale.go b/build/lint-locale.go
new file mode 100644
index 0000000000..d403eaa70d
--- /dev/null
+++ b/build/lint-locale.go
@@ -0,0 +1,156 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+//nolint:forbidigo
+package main
+
+import (
+	"fmt"
+	"html"
+	"io/fs"
+	"os"
+	"path/filepath"
+	"regexp"
+	"slices"
+	"strings"
+
+	"github.com/microcosm-cc/bluemonday"
+	"github.com/sergi/go-diff/diffmatchpatch"
+	"gopkg.in/ini.v1" //nolint:depguard
+)
+
+var (
+	policy     *bluemonday.Policy
+	tagRemover *strings.Replacer
+	safeURL    = "https://TO-BE-REPLACED.COM"
+
+	// Matches href="", href="#", href="%s", href="#%s", href="%[1]s" and href="#%[1]s".
+	placeHolderRegex = regexp.MustCompile(`href="#?(%s|%\[\d\]s)?"`)
+)
+
+func initBlueMondayPolicy() {
+	policy = bluemonday.NewPolicy()
+
+	policy.RequireParseableURLs(true)
+	policy.AllowURLSchemes("https")
+
+	// Only allow safe URL on href.
+	// Only allow target="_blank".
+	// Only allow rel="nopener noreferrer", rel="noopener" and rel="noreferrer".
+	// Only allow placeholder on id and class.
+	policy.AllowAttrs("href").Matching(regexp.MustCompile("^" + regexp.QuoteMeta(safeURL) + "$")).OnElements("a")
+	policy.AllowAttrs("target").Matching(regexp.MustCompile("^_blank$")).OnElements("a")
+	policy.AllowAttrs("rel").Matching(regexp.MustCompile("^(noopener|noreferrer|noopener noreferrer)$")).OnElements("a")
+	policy.AllowAttrs("id", "class").Matching(regexp.MustCompile(`^%s|%\[\d\]s$`)).OnElements("a")
+
+	// Only allow positional placeholder as class.
+	positionalPlaceholderRe := regexp.MustCompile(`^%\[\d\]s$`)
+	policy.AllowAttrs("class").Matching(positionalPlaceholderRe).OnElements("strong")
+	policy.AllowAttrs("id").Matching(positionalPlaceholderRe).OnElements("code")
+
+	// Allowed elements with no attributes. Must be a recognized tagname.
+	policy.AllowElements("strong", "br", "b", "strike", "code", "i")
+
+	// TODO: Remove  in `actions.workflow.dispatch.trigger_found`.
+	policy.AllowNoAttrs().OnElements("c")
+}
+
+func initRemoveTags() {
+	oldnew := []string{}
+	for _, el := range []string{
+		"email@example.com", "correu@example.com", "epasts@domens.lv", "email@exemplo.com", "eposta@ornek.com", "email@példa.hu", "email@esempio.it",
+		"user", "utente", "lietotājs", "gebruiker", "usuário", "Benutzer", "Bruker",
+		"server", "servidor", "kiszolgáló", "serveris",
+		"label", "etichetta", "etiķete", "rótulo", "Label", "utilizador",
+		"filename", "bestandsnaam", "dosyaadi", "fails", "nome do arquivo",
+	} {
+		oldnew = append(oldnew, "<"+el+">", "REPLACED-TAG")
+	}
+
+	tagRemover = strings.NewReplacer(oldnew...)
+}
+
+func preprocessTranslationValue(value string) string {
+	// href should be a parsable URL, replace placeholder strings with a safe url.
+	value = placeHolderRegex.ReplaceAllString(value, `href="`+safeURL+`"`)
+
+	// Remove tags that aren't tags but will be parsed as tags. We already know they are safe and sound.
+	value = tagRemover.Replace(value)
+
+	return value
+}
+
+func checkLocaleContent(localeContent []byte) []string {
+	// Same configuration as Forgejo uses.
+	cfg := ini.Empty(ini.LoadOptions{
+		IgnoreContinuation: true,
+	})
+	cfg.NameMapper = ini.SnackCase
+
+	if err := cfg.Append(localeContent); err != nil {
+		panic(err)
+	}
+
+	dmp := diffmatchpatch.New()
+	errors := []string{}
+
+	for _, section := range cfg.Sections() {
+		for _, key := range section.Keys() {
+			var trKey string
+			if section.Name() == "" || section.Name() == "DEFAULT" || section.Name() == "common" {
+				trKey = key.Name()
+			} else {
+				trKey = section.Name() + "." + key.Name()
+			}
+
+			keyValue := preprocessTranslationValue(key.Value())
+
+			if html.UnescapeString(policy.Sanitize(keyValue)) != keyValue {
+				// Create a nice diff of the difference.
+				diffs := dmp.DiffMain(keyValue, html.UnescapeString(policy.Sanitize(keyValue)), false)
+				diffs = dmp.DiffCleanupSemantic(diffs)
+				diffs = dmp.DiffCleanupEfficiency(diffs)
+
+				errors = append(errors, trKey+": "+dmp.DiffPrettyText(diffs))
+			}
+		}
+	}
+	return errors
+}
+
+func main() {
+	initBlueMondayPolicy()
+	initRemoveTags()
+
+	localeDir := filepath.Join("options", "locale")
+	localeFiles, err := os.ReadDir(localeDir)
+	if err != nil {
+		panic(err)
+	}
+
+	if !slices.ContainsFunc(localeFiles, func(e fs.DirEntry) bool { return strings.HasSuffix(e.Name(), ".ini") }) {
+		fmt.Println("No locale files found")
+		os.Exit(1)
+	}
+
+	exitCode := 0
+	for _, localeFile := range localeFiles {
+		if !strings.HasSuffix(localeFile.Name(), ".ini") {
+			continue
+		}
+
+		localeContent, err := os.ReadFile(filepath.Join(localeDir, localeFile.Name()))
+		if err != nil {
+			panic(err)
+		}
+
+		if err := checkLocaleContent(localeContent); len(err) > 0 {
+			fmt.Println(localeFile.Name())
+			fmt.Println(strings.Join(err, "\n"))
+			fmt.Println()
+			exitCode = 1
+		}
+	}
+
+	os.Exit(exitCode)
+}
diff --git a/build/lint-locale_test.go b/build/lint-locale_test.go
new file mode 100644
index 0000000000..b33dc9af2b
--- /dev/null
+++ b/build/lint-locale_test.go
@@ -0,0 +1,65 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+package main
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLocalizationPolicy(t *testing.T) {
+	initBlueMondayPolicy()
+	initRemoveTags()
+
+	t.Run("Remove tags", func(t *testing.T) {
+		assert.Empty(t, checkLocaleContent([]byte(`hidden_comment_types_description = Comment types checked here will not be shown inside issue pages. Checking "Label" for example removes all " added/removed "}, checkLocaleContent([]byte(`key = %[1]s`)))
+	})
+
+	t.Run("General safe tags", func(t *testing.T) {
+		assert.Empty(t, checkLocaleContent([]byte("error404 = The page you are trying to reach either does not exist or you are not authorized to view it.")))
+		assert.Empty(t, checkLocaleContent([]byte("teams.specific_repositories_helper = Members will only have access to repositories explicitly added to the team. Selecting this will not automatically remove repositories already added with All repositories.")))
+		assert.Empty(t, checkLocaleContent([]byte("sqlite_helper = File path for the SQLite3 database.
Enter an absolute path if you run Forgejo as a service.")))
+		assert.Empty(t, checkLocaleContent([]byte("hi_user_x = Hi %s,")))
+
+		assert.EqualValues(t, []string{"error404: The page you are trying to reach either does not exist or you are not authorized to view it."}, checkLocaleContent([]byte("error404 = The page you are trying to reach either does not exist or you are not authorized to view it.")))
+	})
+
+	t.Run("", func(t *testing.T) {
+		assert.Empty(t, checkLocaleContent([]byte(`admin.new_user.text = Please click here to manage this user from the admin panel.`)))
+		assert.Empty(t, checkLocaleContent([]byte(`access_token_desc = Selected token permissions limit authorization only to the corresponding API routes. Read the documentation for more information.`)))
+		assert.Empty(t, checkLocaleContent([]byte(`webauthn_desc = Security keys are hardware devices containing cryptographic keys. They can be used for two-factor authentication. Security keys must support the WebAuthn Authenticator standard.`)))
+		assert.Empty(t, checkLocaleContent([]byte("issues.closed_at = `closed this issue %[2]s`")))
+
+		assert.EqualValues(t, []string{"key: \x1b[31m\x1b[0m"}, checkLocaleContent([]byte(`key = `)))
+		assert.EqualValues(t, []string{"key: \x1b[31m\x1b[0m"}, checkLocaleContent([]byte(`key = `)))
+		assert.EqualValues(t, []string{"key: "}, checkLocaleContent([]byte(`key = `)))
+		assert.EqualValues(t, []string{"key: "}, checkLocaleContent([]byte(`key = `)))
+		assert.EqualValues(t, []string{"key: \x1b[31m\x1b[0m"}, checkLocaleContent([]byte(`key = `)))
+		assert.EqualValues(t, []string{"key: \x1b[31m\x1b[0m"}, checkLocaleContent([]byte(`key = `)))
+		assert.EqualValues(t, []string{"key: \x1b[31m\x1b[0m"}, checkLocaleContent([]byte(`key = `)))
+		assert.EqualValues(t, []string{"key: \x1b[31m\x1b[0m"}, checkLocaleContent([]byte(`key = `)))
+	})
+
+	t.Run("Escaped HTML characters", func(t *testing.T) {
+		assert.Empty(t, checkLocaleContent([]byte("activity.git_stats_push_to_branch = `إلى %s و\"`")))
+
+		assert.EqualValues(t, []string{"key: و\x1b[31m \x1b[0m\x1b[32m\u00a0\x1b[0m"}, checkLocaleContent([]byte(`key = و `)))
+	})
+}
diff --git a/options/locale/locale_ar.ini b/options/locale/locale_ar.ini
index 76fe2a3fdd..f92cec14c2 100644
--- a/options/locale/locale_ar.ini
+++ b/options/locale/locale_ar.ini
@@ -960,7 +960,7 @@ settings.recent_deliveries = التوصيل الأخيرة
 projects.new = مشروع جديد
 file_history = تاريخ
 editor.directory_is_a_file = اسم المجلد "%s" مستخدم فعلا لاسم ملف في هذا المستودع.
-editor.commit_directly_to_this_branch = أودع مباشرةً إلى فرع %s.
+editor.commit_directly_to_this_branch = أودع مباشرةً إلى فرع %[1]s.
 editor.unable_to_upload_files = تعذر رفع الملفات إلى "%s" برسالة الخطأ: %v
 settings.webhook.payload = المحتوى
 invisible_runes_header = `يحتوي هذا الملف على محارف يونيكود غير مرئية`
@@ -1105,7 +1105,7 @@ activity.git_stats_pushed_1 = دفع
 activity.git_stats_pushed_n = دفعوا
 activity.git_stats_commit_1 = %d إيداع
 activity.git_stats_commit_n = %d إيداعا
-activity.git_stats_push_to_branch = إلى %s و 
+activity.git_stats_push_to_branch = `إلى %s و"`
 activity.git_stats_push_to_all_branches = إلى كل الفروع.
 activity.git_stats_on_default_branch = في %s،
 activity.git_stats_file_1 = %d ملف
@@ -1115,7 +1115,7 @@ activity.git_stats_files_changed_n = تغيّروا
 activity.git_stats_additions = وحدثت
 activity.git_stats_addition_1 = %d إضافة
 activity.git_stats_addition_n = %d إضافة
-activity.git_stats_and_deletions = و 
+activity.git_stats_and_deletions = `و"`
 activity.git_stats_deletion_1 = %d إزالة
 activity.git_stats_deletion_n = %d إزالة
 settings.mirror_settings.direction = الاتجاه
diff --git a/options/locale/locale_bg.ini b/options/locale/locale_bg.ini
index ca11b20ff2..1387bdd0e2 100644
--- a/options/locale/locale_bg.ini
+++ b/options/locale/locale_bg.ini
@@ -846,7 +846,7 @@ editor.propose_file_change = Предлагане на промяна на фа
 editor.create_new_branch = Създаване на нов клон за това подаване и започване на заявка за сливане.
 editor.create_new_branch_np = Създаване на нов клон за това подаване.
 editor.filename_is_invalid = Името на файла е невалидно: „%s“.
-editor.commit_directly_to_this_branch = Подаване директно към клона %s.
+editor.commit_directly_to_this_branch = Подаване директно към клона %[1]s.
 editor.branch_already_exists = Клонът „%s“ вече съществува в това хранилище.
 editor.file_already_exists = Файл с име „%s“ вече съществува в това хранилище.
 editor.commit_empty_file_header = Подаване на празен файл
@@ -997,7 +997,7 @@ pulls.cmd_instruction_hint = Вижте инструкциите за коман
 pulls.showing_only_single_commit = Показани са само промените в подаване %[1]s
 issues.lock_no_reason = заключи и ограничи обсъждането до сътрудници %s
 pulls.expand_files = Разгъване на всички файлове
-pulls.title_desc_few = иска да слее %[1]d подавания от %[2]s в %[3]s
+pulls.title_desc_few = иска да слее %[1]d подавания от %[2]s в %[3]s
 issues.content_history.deleted = изтрито
 activity.git_stats_exclude_merges = С изключение на сливанията,
 activity.navbar.pulse = Последна дейност
@@ -1017,7 +1017,7 @@ pulls.collapse_files = Свиване на всички файлове
 pulls.show_all_commits = Показване на всички подавания
 diff.whitespace_button = Празни знаци
 issues.content_history.edited = редактирано
-pulls.title_desc_one = иска да слее %[1]d подаване от %[2]s в %[3]s
+pulls.title_desc_one = иска да слее %[1]d подаване от %[2]s в %[3]s
 pulls.showing_specified_commit_range = Показани са само промените между %[1]s..%[2]s
 pulls.merged_title_desc_one = сля %[1]d подаване от %[2]s в %[3]s %[4]s
 pulls.no_merge_access = Не сте упълномощени за сливане на тази заявка за сливане.
diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
index 829df0124f..a400aed94b 100644
--- a/options/locale/locale_cs-CZ.ini
+++ b/options/locale/locale_cs-CZ.ini
@@ -1036,7 +1036,7 @@ blocked_users = Zablokovaní uživatelé
 change_password = Změnit heslo
 user_block_success = Uživatel byl úspěšně zablokován.
 user_unblock_success = Uživatel byl úspěšně odblokován.
-access_token_desc = Oprávnění vybraného tokenu omezují autorizaci pouze na příslušné cesty API. Pro více informací si přečtěte dokumentaci.
+access_token_desc = Oprávnění vybraného tokenu omezují autorizaci pouze na příslušné cesty API. Pro více informací si přečtěte dokumentaci.
 blocked_users_none = Nemáte žádné zablokované uživatele.
 blocked_since = Zablokován od %s
 hints = Nápovědy
@@ -1360,7 +1360,7 @@ editor.fail_to_apply_patch=Nelze použít záplatu „%s“
 editor.new_patch=Nová záplata
 editor.commit_message_desc=Přidat volitelný rozšířený popis…
 editor.signoff_desc=Přidat Signed-off-by podpis přispěvatele na konec zprávy o commitu.
-editor.commit_directly_to_this_branch=Odeslat přímo do větve %s.
+editor.commit_directly_to_this_branch=Odeslat přímo do větve %[1]s.
 editor.create_new_branch=Vytvořit novou větev pro tento commit a vytvořit žádost o sloučení.
 editor.create_new_branch_np=Vytvořte novou větev z tohoto commitu.
 editor.propose_file_change=Navrhnout změnu souboru
@@ -1725,7 +1725,7 @@ issues.error_modifying_due_date=Změna termínu dokončení selhala.
 issues.error_removing_due_date=Odstranění termínu dokončení selhalo.
 issues.push_commit_1=přidal/a %d commit %s
 issues.push_commits_n=přidal/a %d commity %s
-issues.force_push_codes=`vynucené nahrání %[1]s od %[2]s do %[4]s %[6]s`
+issues.force_push_codes=`vynucené nahrání %[1]s od %[2]s do %[4]s %[6]s`
 issues.force_push_compare=Porovnat
 issues.due_date_form=rrrr-mm-dd
 issues.due_date_form_add=Přidat termín dokončení
@@ -1841,7 +1841,7 @@ pulls.nothing_to_compare_have_tag=Vybraná větev/značka je stejná.
 pulls.nothing_to_compare_and_allow_empty_pr=Tyto větve jsou stejné. Tato žádost o sloučení bude prázdná.
 pulls.has_pull_request=`Žádost o sloučení mezi těmito větvemi již existuje: %[2]s#%[3]d`
 pulls.create=Vytvořit žádost o sloučení
-pulls.title_desc_few=chce sloučit %[1]d commity z větve %[2]s do %[3]s
+pulls.title_desc_few=chce sloučit %[1]d commity z větve %[2]s do %[3]s
 pulls.merged_title_desc_few=sloučil %[1]d commity z větve %[2]s do větve %[3]s před %[4]s
 pulls.change_target_branch_at=`změnil/a cílovou větev z %s na %s %s`
 pulls.tab_conversation=Konverzace
@@ -2765,7 +2765,7 @@ settings.protect_enable_merge_desc = Kdokoli s přístupem k zápisu bude moci s
 settings.archive.text = Archivováním repozitáře jej celý převedete do stavu pouze pro čtení. Bude skryt z nástěnky. Nikdo (ani vy!) nebude moci vytvářet nové commity ani otevírat problémy a žádosti o sloučení.
 settings.event_pull_request_review_request_desc = Bylo požádáno o posouzení žádosti o sloučení nebo bylo toto požádání odstraněno.
 error.broken_git_hook = Zdá se, že u tohoto repozitáře jsou rozbité Git hooks. Pro jejich opravení se prosím řiďte pokyny v dokumentaci a poté odešlete několik commitů pro obnovení stavu.
-pulls.title_desc_one = žádá o sloučení %[1]d commitu z %[2]s do %[3]s
+pulls.title_desc_one = žádá o sloučení %[1]d commitu z %[2]s do %[3]s
 pulls.merged_title_desc_one = sloučil %[1]d commit z %[2]s do %[3]s %[4]s
 open_with_editor = Otevřít pomocí %s
 commits.search_branch = Tato větev
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
index 997dd8c2a0..b96d185142 100644
--- a/options/locale/locale_de-DE.ini
+++ b/options/locale/locale_de-DE.ini
@@ -936,7 +936,7 @@ select_permissions=Berechtigungen auswählen
 permission_no_access=Kein Zugriff
 permission_read=Lesen
 permission_write=Lesen und Schreiben
-access_token_desc=Ausgewählte Token-Berechtigungen beschränken die Authentifizierung auf die entsprechenden API-Routen. Lies die Dokumentation für mehr Informationen.
+access_token_desc=Ausgewählte Token-Berechtigungen beschränken die Authentifizierung auf die entsprechenden API-Routen. Lies die Dokumentation für mehr Informationen.
 at_least_one_permission=Du musst mindestens eine Berechtigung auswählen, um ein Token zu erstellen
 permissions_list=Berechtigungen:
 
@@ -1353,7 +1353,7 @@ editor.fail_to_apply_patch=Patch „%s“ nicht anwendbar
 editor.new_patch=Neuer Patch
 editor.commit_message_desc=Eine ausführlichere (optionale) Beschreibung hinzufügen …
 editor.signoff_desc=Am Ende der Commit-Nachricht einen „Signed-off-by“-Anhang vom Committer hinzufügen.
-editor.commit_directly_to_this_branch=Direkt in den Branch „%s“ einchecken.
+editor.commit_directly_to_this_branch=Direkt in den Branch „%[1]s“ einchecken.
 editor.create_new_branch=Einen neuen Branch für diesen Commit erstellen und einen Pull-Request starten.
 editor.create_new_branch_np=Erstelle einen neuen Branch für diesen Commit.
 editor.propose_file_change=Dateiänderung vorschlagen
@@ -1719,7 +1719,7 @@ issues.error_modifying_due_date=Fehler beim Ändern des Fälligkeitsdatums.
 issues.error_removing_due_date=Fehler beim Entfernen des Fälligkeitsdatums.
 issues.push_commit_1=hat %d Commit %s hinzugefügt
 issues.push_commits_n=hat %d Commits %s hinzugefügt
-issues.force_push_codes=`hat %[6]s %[1]s von %[2]s zu %[4]s force-gepusht`
+issues.force_push_codes=`hat %[6]s %[1]s von %[2]s zu %[4]s force-gepusht`
 issues.force_push_compare=Vergleichen
 issues.due_date_form=JJJJ-MM-TT
 issues.due_date_form_add=Fälligkeitsdatum hinzufügen
@@ -1834,7 +1834,7 @@ pulls.nothing_to_compare=Diese Branches sind identisch. Es muss kein Pull-Reques
 pulls.nothing_to_compare_and_allow_empty_pr=Diese Branches sind gleich. Der Pull-Request wird leer sein.
 pulls.has_pull_request=`Es existiert bereits ein Pull-Request zwischen diesen beiden Branches: %[2]s#%[3]d`
 pulls.create=Pull-Request erstellen
-pulls.title_desc_few=möchte %[1]d Commits von %[2]s nach %[3]s zusammenführen
+pulls.title_desc_few=möchte %[1]d Commits von %[2]s nach %[3]s zusammenführen
 pulls.merged_title_desc_few=hat %[1]d Commits von %[2]s nach %[3]s %[4]s zusammengeführt
 pulls.change_target_branch_at=`hat den Zielbranch von %s nach %s %s geändert`
 pulls.tab_conversation=Diskussion
@@ -2751,7 +2751,7 @@ activity.navbar.code_frequency = Code-Frequenz
 file_follow = Symlink folgen
 error.broken_git_hook = Die Git-Hooks des Repositorys scheinen kaputt zu sein. Bitte folge der Dokumentation um sie zu reparieren, dann pushe einige Commits um den Status zu aktualisieren.
 pulls.merged_title_desc_one = hat %[1]d Commit von %[2]s nach %[3]s %[4]s zusammengeführt
-pulls.title_desc_one = möchte %[1]d Commit von %[2]s nach %[3]s zusammenführen
+pulls.title_desc_one = möchte %[1]d Commit von %[2]s nach %[3]s zusammenführen
 open_with_editor = Öffnen mit %s
 commits.search_branch = Dieser Branch
 pulls.ready_for_review = Bereit zum Review?
diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini
index 05af282d5a..d6b617bcd2 100644
--- a/options/locale/locale_el-GR.ini
+++ b/options/locale/locale_el-GR.ini
@@ -932,7 +932,7 @@ select_permissions=Επιλογή δικαιωμάτων
 permission_no_access=Καμία πρόσβαση
 permission_read=Αναγνωσμένες
 permission_write=Ανάγνωση και εγγραφή
-access_token_desc=Τα επιλεγμένα δικαιώματα διακριτικών περιορίζουν την άδεια μόνο στις αντίστοιχες διαδρομές API. Διαβάστε το εγχειρίδιο  για περισσότερες πληροφορίες.
+access_token_desc=Τα επιλεγμένα δικαιώματα διακριτικών περιορίζουν την άδεια μόνο στις αντίστοιχες διαδρομές API. Διαβάστε το εγχειρίδιο  για περισσότερες πληροφορίες.
 at_least_one_permission=Πρέπει να επιλέξετε τουλάχιστον ένα δικαίωμα για να δημιουργήσετε ένα διακριτικό
 permissions_list=Δικαιώματα:
 
@@ -1350,7 +1350,7 @@ editor.fail_to_apply_patch=`Αδυναμία εφαρμογής της επιδ
 editor.new_patch=Νέο patch
 editor.commit_message_desc=Προσθήκη προαιρετικής εκτενούς περιγραφής…
 editor.signoff_desc=Προσθέστε ένα πρόσθετο Signed-off-by στο τέλος του μηνύματος καταγραφής της υποβολής.
-editor.commit_directly_to_this_branch=Υποβολή απευθείας στο κλάδο %s.
+editor.commit_directly_to_this_branch=Υποβολή απευθείας στο κλάδο %[1]s.
 editor.create_new_branch=Δημιουργήστε έναν νέο κλάδο για αυτή την υποβολή και ξεκινήστε ένα pull request.
 editor.create_new_branch_np=Δημιουργήστε έναν νέο κλάδο για αυτή την υποβολή.
 editor.propose_file_change=Πρόταση αλλαγής αρχείου
@@ -1716,7 +1716,7 @@ issues.error_modifying_due_date=Προέκυψε σφάλμα κατά την α
 issues.error_removing_due_date=Προέκυψε σφάλμα κατά την κατάργηση ημερομηνίας παράδοσης.
 issues.push_commit_1=πρόσθεσε %d υποβολή %s
 issues.push_commits_n=πρόσθεσε %d υποβολές %s
-issues.force_push_codes=`έκανε force-push %[1]s από το %[2]s στο %[4]s %[6]s`
+issues.force_push_codes=`έκανε force-push %[1]s από το %[2]s στο %[4]s %[6]s`
 issues.force_push_compare=Σύγκριση
 issues.due_date_form=εεεε-μμ-ηη
 issues.due_date_form_add=Προσθήκη ημερομηνίας παράδοσης
@@ -1831,7 +1831,7 @@ pulls.nothing_to_compare=Αυτοί οι κλάδοι είναι ίδιοι. Δ
 pulls.nothing_to_compare_and_allow_empty_pr=Αυτοί οι κλάδοι είναι ίδιοι. Αυτό το PR θα είναι κενό.
 pulls.has_pull_request=`Υπάρχει ήδη pull request μεταξύ αυτών των κλάδων: %[2]s#%[3]d`
 pulls.create=Δημιουργία pull request
-pulls.title_desc_few=θέλει να συγχωνεύσει %[1]d υποβολές από %[2]s σε %[3]s
+pulls.title_desc_few=θέλει να συγχωνεύσει %[1]d υποβολές από %[2]s σε %[3]s
 pulls.merged_title_desc_few=συγχώνευσε %[1]d υποβολές από %[2]s σε %[3]s %[4]s
 pulls.change_target_branch_at=`άλλαξε τον κλάδο προορισμού από %s σε %s %s`
 pulls.tab_conversation=Συζήτηση
@@ -2744,7 +2744,7 @@ n_commit_one = %s υποβολή
 stars = Αστέρια
 n_branch_one = %s κλάδος
 commits.search_branch = Αυτός ο κλάδος
-pulls.title_desc_one = : θα ήθελε να συγχωνεύσει %[1]d υποβολή από τον κλάδο %[2]s στον κλάδο %[3]s
+pulls.title_desc_one = : θα ήθελε να συγχωνεύσει %[1]d υποβολή από τον κλάδο %[2]s στον κλάδο %[3]s
 pulls.merged_title_desc_one = συγχώνευσε %[1]d υποβολή από τον κλάδο %[2]s στον κλάδο %[3]s %[4]s
 n_commit_few = %s υποβολές
 settings.sourcehut_builds.secrets = Μυστικά
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 289b8aa17f..0700ee1624 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -935,7 +935,7 @@ select_permissions = Select permissions
 permission_no_access = No access
 permission_read = Read
 permission_write = Read and write
-access_token_desc = Selected token permissions limit authorization only to the corresponding API routes. Read the documentation for more information.
+access_token_desc = Selected token permissions limit authorization only to the corresponding API routes. Read the documentation for more information.
 at_least_one_permission = You must select at least one permission to create a token
 permissions_list = Permissions:
 
@@ -1372,7 +1372,7 @@ editor.fail_to_apply_patch = Unable to apply patch "%s"
 editor.new_patch = New patch
 editor.commit_message_desc = Add an optional extended description…
 editor.signoff_desc = Add a Signed-off-by trailer by the committer at the end of the commit log message.
-editor.commit_directly_to_this_branch = Commit directly to the %s branch.
+editor.commit_directly_to_this_branch = Commit directly to the %[1]s branch.
 editor.create_new_branch = Create a new branch for this commit and start a pull request.
 editor.create_new_branch_np = Create a new branch for this commit.
 editor.propose_file_change = Propose file change
@@ -1740,7 +1740,7 @@ issues.time_spent_from_all_authors = `Total time spent: %s`
 issues.due_date = Due date
 issues.push_commit_1 = added %d commit %s
 issues.push_commits_n = added %d commits %s
-issues.force_push_codes = `force-pushed %[1]s from %[2]s to %[4]s %[6]s`
+issues.force_push_codes = `force-pushed %[1]s from %[2]s to %[4]s %[6]s`
 issues.force_push_compare = Compare
 issues.due_date_form = yyyy-mm-dd
 issues.due_date_form_edit = Edit
@@ -1859,8 +1859,8 @@ pulls.nothing_to_compare_have_tag = The selected branch/tag are equal.
 pulls.nothing_to_compare_and_allow_empty_pr = These branches are equal. This PR will be empty.
 pulls.has_pull_request = `A pull request between these branches already exists: %[2]s#%[3]d`
 pulls.create = Create pull request
-pulls.title_desc_one = wants to merge %[1]d commit from %[2]s into %[3]s
-pulls.title_desc_few = wants to merge %[1]d commits from %[2]s into %[3]s
+pulls.title_desc_one = wants to merge %[1]d commit from %[2]s into %[3]s
+pulls.title_desc_few = wants to merge %[1]d commits from %[2]s into %[3]s
 pulls.merged_title_desc_one = merged %[1]d commit from %[2]s into %[3]s %[4]s
 pulls.merged_title_desc_few = merged %[1]d commits from %[2]s into %[3]s %[4]s
 pulls.change_target_branch_at = `changed target branch from %s to %s %s`
diff --git a/options/locale/locale_eo.ini b/options/locale/locale_eo.ini
index 1c36206eb1..64b1908b46 100644
--- a/options/locale/locale_eo.ini
+++ b/options/locale/locale_eo.ini
@@ -202,7 +202,6 @@ app_desc = Senpena kaj memgastigebla Git-servo
 install = Facile instalebla
 lightweight = Malpeza
 license = Libera fontkodo
-platform_desc = Forgejo ruleblas ĉie ajn Go bittradukeblas: Windows, macOS, Linux, ARM, etc. Elektu laŭplaĉe!
 install_desc = Simple aŭ prenu la ruldosieron por via operaciumo, aŭ instalu enuje per Docker, aŭ instalu pakaĵe.
 lightweight_desc = Forgejo ne penigos vian servilon, kaj eĉ ruleblas je Raspberry Pi. Konservu vian komputpotencon!
 platform = Plursistema
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
index 0c06cdcece..1a6ac696d3 100644
--- a/options/locale/locale_es-ES.ini
+++ b/options/locale/locale_es-ES.ini
@@ -932,7 +932,7 @@ select_permissions=Seleccionar permisos
 permission_no_access=Sin acceso
 permission_read=Leídas
 permission_write=Lectura y escritura
-access_token_desc=Los permisos de los tokens seleccionados limitan la autorización sólo a las rutas API correspondientes. Lea la documentación para más información.
+access_token_desc=Los permisos de los tokens seleccionados limitan la autorización sólo a las rutas >API correspondientes. Lea la >documentación para más información.
 at_least_one_permission=Debe seleccionar al menos un permiso para crear un token
 permissions_list=Permisos:
 
@@ -1349,7 +1349,7 @@ editor.fail_to_apply_patch=`No se puede aplicar el parche "%s"`
 editor.new_patch=Nuevo parche
 editor.commit_message_desc=Añadir una descripción extendida opcional…
 editor.signoff_desc=Añadir un trailer firmado por el committer al final del mensaje de registro de confirmación.
-editor.commit_directly_to_this_branch=Hacer commit directamente en la rama %s.
+editor.commit_directly_to_this_branch=Hacer commit directamente en la rama %[1]s.
 editor.create_new_branch=Crear una nueva rama para este commit y hacer un pull request.
 editor.create_new_branch_np=Crear una nueva rama para este commit.
 editor.propose_file_change=Proponer cambio de archivo
@@ -1715,7 +1715,7 @@ issues.error_modifying_due_date=Fallo al modificar la fecha de vencimiento.
 issues.error_removing_due_date=Fallo al eliminar la fecha de vencimiento.
 issues.push_commit_1=añadió %d commit %s
 issues.push_commits_n=añadió %d commits %s
-issues.force_push_codes=`hizo push forzado %[1]s de %[2]s a %[4]s %[6]s`
+issues.force_push_codes=`hizo push forzado %[1]s de %[2]s a %[4]s %[6]s`
 issues.force_push_compare=Comparar
 issues.due_date_form=aaaa-mm-dd
 issues.due_date_form_add=Añadir fecha de vencimiento
@@ -1830,7 +1830,7 @@ pulls.nothing_to_compare=Estas ramas son iguales. No hay necesidad para crear un
 pulls.nothing_to_compare_and_allow_empty_pr=Estas ramas son iguales. Este PR estará vacío.
 pulls.has_pull_request=`Ya existe un pull request entre estas ramas: %[2]s#%[3]d`
 pulls.create=Crear pull request
-pulls.title_desc_few=quiere fusionar %[1]d commits de %[2]s en %[3]s
+pulls.title_desc_few=quiere fusionar %[1]d commits de %[2]s en %[3]s
 pulls.merged_title_desc_few=fusionó %[1]d commits de %[2]s en %[3]s %[4]s
 pulls.change_target_branch_at=`cambió la rama objetivo de %s a %s %s`
 pulls.tab_conversation=Conversación
@@ -2735,7 +2735,7 @@ pulls.blocked_by_user = No puedes crear una pull request en este repositorio por
 issues.comment.blocked_by_user = No puedes crear un comentario en esta incidencia porque estás bloqueado por el propietario del repositorio o el autor de la incidencia.
 comments.edit.already_changed = No fue posible guardar los cambios al comentario. Parece que el contenido ya fue modificado por otro usuario. Actualiza la página e intenta editar de nuevo para evitar sobrescribir los cambios
 pulls.edit.already_changed = No fue posible guardar los cambios al pull request. Parece que el contenido ya fue modificado por otro usuario. Actualiza la página e intenta editar de nuevo para evitar sobrescribir los cambios
-pulls.title_desc_one = quiere fusionar %[1]d commit de %[2]s en %[3]s
+pulls.title_desc_one = quiere fusionar %[1]d commit de %[2]s en %[3]s
 pulls.ready_for_review = Listo para revisar?
 activity.navbar.contributors = Contribuidores
 pulls.cmd_instruction_hint = Ver instrucciones para la línea de comandos
diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini
index a9e150a7cb..297785a0c8 100644
--- a/options/locale/locale_fa-IR.ini
+++ b/options/locale/locale_fa-IR.ini
@@ -149,7 +149,6 @@ missing_csrf=درخواست بد: بلیط CSRF ندارد
 app_desc=یک سرویس گیت بی‌درد سر و راحت
 install=راه‌اندازی ساده
 platform=مستقل از سکو
-platform_desc=گیت همه جا اجرا می‌شود  بریم! می‌توانید Windows, macOS, Linux, ARM و ... هر کدام را دوست داشتید انتخاب کنید!
 lightweight=ابزارک سبک
 lightweight_desc=گیتی با حداقل منابع میتوانید برای روی دستگاه Raspberry Pi اجرا شود و مصرف انرژی شما را کاهش دهد!
 license=متن باز
@@ -985,7 +984,7 @@ editor.commit_changes=تغییرات کامیت
 editor.add_tmpl=افزودن ''
 editor.commit_message_desc=توضیحی تخصصی به دلخواه اضافه نمایید…
 editor.signoff_desc=یک تریلر Signed-off-by توسط committer در انتهای پیام گزارش commit اضافه کنید.
-editor.commit_directly_to_this_branch=ثبت کامیت به صورت مستقیم در انشعاب %s.
+editor.commit_directly_to_this_branch=ثبت کامیت به صورت مستقیم در انشعاب %[1]s.
 editor.create_new_branch=یک  شاخه جدید برای این commit ایجاد کنید و تقاضای واکشی را شروع کنید.
 editor.create_new_branch_np=یک  شاخه جدید  برای کامیت بسازید.
 editor.propose_file_change=پیشنهاد تغییر پرونده
@@ -1254,7 +1253,7 @@ issues.error_modifying_due_date=تغییر موعد مقرر با شکست مو
 issues.error_removing_due_date=حذف موعد مقرر با شکست مواجه شد.
 issues.push_commit_1=%d اعمال تغییر اضافه شده است %s
 issues.push_commits_n=%d اعمال تغییرات اضافه شده است %s
-issues.force_push_codes=`پوش شده اجباری %[1]s از %[2]s به %[4]s %[6]s`
+issues.force_push_codes=`پوش شده اجباری %[1]s از %[2]s به %[4]s %[6]s`
 issues.force_push_compare=مقایسه
 issues.due_date_form=yyyy-mm-dd
 issues.due_date_form_add=افزودن موعد مقرر
@@ -1340,7 +1339,7 @@ pulls.nothing_to_compare=این شاخه‎ها یکی هستند. نیازی ب
 pulls.nothing_to_compare_and_allow_empty_pr=این شاخه ها برابر هستند. این PR خالی خواهد بود.
 pulls.has_pull_request=`A درخواست pull بین این شاخه ها از قبل وجود دارد: %[2]s#%[3]d`
 pulls.create=ایجاد تقاضای واکشی
-pulls.title_desc_few=قصد ادغام %[1]d تغییر را از %[2]s به %[3]s دارد
+pulls.title_desc_few=قصد ادغام %[1]d تغییر را از %[2]s به %[3]s دارد
 pulls.merged_title_desc_few=%[1]d کامیت ادغام شده از %[2]s به %[3]s %[4]s
 pulls.change_target_branch_at=`هدف شاخه از %s به %s %s تغییر کرد`
 pulls.tab_conversation=گفتگو
diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini
index 2ccbbf0978..bae6c8e59d 100644
--- a/options/locale/locale_fi-FI.ini
+++ b/options/locale/locale_fi-FI.ini
@@ -928,7 +928,7 @@ editor.cancel_lower=Peru
 editor.commit_signed_changes=Commitoi vahvistetut muutokset
 editor.commit_changes=Kommitoi muutokset
 editor.add_tmpl=Lisää ""
-editor.commit_directly_to_this_branch=Commitoi suoraan %s haaraan.
+editor.commit_directly_to_this_branch=Commitoi suoraan %[1]s haaraan.
 editor.create_new_branch=Luo uusi haara tälle commitille ja aloita vetopyyntö.
 editor.create_new_branch_np=Luo uusi haara tälle commitille.
 editor.cancel=Peruuta
@@ -1148,7 +1148,7 @@ pulls.nothing_to_compare=Nämä haarat vastaavat toisiaan. Ei ole tarvetta luoda
 pulls.nothing_to_compare_and_allow_empty_pr=Nämä haarat vastaavat toisiaan. Vetopyyntö tulee olemaan tyhjä.
 pulls.has_pull_request=`Vetopyyntö haarojen välillä on jo olemassa: %[2]s#%[3]d`
 pulls.create=Luo vetopyyntö
-pulls.title_desc_few=haluaa yhdistää %[1]d committia lähteestä %[2]s kohteeseen %[3]s
+pulls.title_desc_few=haluaa yhdistää %[1]d committia lähteestä %[2]s kohteeseen %[3]s
 pulls.merged_title_desc_few=yhdistetty %[1]d committia lähteestä %[2]s kohteeseen %[3]s %[4]s
 pulls.tab_conversation=Keskustelu
 pulls.tab_commits=Commitit
@@ -2447,7 +2447,7 @@ runners.runner_manage_panel = Hallinnoi testinajajia
 variables = Muuttujat
 variables.management = Hallinnoi muuttujia
 variables.creation = Lisää muuttuja
-runs.no_workflows.quick_start = Etkö tiedä kuinka Forgejo Actions toimii? Katso aloitusohje.
+runs.no_workflows.quick_start = Etkö tiedä kuinka Forgejo Actions toimii? Katso aloitusohje.
 runners.new = Luo uusi testinajaja
 runners.version = Versio
 runs.expire_log_message = Lokitiedostot on tyhjätty vanhenemisen vuoksi.
diff --git a/options/locale/locale_fil.ini b/options/locale/locale_fil.ini
index 6bc508020c..15353be168 100644
--- a/options/locale/locale_fil.ini
+++ b/options/locale/locale_fil.ini
@@ -766,7 +766,7 @@ ssh_principal_deletion_success = Tinanggal na ang principal.
 principal_state_desc = Ginamit ang principal na ito sa huling 7 araw
 tokens_desc = Ang mga token na ito ay nagbibigay ng pag-access sa iyong account gamit ang Forgejo API.
 generate_token_name_duplicate = Ginamit na ang %s bilang isang pangalan ng application. Gumamit ng bago.
-access_token_desc = Ang mga piniling pahintulot sa token ay nililimitahan ang awtorisasyon sa mga kakulang na API route. Basahin ang dokumentasyon para sa higit pang impormasyon.
+access_token_desc = Ang mga piniling pahintulot sa token ay nililimitahan ang awtorisasyon sa mga kakulang na API route. Basahin ang dokumentasyon para sa higit pang impormasyon.
 uploaded_avatar_is_too_big = Ang laki ng na-upload na file (%d KiB) ay lumalagpas sa pinakamalaking laki (%d KiB).
 update_avatar_success = Nabago na ang iyong avatar.
 update_user_avatar_success = Nabago na ang avatar ng user.
@@ -1482,7 +1482,7 @@ milestones.title = Pamagat
 milestones.desc = paglalarawan
 pulls.blocked_by_user = Hindi ka makakagawa ng hiling sa paghila sa repositoryo na ito dahil na-block ka ng may-ari ng repositoryo.
 pulls.no_merge_access = Hindi ka pinapayagang isali ang [pull request] na ito.
-editor.commit_directly_to_this_branch = Direktang mag-commit sa branch na %s.
+editor.commit_directly_to_this_branch = Direktang mag-commit sa branch na %[1]s.
 editor.branch_already_exists = Umiiral na ang branch na "%s" sa repositoryo na ito.
 editor.file_editing_no_longer_exists = Ang file na ine-edit, "%s", ay hindi na umiiral sa repositoryo na ito.
 editor.filename_is_a_directory = Ang pangalan ng file "%s" ay ginagamit na bilang pangalan ng direktoryo sa repositoryo na ito.
@@ -1584,12 +1584,12 @@ projects.column.new_title = Pangalan
 projects.card_type.desc = Mga preview ng card
 commits.desc = I-browse ang history ng pagbabago ng source code.
 commits.search.tooltip = Maari kang mag-prefix ng mga keyword gamit ang "author:", "committer:", "after:", o "before:", hal. "revert author:Nijika before:2022-10-09".
-issues.force_push_codes = `puwersahang itinulak ang %[1]s mula %[2]s sa %[4]s %[6]s`
+issues.force_push_codes = `puwersahang itinulak ang %[1]s mula %[2]s sa %[4]s %[6]s`
 issues.push_commit_1 = idinagdag ang %d commit %s
 issues.push_commits_n = idinagdag ang %d mga [commit] %s
 issues.new.no_reviewers = Walang mga tagasuri
-pulls.title_desc_one = hinihiling na isama ang %[1]d commit mula %[2]s patungong %[3]s
-pulls.title_desc_few = hiniling na isama ang %[1]d mga commit mula sa %[2]s patungong %[3]s
+pulls.title_desc_one = hinihiling na isama ang %[1]d commit mula %[2]s patungong %[3]s
+pulls.title_desc_few = hiniling na isama ang %[1]d mga commit mula sa %[2]s patungong %[3]s
 issues.review.add_review_request = hiniling ang pagsuri mula kay %s %s
 pulls.status_checks_details = Mga detalye
 activity.git_stats_author_n = %d mga may-akda
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
index e26a36867d..d914b558e8 100644
--- a/options/locale/locale_fr-FR.ini
+++ b/options/locale/locale_fr-FR.ini
@@ -223,7 +223,7 @@ platform_desc=Forgejo est confirmé fonctionner sur des systèmes d'exploitation
 lightweight=Léger
 lightweight_desc=Forgejo utilise peu de ressources. Il peut même tourner sur un Raspberry Pi très bon marché. Économisez l'énergie de vos serveurs !
 license=Open Source
-license_desc=Toutes les sources sont sur Forgejo ! Rejoignez-nous et contribuez à rendre ce projet encore meilleur. Ne craignez pas de devenir un·e contributeur·trice !
+license_desc=Toutes les sources sont sur Forgejo ! Rejoignez-nous et contribuez à rendre ce projet encore meilleur. Ne craignez pas de devenir un·e contributeur·trice !
 
 [install]
 install=Installation
@@ -938,7 +938,7 @@ select_permissions=Sélectionner les autorisations
 permission_no_access=Aucun accès
 permission_read=Lecture
 permission_write=Lecture et écriture
-access_token_desc=Les autorisations des jetons sélectionnées se limitent aux routes API correspondantes. Lisez la documentation pour plus d’informations.
+access_token_desc=Les autorisations des jetons sélectionnées se limitent aux routes API correspondantes. Lisez la documentation pour plus d’informations.
 at_least_one_permission=Vous devez sélectionner au moins une permission pour créer un jeton
 permissions_list=Autorisations :
 
@@ -1360,7 +1360,7 @@ editor.fail_to_apply_patch=`Impossible d'appliquer le correctif "%s"`
 editor.new_patch=Nouveau correctif
 editor.commit_message_desc=Ajouter une description détaillée facultative…
 editor.signoff_desc=Créditer l'auteur "Signed-off-by:" en pied de révision.
-editor.commit_directly_to_this_branch=Réviser directement dans la branche %s.
+editor.commit_directly_to_this_branch=Réviser directement dans la branche %[1]s.
 editor.create_new_branch=Créer une nouvelle branche pour cette révision et initier une demande d'ajout.
 editor.create_new_branch_np=Créer une nouvelle branche pour cette révision.
 editor.propose_file_change=Proposer une modification du fichier
@@ -1726,7 +1726,7 @@ issues.error_modifying_due_date=Impossible de modifier l'échéance.
 issues.error_removing_due_date=Impossible de supprimer l'échéance.
 issues.push_commit_1=a ajouté %d révision %s
 issues.push_commits_n=a ajouté %d révisions %s
-issues.force_push_codes=`a forcé %[1]s de %[2]s à %[4]s %[6]s.`
+issues.force_push_codes=`a forcé %[1]s de %[2]s à %[4]s %[6]s.`
 issues.force_push_compare=Comparer
 issues.due_date_form=aaaa-mm-jj
 issues.due_date_form_add=Ajouter une échéance
@@ -1841,7 +1841,7 @@ pulls.nothing_to_compare=Ces branches sont identiques. Il n’y a pas besoin de
 pulls.nothing_to_compare_and_allow_empty_pr=Ces branches sont égales. Cette demande d'ajout sera vide.
 pulls.has_pull_request='Il existe déjà une demande d'ajout entre ces deux branches : %[2]s#%[3]d'
 pulls.create=Créer une demande d'ajout
-pulls.title_desc_few=souhaite fusionner %[1]d révision(s) depuis %[2]s vers %[3]s
+pulls.title_desc_few=souhaite fusionner %[1]d révision(s) depuis %[2]s vers %[3]s
 pulls.merged_title_desc_few=a fusionné %[1]d révision(s) à partir de %[2]s vers %[3]s %[4]s
 pulls.change_target_branch_at=`a remplacée la branche cible %s par %s %s`
 pulls.tab_conversation=Discussion
@@ -2765,7 +2765,7 @@ error.broken_git_hook = Les hooks Git de ce dépôt semblent cassés. Référez
 settings.confirmation_string = Chaine de confirmation
 pulls.agit_explanation = Créé par le workflow AGit. AGit permet aux contributeurs de proposer des modifications en utilisant "git push" sans créer une bifurcation ou une nouvelle branche.
 pulls.merged_title_desc_one = fusionné %[1]d commit depuis %[2]s vers %[3]s %[4]s
-pulls.title_desc_one = veut fusionner %[1]d commit depuis %[2]s vers %[3]s
+pulls.title_desc_one = veut fusionner %[1]d commit depuis %[2]s vers %[3]s
 stars = Étoiles
 n_tag_few = %s étiquettes
 editor.commit_id_not_matching = Le fichier a été modifié pendant que vous l'éditiez. Appliquez les modifications à une nouvelle branche puis procédez à la fusion.
diff --git a/options/locale/locale_gl.ini b/options/locale/locale_gl.ini
index 94e915e3bf..74108be0c8 100644
--- a/options/locale/locale_gl.ini
+++ b/options/locale/locale_gl.ini
@@ -181,8 +181,7 @@ user_kind = Buscar usuarios...
 platform = Multiplataforma
 app_desc = Um servizo Git autoxestionado e fácil de usar
 install = Fácil de instalar
-platform_desc = Forgejo execútase en calquera lugar onde Go poida compilar para: Windows, MacOS, Linux, ARM, etc. Escolla seu preferido!
-install_desc = Simplemente executa o binario para a túa plataforma, envíao con < un target="_blank" rel="noopener noreferrer" href="%[2]s">Docker ou consígueo empaquetado.
+install_desc = Simplemente executa o binario para a túa plataforma, envíao con Docker ou consígueo empaquetado.
 
 [error]
 occurred = Ocorreu un erro
diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini
index fd6d48d8b0..aae5a6ad71 100644
--- a/options/locale/locale_hu-HU.ini
+++ b/options/locale/locale_hu-HU.ini
@@ -203,7 +203,6 @@ not_found = A cél nem található.
 app_desc=Fájdalommentes, saját gépre telepíthető Git szolgáltatás
 install=Könnyen telepíthető
 platform=Keresztplatformos
-platform_desc=A Forgejo minden platformon fut, ahol a Go fordíthat: Windows, macOS, Linux, ARM, stb. Válassza azt, amelyet szereti!
 lightweight=Könnyűsúlyú
 license=Nyílt forráskódú
 
@@ -812,7 +811,7 @@ editor.cancel_lower=Mégse
 editor.commit_changes=Változások Véglegesítése
 editor.add_tmpl='' hozzáadása
 editor.commit_message_desc=Opcionális hosszabb leírás hozzáadása…
-editor.commit_directly_to_this_branch=Mentés egyenesen a(z) %s ágba.
+editor.commit_directly_to_this_branch=Mentés egyenesen a(z) %[1]s ágba.
 editor.create_new_branch=Hozzon létre egy új ágat ennek a commit-nak és indíts egy egyesítési kérést.
 editor.propose_file_change=Változtatás ajánlása
 editor.new_branch_name_desc=Új ág neve…
@@ -1033,7 +1032,7 @@ pulls.filter_branch=Ágra szűrés
 pulls.no_results=Nincs találat.
 pulls.nothing_to_compare=Ezek az ágak egyenlőek. Nincs szükség egyesítési kérésre.
 pulls.create=Egyesítési kérés létrehozása
-pulls.title_desc_few=egyesíteni szeretné %[1]d változás(oka)t a(z) %[2]s-ból %[3]s-ba
+pulls.title_desc_few=egyesíteni szeretné %[1]d változás(oka)t a(z) %[2]s-ból %[3]s-ba
 pulls.merged_title_desc_few=egyesítve %[1]d változás(ok) a %[2]s-ból %[3]s-ba %[4]s
 pulls.tab_conversation=Beszélgetés
 pulls.tab_commits=Commit-ok
diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini
index 36f1265c3e..5cd3033119 100644
--- a/options/locale/locale_id-ID.ini
+++ b/options/locale/locale_id-ID.ini
@@ -98,7 +98,6 @@ name=Nama
 app_desc=Sebuah layanan hosting Git sendiri yang tanpa kesulitan
 install=Mudah dipasang
 platform=Lintas platform
-platform_desc=Forgejo bisa digunakan di mana Go bisa dijalankan: Windows, macOS, Linux, ARM, dll. Silahkan pilih yang Anda suka!
 lightweight=Ringan
 lightweight_desc=Forgejo hanya membutuhkan persyaratan minimal dan bisa berjalan pada Raspberry Pi yang murah. Bisa menghemat listrik!
 license=Sumber Terbuka
@@ -623,7 +622,7 @@ editor.cancel_lower=Batalkan
 editor.commit_changes=Perubahan komitmen
 editor.add_tmpl=Tambahkan ''
 editor.commit_message_desc=Tambahkan deskripsi opsional yang panjang…
-editor.commit_directly_to_this_branch=Komitmen langsung ke %s cabang.
+editor.commit_directly_to_this_branch=Komitmen langsung ke %[1]s cabang.
 editor.create_new_branch=Membuat new branch untuk tarik komit ini mulai permintaan.
 editor.create_new_branch_np=Buat cabang baru untuk komit ini.
 editor.propose_file_change=Usul perubahan berkas
@@ -752,7 +751,7 @@ pulls.compare_changes=Permintaan Tarik Baru
 pulls.filter_branch=Penyaringan cabang
 pulls.no_results=Hasil tidak ditemukan.
 pulls.create=Buat Permintaan Tarik
-pulls.title_desc_few=ingin menggabungkan komit %[1]d dari %[2]s menuju %[3]s
+pulls.title_desc_few=ingin menggabungkan komit %[1]d dari %[2]s menuju %[3]s
 pulls.merged_title_desc_few=commit %[1]d telah digabungkan dari %[2]s menjadi %[3]s %[4]s
 pulls.tab_conversation=Percakapan
 pulls.tab_commits=Melakukan
diff --git a/options/locale/locale_is-IS.ini b/options/locale/locale_is-IS.ini
index 0cb6c0f7ab..b07bf4b829 100644
--- a/options/locale/locale_is-IS.ini
+++ b/options/locale/locale_is-IS.ini
@@ -133,7 +133,6 @@ network_error=Netkerfisvilla
 app_desc=Þrautalaus og sjálfhýst Git þjónusta
 install=Einföld uppsetning
 platform=Fjölvettvangur
-platform_desc=Forgejo virkar hvar sem að Go gerir: Linux, macOS, Windows, ARM o. s. frv. Veldu það sem þú vilt!
 lightweight=Létt
 lightweight_desc=Forgejo hefur lágar lágmarkskröfur og getur keyrt á ódýrum Raspberry Pi. Sparaðu orku!
 license=Frjáls Hugbúnaður
@@ -891,7 +890,7 @@ pulls.new=Ný Sameiningarbeiðni
 pulls.view=Skoða Sameiningarbeiðni
 pulls.compare_changes=Ný Sameiningarbeiðni
 pulls.create=Skapa Sameiningarbeiðni
-pulls.title_desc_few=vill sameina %[1]d framlög frá %[2]s í %[3]s
+pulls.title_desc_few=vill sameina %[1]d framlög frá %[2]s í %[3]s
 pulls.tab_conversation=Umræða
 pulls.tab_commits=Framlög
 pulls.tab_files=Skráum Breytt
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
index dc58d62c7c..361c9821f3 100644
--- a/options/locale/locale_it-IT.ini
+++ b/options/locale/locale_it-IT.ini
@@ -217,7 +217,6 @@ server_internal = Errore interno del server
 app_desc=Un servizio auto-ospitato per Git pronto all'uso
 install=Facile da installare
 platform=Multipiattaforma
-platform_desc=Forgejo funziona ovunque Go possa essere compilato: Windows, macOS, Linux, ARM, etc. Scegli ciò che ami!
 lightweight=Leggero
 lightweight_desc=Forgejo ha requisiti minimi bassi e può funzionare su un economico Raspberry Pi. Risparmia l'energia della tua macchina!
 license=Open Source
@@ -1000,7 +999,7 @@ valid_until_date = Valido fino a %s
 ssh_signonly = SSH è attualmente disabilitato quindi queste chiavi sono usate solo per la firma di verifica dei commit.
 social_desc = Questi profili social possono essere usati per accedere al tuo profilo. Assicurati di riconoscerli tutti.
 permission_write = Leggi e scrivi
-access_token_desc = I permessi token selezionati limitano l'autorizzazione solo alle corrispondenti vie API. Leggi la documentazione per ulteriori informazioni.
+access_token_desc = I permessi token selezionati limitano l'autorizzazione solo alle corrispondenti vie API. Leggi la documentazione per ulteriori informazioni.
 create_oauth2_application_success = Hai correttamente creato una nuova applicazione OAuth2.
 update_oauth2_application_success = Hai correttamente aggiornato l'applicazione OAuth2.
 oauth2_redirect_uris = URI per la reindirizzazione. Usa una nuova riga per ogni URI.
@@ -1305,7 +1304,7 @@ editor.patching=Patching:
 editor.new_patch=Nuova Patch
 editor.commit_message_desc=Aggiungi una descrizione estesa facoltativa…
 editor.signoff_desc=Aggiungi "firmato da" dal committer alla fine del messaggio di log di commit.
-editor.commit_directly_to_this_branch=Fai un commit direttamente sul ramo %s.
+editor.commit_directly_to_this_branch=Fai un commit direttamente sul ramo %[1]s.
 editor.create_new_branch=Crea un  nuovo ramo per questo commit e avvia una richiesta di modifica.
 editor.create_new_branch_np=Crea un nuovo ramo per questo commit.
 editor.propose_file_change=Proponi la modifica del file
@@ -1596,7 +1595,7 @@ issues.error_modifying_due_date=Impossibile modificare la scadenza.
 issues.error_removing_due_date=Impossibile rimuovere la scadenza.
 issues.push_commit_1=ha aggiunto %d commit %s
 issues.push_commits_n=ha aggiunto %d commit %s
-issues.force_push_codes=`ha forzato l'immissione %[1]s da %[2]s a %[4]s %[6]s`
+issues.force_push_codes=`ha forzato l'immissione %[1]s da %[2]s a %[4]s %[6]s`
 issues.force_push_compare=Confronta
 issues.due_date_form=aaaa-mm-dd
 issues.due_date_form_add=Aggiungi scadenza
@@ -1693,7 +1692,7 @@ pulls.nothing_to_compare=Questi rami sono uguali. Non c'è bisogno di creare una
 pulls.nothing_to_compare_and_allow_empty_pr=Questi rami sono uguali. Questa richiesta sarà vuota.
 pulls.has_pull_request=`Una richiesta di modifica fra questi rami esiste già: %[2]s#%[3]d`
 pulls.create=Crea richiesta di modifica
-pulls.title_desc_few=vuole unire %[1]d commit da %[2]s a %[3]s
+pulls.title_desc_few=vuole unire %[1]d commit da %[2]s a %[3]s
 pulls.merged_title_desc_few=ha unito %[1]d commit da %[2]s a %[3]s %[4]s
 pulls.change_target_branch_at=`cambiato il ramo di destinazione da %s a %s %s`
 pulls.tab_conversation=Conversazione
@@ -2740,7 +2739,7 @@ settings.ignore_stale_approvals = Ignora approvazioni stantie
 settings.protected_branch_required_rule_name = Nome regola richiesta
 settings.protect_status_check_patterns_desc = Inserisci sequenze per specificare quali controlli dello stato devono passare prima che i rami possano essere fusi con i rami che soddisfano questa regola. Ogni riga specifica una sequenza. Le sequenze non possono essere vuote.
 settings.authorization_header_desc = Verrà inclusa come intestazione dell'autorizzazione per le richieste quando presente. Esempi: %s.
-pulls.title_desc_one = vuole fondere %[1]d commit da %[2]s in %[3]s
+pulls.title_desc_one = vuole fondere %[1]d commit da %[2]s in %[3]s
 settings.protect_unprotected_file_patterns_desc = File non protetti dei quali è consentita la modifica direttamente se l'utente ha permesso di scrittura, saltandole restrizioni di immissione. Più sequenze possono essere separate usando il punto e virgola (";"). Vedi la documentazione su %[2]s per la sintassi delle sequenze glob. Esempi .drone.yml, /docs/**/*.txt.
 settings.protect_protected_file_patterns_desc = I file non protetti non possono essere modificati direttamente neanche se l'utente ha il permesso di aggiungere, modificare o eliminare file in questo ramo. Più sequenze possono essere separate usando il punto e virgola (";"). Vedi la documentazione su %s per la sintassi della sequenze. Esempi: .drone.yml, /docs/**/*.txt.
 settings.protect_no_valid_status_check_patterns = Nessuna sequenza valida per il controllo dello stato.
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
index 3e90125042..c4988edd6e 100644
--- a/options/locale/locale_ja-JP.ini
+++ b/options/locale/locale_ja-JP.ini
@@ -218,7 +218,6 @@ app_desc=自分で立てる、超簡単 Git サービス
 install=簡単インストール
 install_desc=シンプルに、プラットフォームに応じてバイナリを実行したり、Dockerで動かしたり、パッケージを使うだけ。
 platform=クロスプラットフォーム
-platform_desc=ForgejoはGoでコンパイルできる環境ならどこでも動きます: Windows、macOS、Linux、ARM等々、好きなものを選んでください!
 lightweight=軽量
 lightweight_desc=Forgejo の最小動作要件は小さくて、安価な Raspberry Pi でも動きます。エネルギー消費を節約しましょう!
 license=オープンソース
@@ -934,7 +933,7 @@ select_permissions=許可の選択
 permission_no_access=アクセス不可
 permission_read=読み取り
 permission_write=読み取りと書き込み
-access_token_desc=選択したトークン権限に応じて、関連するAPIルートのみに許可が制限されます。 詳細はドキュメントを参照してください。
+access_token_desc=選択したトークン権限に応じて、関連するAPIルートのみに許可が制限されます。 詳細はドキュメントを参照してください。
 at_least_one_permission=トークンを作成するには、少なくともひとつの許可を選択する必要があります
 permissions_list=許可:
 
@@ -1355,7 +1354,7 @@ editor.fail_to_apply_patch=`パッチを適用できません "%s"`
 editor.new_patch=新しいパッチ
 editor.commit_message_desc=詳細な説明を追加…
 editor.signoff_desc=コミットログメッセージの最後にコミッターの Signed-off-by 行を追加
-editor.commit_directly_to_this_branch=ブランチ%sへ直接コミットする。
+editor.commit_directly_to_this_branch=ブランチ%[1]sへ直接コミットする。
 editor.create_new_branch=新しいブランチにコミットしてプルリクエストを作成する。
 editor.create_new_branch_np=新しいブランチにコミットする。
 editor.propose_file_change=ファイル修正を提案
@@ -1721,7 +1720,7 @@ issues.error_modifying_due_date=期日を変更できませんでした。
 issues.error_removing_due_date=期日を削除できませんでした。
 issues.push_commit_1=が %d コミット追加 %s
 issues.push_commits_n=が %d コミット追加 %s
-issues.force_push_codes=`が %[1]s を強制プッシュ ( %[2]s から %[4]s へ ) %[6]s`
+issues.force_push_codes=`が %[1]s を強制プッシュ ( %[2]s から %[4]s へ ) %[6]s`
 issues.force_push_compare=比較
 issues.due_date_form=yyyy-mm-dd
 issues.due_date_form_add=期日の追加
@@ -1836,7 +1835,7 @@ pulls.nothing_to_compare=同じブランチ同士のため、 プルリクエス
 pulls.nothing_to_compare_and_allow_empty_pr=これらのブランチは内容が同じです。 空のプルリクエストになります。
 pulls.has_pull_request=`同じブランチのプルリクエストはすでに存在します: %[2]s#%[3]d`
 pulls.create=プルリクエストを作成
-pulls.title_desc_few=が %[2]s から %[3]s への %[1]d コミットのマージを希望しています
+pulls.title_desc_few=が %[2]s から %[3]s への %[1]d コミットのマージを希望しています
 pulls.merged_title_desc_few=が %[1]d 個のコミットを %[2]s から %[3]s へマージ %[4]s
 pulls.change_target_branch_at=`がターゲットブランチを %s から %s に変更 %s`
 pulls.tab_conversation=会話
@@ -2779,7 +2778,7 @@ issues.archived_label_description = (アーカイブ済) %s
 settings.web_hook_name_sourcehut_builds = SourceHut Builds
 settings.matrix.room_id_helper = ルームIDは、Element web clientのRoom Settings > Advanced > Internal room IDから取得できます。例：%s。
 pulls.merged_title_desc_one = %[4]s の %[2]s から %[1]d 件のコミットを %[3]s へマージした
-pulls.title_desc_one = %[3]s から %[1]d 件のコミットを %[2]s へマージしたい
+pulls.title_desc_one = %[3]s から %[1]d 件のコミットを %[2]s へマージしたい
 pulls.ready_for_review = レビューの準備ができていますか？
 settings.transfer.button = 所有権を移送する
 settings.transfer.modal.title = 所有権を移送
diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini
index 9c5b6ca3c1..5b90b1020b 100644
--- a/options/locale/locale_ko-KR.ini
+++ b/options/locale/locale_ko-KR.ini
@@ -778,7 +778,7 @@ editor.or=혹은
 editor.cancel_lower=취소
 editor.commit_changes=변경 내용을 커밋
 editor.commit_message_desc=선택적 확장 설명 추가…
-editor.commit_directly_to_this_branch=%s 브랜치에서 직접 커밋해주세요.
+editor.commit_directly_to_this_branch=%[1]s 브랜치에서 직접 커밋해주세요.
 editor.create_new_branch=이 커밋에 대한 새로운 브랜치를 만들고 끌어오기 요청을 시작합니다.
 editor.new_branch_name_desc=새로운 브랜치 이름…
 editor.cancel=취소
@@ -973,7 +973,7 @@ pulls.compare_compare=다음으로부터 풀
 pulls.filter_branch=Filter Branch
 pulls.no_results=결과를 찾을 수 없습니다.
 pulls.create=풀 리퀘스트 생성
-pulls.title_desc_few=%[2]s 에서 %[3]s 로 %[1]d개의 커밋들을 병합하려함
+pulls.title_desc_few=%[2]s 에서 %[3]s 로 %[1]d개의 커밋들을 병합하려함
 pulls.merged_title_desc_few=님이 %[2]s 에서 %[3]s 로 %[1]d 커밋을 %[4]s 병합함
 pulls.tab_conversation=대화
 pulls.tab_commits=커밋
@@ -1081,7 +1081,6 @@ contributors.contribution_type.commits=커밋
 
 search=검색
 search.search_repo=저장소 검색
-search.results="%s 에서 \"%s\" 에 대한 검색 결과"
 search.code_no_results=검색어와 일치하는 소스코드가 없습니다.
 
 settings=설정
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
index 48c739bb30..aeaddf3b9c 100644
--- a/options/locale/locale_lv-LV.ini
+++ b/options/locale/locale_lv-LV.ini
@@ -187,7 +187,6 @@ app_desc=Viegli uzstādāms Git serviss
 install=Vienkārši instalējams
 install_desc=Vienkārši jāpalaiž izpildāmais fails vajadzīgajai platformai, jāizmanto Docker, vai jāiegūst pakotne.
 platform=Pieejama dažādām platformām
-platform_desc=Forgejo iespējams uzstādīt jebkur, kam Go var nokompilēt: Windows, macOS, Linux, ARM utt. Izvēlies to, kas tev patīk!
 lightweight=Viegla
 lightweight_desc=Forgejo ir miminālas prasības un to var darbināt uz nedārga Raspberry Pi datora. Ietaupi savai ierīcei resursus!
 license=Atvērtā pirmkoda
@@ -830,7 +829,7 @@ select_permissions=Norādiet tiesības
 permission_no_access=Nav piekļuves
 permission_read=Skatīšanās
 permission_write=Skatīšanās un raksīšanas
-access_token_desc=Atzīmētie pilnvaras apgabali ierobežo autentifikāciju tikai atbilstošiem API izsaukumiem. Sīkāka informācija pieejama dokumentācijā.
+access_token_desc=Atzīmētie pilnvaras apgabali ierobežo autentifikāciju tikai atbilstošiem >API izsaukumiem. Sīkāka informācija pieejama >dokumentācijā.
 at_least_one_permission=Nepieciešams norādīt vismaz vienu tiesību, lai izveidotu pilnvaru
 permissions_list=Tiesības:
 
@@ -1231,7 +1230,7 @@ editor.fail_to_apply_patch=`Neizdevās pielietot ielāpu "%s"`
 editor.new_patch=Jauns ielāps
 editor.commit_message_desc=Pievienot neobligātu paplašinātu aprakstu…
 editor.signoff_desc=Pievienot revīzijas žurnāla ziņojuma beigās Signed-off-by ar revīzijas autoru.
-editor.commit_directly_to_this_branch=Apstiprināt revīzijas izmaiņas atzarā %s.
+editor.commit_directly_to_this_branch=Apstiprināt revīzijas izmaiņas atzarā %[1]s.
 editor.create_new_branch=Izveidot jaunu atzaru un izmaiņu pieprasījumu šai revīzijai.
 editor.create_new_branch_np=Izveidot jaunu atzaru šai revīzijai.
 editor.propose_file_change=Ieteikt faila izmaiņas
@@ -1597,7 +1596,7 @@ issues.error_modifying_due_date=Neizdevās izmainīt izpildes termiņu.
 issues.error_removing_due_date=Neizdevās noņemt izpildes termiņu.
 issues.push_commit_1=iesūtīja %d revīziju %s
 issues.push_commits_n=iesūtīja %d revīzijas %s
-issues.force_push_codes=`veica piespiedu izmaiņu iesūtīšanu atzarā %[1]s no revīzijas %[2]s uz %[4]s %[6]s`
+issues.force_push_codes=`veica piespiedu izmaiņu iesūtīšanu atzarā %[1]s no revīzijas %[2]s uz %[4]s %[6]s`
 issues.force_push_compare=Salīdzināt
 issues.due_date_form=dd.mm.yyyy
 issues.due_date_form_add=Pievienot izpildes termiņu
@@ -1712,7 +1711,7 @@ pulls.nothing_to_compare=Nav ko salīdzināt, jo bāzes un salīdzināmie atzari
 pulls.nothing_to_compare_and_allow_empty_pr=Šie atzari ir vienādi. Izveidotais izmaiņu pieprasījums būs tukšs.
 pulls.has_pull_request=`Izmaiņu pieprasījums starp šiem atzariem jau eksistē: %[2]s#%[3]d`
 pulls.create=Izveidot izmaiņu pieprasījumu
-pulls.title_desc_few=vēlas sapludināt %[1]d revīzijas no %[2]s uz %[3]s
+pulls.title_desc_few=vēlas sapludināt %[1]d revīzijas no %[2]s uz %[3]s
 pulls.merged_title_desc_few=sapludināja %[1]d revīzijas no %[2]s uz %[3]s %[4]s
 pulls.change_target_branch_at=`nomainīja mērķa atzaru no %s uz %s %s`
 pulls.tab_conversation=Saruna
diff --git a/options/locale/locale_nds.ini b/options/locale/locale_nds.ini
index f59e0151a3..46c27fbea1 100644
--- a/options/locale/locale_nds.ini
+++ b/options/locale/locale_nds.ini
@@ -839,7 +839,7 @@ add_email_confirmation_sent = Eene Utwiesens-E-Mail is an »%s« schickt worden.
 ssh_desc = Deese publiken SSH-Slötels sünd mit dienem Konto verbunnen. De tohörig privaate Slötel gifft kumpleten Togriep up diene Repositoriums. SSH-Slötels, wat utwiest worden sünd, könen bruukt worden, um SSH-unnerschreven Git-Kommitterens uttowiesen.
 keep_email_private_popup = Dat word diene E-Mail-Adress vun dienem Profil verburgen. Dann is dat nich mehr de Normaalweert för Kommitterens, wat du över de Internett-Schnittstee maakst, so as Datei-Upladens un Bewarkens, un word nich in Tosamenföhrens-Kommitterens bruukt. In Stee daarvun kann eene besünnere Adress %s bruukt worden, um Kommitterens mit dienem Konto to verbinnen. Wees wiss, dat dat Ännern vun deeser Instellen bestahn Kommitterens nich ännert.
 ssh_helper = Bruukst du Hülp? Kiek de Inföhren an, wo du diene eegenen SSH-Slötels maakst of hülp gewohnten Probleemen of, över wat man mit SSH mennigmaal strukelt.
-access_token_desc = Utköört Teken-Verlöövnissen begrenzen dat Anmellen blots up de tohörig API-Padden. Lees de Dokumenteren för mehr Informatioonen.
+access_token_desc = Utköört Teken-Verlöövnissen begrenzen dat Anmellen blots up de tohörig API-Padden. Lees de Dokumenteren för mehr Informatioonen.
 oauth2_confidential_client = Diskreeter Klient. Köör dat för Programmen ut, wat dat Geheimnis diskreet behanneln, as Internett-Sieden. Köör dat nich för stedenwies Programmen ut, as Schrievdisk- un Telefoon-Programmens.
 gpg_helper = Bruukst du Hülp? Kiek de Inföhren över GPG an.
 gpg_desc = Deese publiken GPG-Slötels sünd mit dienem Konto verbunnen un worden bruukt, um diene Kommitterens uttowiesen. Holl de tohörig privaaten Slötels seker, denn daarmit kann man Kommitterens mit diener Unnerschrift unnerschrieven.
@@ -1126,7 +1126,7 @@ editor.patching = Plackt:
 editor.fail_to_apply_patch = Kann Plack »%s« nich anwennen
 editor.new_patch = Nejer Plack
 editor.commit_message_desc = Wenn du willst, föög een wiederes Beschrieven hento …
-editor.commit_directly_to_this_branch = Kommitteer stracks up de %s-Twieg.
+editor.commit_directly_to_this_branch = Kommitteer stracks up de %[1]s-Twieg.
 editor.propose_file_change = Datei-Ännern vörslagen
 editor.new_branch_name = Benööm de Twieg för deeses Kommitteren
 editor.new_branch_name_desc = Nejer Twig-Naam …
@@ -1561,7 +1561,7 @@ issues.due_date_invalid = Dat Anstahns-Datum is ungültig of buten de Rieg. Bidd
 issues.dependency.remove = Wegdoon
 issues.dependency.issue_close_blocks = Deeses Gefall blockeert dat Dichtmaken vun deesen Gefallens
 issues.review.outdated_description = Inholl hett sik ännert, siet deeser Kommentaar schreven worden is
-issues.force_push_codes = `hett %[1]s vun %[2]s to %[4]s %[6]s dwangsschuven`
+issues.force_push_codes = `hett %[1]s vun %[2]s to %[4]s %[6]s dwangsschuven`
 issues.dependency.pr_remove_text = Dat word de Ofhangen vun deesem Haalvörslag wegdoon. Wiedermaken?
 issues.review.pending = Staht ut
 issues.review.option.hide_outdated_comments = Verollte Kommentarens verbargen
@@ -1599,7 +1599,7 @@ pulls.filter_changes_by_commit = Na Kommitteren filtern
 pulls.nothing_to_compare = Deese Twiegen sünd gliek. ’t is nich nödig, eenen Haalvörslag to maken.
 pulls.nothing_to_compare_have_tag = De utköört Twieg/Mark sünd gliek.
 pulls.create = Haalvörslag maken
-pulls.title_desc_one = will %[1]d Kommitteren vun %[2]s na %[3]s tosamenföhren
+pulls.title_desc_one = will %[1]d Kommitteren vun %[2]s na %[3]s tosamenföhren
 pulls.merged_title_desc_one = hett %[1]d Kommitteren vun %[2]s na %[3]s %[4]s tosamenföhrt
 pulls.change_target_branch_at = `hett de Enn-Twieg vun %s to %s %s ännert`
 pulls.tab_conversation = Snack
@@ -1649,7 +1649,7 @@ issues.content_history.delete_from_history = Ut Histoorje lösken
 pulls.compare_changes = Nejer Haalvörslag
 pulls.allow_edits_from_maintainers_desc = Brukers, well dat Recht hebben, to de Grund-Twieg to schrieven, düren ok up deesen Twieg schuuven
 pulls.nothing_to_compare_and_allow_empty_pr = Deese Twiegen sünd gliek. De HV word leeg wesen.
-pulls.title_desc_few = will %[1]d Kommitterens vun %[2]s na %[3]s tosamenföhren
+pulls.title_desc_few = will %[1]d Kommitterens vun %[2]s na %[3]s tosamenföhren
 pulls.data_broken = Deeser Haalvörslag is kaputt, denn de Gabel-Informatioon fehlt.
 pulls.waiting_count_1 = %d Nakieken staht ut
 issues.content_history.deleted = lösket
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
index cbf418f9be..6f2bee0145 100644
--- a/options/locale/locale_nl-NL.ini
+++ b/options/locale/locale_nl-NL.ini
@@ -1028,7 +1028,7 @@ visibility.private_tooltip = Alleen zichtbaar voor leden van organisaties waarbi
 user_unblock_success = De gebruiker is succesvol gedeblokkeerd.
 user_block_success = De gebruiker is succesvol geblokkeerd.
 blocked_since = Geblokkeerd sinds %s
-access_token_desc = Geselecteerde token machtigingen beperken autorisatie alleen tot de bijbehorende API routes. Lees de documentatie voor meer informatie.
+access_token_desc = Geselecteerde token machtigingen beperken autorisatie alleen tot de bijbehorende API routes. Lees de documentatie voor meer informatie.
 oauth2_confidential_client = Vertrouwelijke client. Selecteer deze optie voor apps die het geheim bewaren, zoals webapps. Niet selecteren voor native apps, waaronder desktop- en mobiele apps.
 authorized_oauth2_applications_description = Je hebt deze applicaties van derden toegang verleend tot je persoonlijke Forgejo-account. Trek de toegang in voor applicaties die niet langer in gebruik zijn.
 hidden_comment_types.ref_tooltip = Reacties waarbij naar deze issue werd verwezen vanuit een ander issue/commit/…
@@ -1309,7 +1309,7 @@ editor.patching=Patchen:
 editor.new_patch=Nieuwe patch
 editor.commit_message_desc=Voeg een optionele uitgebreide omschrijving toe…
 editor.signoff_desc=Voeg een Signed-off-by toe aan het einde van het commit logbericht.
-editor.commit_directly_to_this_branch=Commit direct naar de branch '%s'.
+editor.commit_directly_to_this_branch=Commit direct naar de branch '%[1]s'.
 editor.create_new_branch=Maak een nieuwe branch voor deze commit en start van een pull request.
 editor.create_new_branch_np=Maak een nieuwe branch voor deze commit.
 editor.propose_file_change=Stel bestandswijziging voor
@@ -1599,7 +1599,7 @@ issues.error_modifying_due_date=Deadline aanpassen mislukt.
 issues.error_removing_due_date=Deadline verwijderen mislukt.
 issues.push_commit_1=toegevoegd %d commit %s
 issues.push_commits_n=toegevoegd %d commits %s
-issues.force_push_codes=`force-push %[1]s van %[2]s naar %[4]s %[6]s`
+issues.force_push_codes=`force-push %[1]s van %[2]s naar %[4]s %[6]s`
 issues.force_push_compare=Vergelijk
 issues.due_date_form=jjjj-mm-dd
 issues.due_date_form_add=Vervaldatum toevoegen
@@ -1696,7 +1696,7 @@ pulls.nothing_to_compare=Deze branches zijn gelijk. Er is geen pull request nodi
 pulls.nothing_to_compare_and_allow_empty_pr=Deze branches zijn gelijk. Deze pull verzoek zal leeg zijn.
 pulls.has_pull_request=`Een pull-verzoek tussen deze branches bestaat al: %[2]s#%[3]d`
 pulls.create=Pull request aanmaken
-pulls.title_desc_few=wilt %[1]d commits van %[2]s samenvoegen met %[3]s
+pulls.title_desc_few=wilt %[1]d commits van %[2]s samenvoegen met %[3]s
 pulls.merged_title_desc_few=heeft %[1]d commits samengevoegd van %[2]s naar %[3]s %[4]s
 pulls.change_target_branch_at='doelbranch aangepast van %s naar %s %s'
 pulls.tab_conversation=Discussie
@@ -2745,7 +2745,7 @@ activity.navbar.code_frequency = Code frequentie
 activity.navbar.recent_commits = Recente commits
 file_follow = Volg symlink
 error.broken_git_hook = it hooks van deze repository lijken kapot te zijn. Volg alsjeblieft de documentatie om ze te repareren, push daarna wat commits om de status te vernieuwen.
-pulls.title_desc_one = wilt %[1]d commit van %[2]s samenvoegen in %[3]s
+pulls.title_desc_one = wilt %[1]d commit van %[2]s samenvoegen in %[3]s
 open_with_editor = Open met %s
 commits.search_branch = Deze branch
 pulls.merged_title_desc_one = heeft %[1]d commit van %[2]s samengevoegd in %[3]s %[4]s
diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini
index cecafc9870..7a5cb42b1e 100644
--- a/options/locale/locale_pl-PL.ini
+++ b/options/locale/locale_pl-PL.ini
@@ -1152,7 +1152,7 @@ editor.commit_signed_changes=Zatwierdź podpisane zmiany
 editor.commit_changes=Zatwierdź zmiany
 editor.add_tmpl=Dodanie ''
 editor.commit_message_desc=Dodaj dodatkowy rozszerzony opis…
-editor.commit_directly_to_this_branch=Zmieniaj bezpośrednio gałąź %s.
+editor.commit_directly_to_this_branch=Zmieniaj bezpośrednio gałąź %[1]s.
 editor.create_new_branch=Stwórz nową gałąź dla tego commita i rozpocznij Pull Request.
 editor.create_new_branch_np=Stwórz nową gałąź dla tego commita.
 editor.propose_file_change=Zaproponuj zmiany w pliku
@@ -1482,7 +1482,7 @@ pulls.no_results=Nie znaleziono wyników.
 pulls.nothing_to_compare=Te gałęzie są sobie równe. Nie ma potrzeby tworzyć Pull Requesta.
 pulls.nothing_to_compare_and_allow_empty_pr=Te gałęzie są równe. Ten PR będzie pusty.
 pulls.create=Utwórz Pull Request
-pulls.title_desc_few=chce scalić %[1]d commity/ów z %[2]s do %[3]s
+pulls.title_desc_few=chce scalić %[1]d commity/ów z %[2]s do %[3]s
 pulls.merged_title_desc_few=scala %[1]d commity/ów z %[2]s do %[3]s %[4]s
 pulls.change_target_branch_at=`zmienia gałąź docelową z %s na %s %s`
 pulls.tab_conversation=Dyskusja
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
index 73211f7139..a941f270e4 100644
--- a/options/locale/locale_pt-BR.ini
+++ b/options/locale/locale_pt-BR.ini
@@ -217,7 +217,6 @@ server_internal = Erro interno do servidor
 app_desc=Um serviço de hospedagem Git amigável
 install=Fácil de instalar
 platform=Multi-plataforma
-platform_desc=Forgejo roda em qualquer sistema em que Go consegue compilar: Windows, macOS, Linux, ARM, etc. Escolha qual você gosta mais!
 lightweight=Leve e rápido
 lightweight_desc=Forgejo utiliza poucos recursos e consegue mesmo rodar no barato Raspberry Pi. Economize energia elétrica da sua máquina!
 license=Código aberto
@@ -1032,7 +1031,7 @@ user_block_success = O usuário foi bloqueado.
 twofa_recovery_tip = Caso perca o seu dispositivo, você poderá usar uma chave de uso único para recuperar o acesso à sua conta.
 webauthn_key_loss_warning = Caso perca as suas chaves de segurança, você perderá o acesso à sua conta.
 blocked_users_none = Nenhum usuário bloqueado.
-access_token_desc = As permissões selecionadas para o token limitam o acesso apenas às rotas da API correspondentes. Veja a documentação para mais informações.
+access_token_desc = As permissões selecionadas para o token limitam o acesso apenas às rotas da API correspondentes. Veja a documentação para mais informações.
 webauthn_alternative_tip = Você talvez queira configurar um método adicional de autenticação.
 change_password = Alterar senha
 hints = Dicas
@@ -1344,7 +1343,7 @@ editor.fail_to_apply_patch=`Não foi possível aplicar a correção "%s"`
 editor.new_patch=Novo patch
 editor.commit_message_desc=Adicione uma descrição detalhada (opcional)...
 editor.signoff_desc=Adicione um assinado-por-committer no final do log do commit.
-editor.commit_directly_to_this_branch=Commit diretamente no branch %s.
+editor.commit_directly_to_this_branch=Commit diretamente no branch %[1]s.
 editor.create_new_branch=Crie um novo branch para este commit e crie um pull request.
 editor.create_new_branch_np=Crie um novo branch para este commit.
 editor.propose_file_change=Propor alteração de arquivo
@@ -1699,7 +1698,7 @@ issues.error_modifying_due_date=Falha ao modificar a data limite.
 issues.error_removing_due_date=Falha ao remover a data limite.
 issues.push_commit_1=adicionou %d commit %s
 issues.push_commits_n=adicionou %d commits %s
-issues.force_push_codes=`forçou o push %[1]s de %[2]s para %[4]s %[6]s`
+issues.force_push_codes=`forçou o push %[1]s de %[2]s para %[4]s %[6]s`
 issues.force_push_compare=Comparar
 issues.due_date_form=dd/mm/aaaa
 issues.due_date_form_add=Adicionar data limite
@@ -1813,7 +1812,7 @@ pulls.nothing_to_compare=Estes branches são iguais. Não há nenhuma necessidad
 pulls.nothing_to_compare_and_allow_empty_pr=Estes branches são iguais. Este PR ficará vazio.
 pulls.has_pull_request=`Um pull request entre esses branches já existe: %[2]s#%[3]d`
 pulls.create=Criar pull request
-pulls.title_desc_few=quer mesclar %[1]d commits de %[2]s em %[3]s
+pulls.title_desc_few=quer mesclar %[1]d commits de %[2]s em %[3]s
 pulls.merged_title_desc_few=mesclou %[1]d commits de %[2]s em %[3]s %[4]s
 pulls.change_target_branch_at=`mudou o branch de destino de %s para %s %s`
 pulls.tab_conversation=Conversação
@@ -2691,7 +2690,7 @@ settings.confirm_wiki_branch_rename = Renomar o ramo da wiki
 pulls.merged_title_desc_one = mesclou %[1]d commit de %[2]s em %[3]s %[4]s
 activity.navbar.recent_commits = Commits recentes
 size_format = %[1]s: %[2]s; %[3]s: %[4]s
-pulls.title_desc_one = quer mesclar %[1]d commit de %[2]s em %[3]s
+pulls.title_desc_one = quer mesclar %[1]d commit de %[2]s em %[3]s
 pulls.cmd_instruction_merge_desc = Mescle as alterações e enviar para o Forgejo.
 pulls.ready_for_review = Pronto para revisão?
 commits.search_branch = Este ramo
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
index d368402a6a..8a2279fe8a 100644
--- a/options/locale/locale_pt-PT.ini
+++ b/options/locale/locale_pt-PT.ini
@@ -934,7 +934,7 @@ select_permissions=Escolher permissões
 permission_no_access=Sem acesso
 permission_read=Lidas
 permission_write=Leitura e escrita
-access_token_desc=As permissões dos códigos escolhidos limitam a autorização apenas às rotas da API correspondentes. Leia a documentação para obter mais informação.
+access_token_desc=As permissões dos códigos escolhidos limitam a autorização apenas às rotas da API correspondentes. Leia a documentação para obter mais informação.
 at_least_one_permission=Tem que escolher pelo menos uma permissão para criar um código
 permissions_list=Permissões:
 
@@ -1358,7 +1358,7 @@ editor.fail_to_apply_patch=`Não foi possível aplicar o remendo (patch) "%s"`
 editor.new_patch=Novo remendo (patch)
 editor.commit_message_desc=Adicionar uma descrição alargada opcional…
 editor.signoff_desc=Adicionar "Assinado-por" seguido do autor do cometimento no fim da mensagem do registo de cometimentos.
-editor.commit_directly_to_this_branch=Cometer imediatamente no ramo %s.
+editor.commit_directly_to_this_branch=Cometer imediatamente no ramo %[1]s.
 editor.create_new_branch=Crie um novo ramo para este cometimento e inicie um pedido de integração.
 editor.create_new_branch_np=Criar um novo ramo para este cometimento.
 editor.propose_file_change=Propor modificação do ficheiro
@@ -1724,7 +1724,7 @@ issues.error_modifying_due_date=Falhou a modificação da data de vencimento.
 issues.error_removing_due_date=Falhou a remoção da data de vencimento.
 issues.push_commit_1=adicionou %d cometimento %s
 issues.push_commits_n=adicionou %d cometimentos %s
-issues.force_push_codes=`forçou o envio %[1]s de %[2]s para %[4]s %[6]s`
+issues.force_push_codes=`forçou o envio %[1]s de %[2]s para %[4]s %[6]s`
 issues.force_push_compare=Comparar
 issues.due_date_form=aaaa-mm-dd
 issues.due_date_form_add=Adicionar data de vencimento
@@ -1840,7 +1840,7 @@ pulls.nothing_to_compare_have_tag=O ramo/etiqueta escolhidos são iguais.
 pulls.nothing_to_compare_and_allow_empty_pr=Estes ramos são iguais. Este pedido de integração ficará vazio.
 pulls.has_pull_request=`Já existe um pedido de integração entre estes ramos: %[2]s#%[3]d`
 pulls.create=Criar um pedido de integração
-pulls.title_desc_few=quer integrar %[1]d cometimento(s) do ramo %[2]s no ramo %[3]s
+pulls.title_desc_few=quer integrar %[1]d cometimento(s) do ramo %[2]s no ramo %[3]s
 pulls.merged_title_desc_few=integrou %[1]d cometimento(s) do ramo %[2]s no ramo %[3]s %[4]s
 pulls.change_target_branch_at=`mudou o ramo de destino de %s para %s %s`
 pulls.tab_conversation=Diálogo
@@ -2733,7 +2733,7 @@ migrate.forgejo.description = Migrar dados de codeberg.org ou de outras instânc
 n_commit_one = %s cometimento
 editor.commit_id_not_matching = O ficheiro foi modificado enquanto o estava a editar. Cometa para um ramo novo e depois integre.
 commits.search_branch = Este ramo
-pulls.title_desc_one = quer integrar %[1]d cometimento do ramo %[2]s no ramo %[3]s
+pulls.title_desc_one = quer integrar %[1]d cometimento do ramo %[2]s no ramo %[3]s
 pulls.reopen_failed.base_branch = O pedido de integração não pode ser reaberto porque o ramo base já não existe.
 activity.navbar.code_frequency = Frequência de programação
 settings.units.add_more = Habilitar mais
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
index 2324567c45..3507b2ea67 100644
--- a/options/locale/locale_ru-RU.ini
+++ b/options/locale/locale_ru-RU.ini
@@ -934,7 +934,7 @@ select_permissions=Выбрать разрешения
 permission_no_access=Нет доступа
 permission_read=Чтение
 permission_write=Чтение и запись
-access_token_desc=Выбранные области действия токена ограничивают авторизацию только соответствующими маршрутами API. Читайте документацию для получения дополнительной информации.
+access_token_desc=Выбранные области действия токена ограничивают авторизацию только соответствующими маршрутами API. Читайте документацию для получения дополнительной информации.
 at_least_one_permission=Необходимо выбрать хотя бы одно разрешение для создания токена
 permissions_list=Разрешения:
 
@@ -1340,7 +1340,7 @@ editor.fail_to_apply_patch=Невозможно применить патч «%s
 editor.new_patch=Новая правка
 editor.commit_message_desc=Добавьте необязательное расширенное описание…
 editor.signoff_desc=Добавить трейлер Signed-off-by с автором коммита в конце сообщения коммита.
-editor.commit_directly_to_this_branch=Сохранить коммит напрямую в ветвь %s.
+editor.commit_directly_to_this_branch=Сохранить коммит напрямую в ветвь %[1]s.
 editor.create_new_branch=Сохранить коммит в новую ветвь и начать запрос на слияние.
 editor.create_new_branch_np=Создать новую ветвь для этого коммита.
 editor.propose_file_change=Предложить изменение файла
@@ -1705,7 +1705,7 @@ issues.error_modifying_due_date=Не удалось изменить срок в
 issues.error_removing_due_date=Не удалось убрать срок выполнения.
 issues.push_commit_1=добавлен %d коммит %s
 issues.push_commits_n=добавлены %d коммита(ов) %s
-issues.force_push_codes=`форсированное обновление изменений %[1]s %[4]s вместо %[2]s %[6]s`
+issues.force_push_codes=`форсированное обновление изменений %[1]s %[4]s вместо %[2]s %[6]s`
 issues.force_push_compare=Сравнить
 issues.due_date_form=гггг-мм-дд
 issues.due_date_form_add=Добавить срок выполнения
@@ -1816,8 +1816,8 @@ pulls.nothing_to_compare=Нечего сравнивать, родительск
 pulls.nothing_to_compare_and_allow_empty_pr=Ветви идентичны. Этот PR будет пустым.
 pulls.has_pull_request=`Запрос на слияние этих ветвей уже существует: %[2]s#%[3]d`
 pulls.create=Создать запрос на слияние
-pulls.title_desc_one=хочет влить %[1]d коммит из %[2]s в %[3]s
-pulls.title_desc_few=хочет влить %[1]d коммит(ов) из %[2]s в %[3]s
+pulls.title_desc_one=хочет влить %[1]d коммит из %[2]s в %[3]s
+pulls.title_desc_few=хочет влить %[1]d коммит(ов) из %[2]s в %[3]s
 pulls.merged_title_desc_one=слит %[1]d коммит из %[2]s в %[3]s %[4]s
 pulls.merged_title_desc_few=слито %[1]d коммит(ов) из %[2]s в %[3]s %[4]s
 pulls.change_target_branch_at=`изменил(а) целевую ветвь с %s на %s %s`
diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini
index bfb22176e8..d3006c26af 100644
--- a/options/locale/locale_si-LK.ini
+++ b/options/locale/locale_si-LK.ini
@@ -116,7 +116,6 @@ missing_csrf=නරක ඉල්ලීම: CSRF ටෝකන් නොමැත
 app_desc=වේදනාකාරී, ස්වයං-සත්කාරක Git සේවාවක්
 install=ස්ථාපනයට පහසුය
 platform=හරස් වේදිකාව
-platform_desc=Forgejo ඕනෑම තැනක ධාවනය Go සඳහා සම්පාදනය කළ හැකිය: වින්ඩෝස්, මැකෝස්, ලිනක්ස්, ARM, ආදිය ඔබ ආදරය කරන එකක් තෝරන්න!
 lightweight=සැහැල්ලු
 lightweight_desc=Forgejo අඩු අවම අවශ්යතා ඇති අතර මිල අඩු Raspberry Pi මත ධාවනය කළ හැකිය. ඔබේ යන්ත්ර ශක්තිය සුරකින්න!
 license=විවෘත මූලාශ්‍ර
@@ -923,7 +922,7 @@ editor.commit_changes=වෙනස්කම් සිදු කරන්න
 editor.add_tmpl='' එකතු කරන්න
 editor.commit_message_desc=විකල්ප දීර්ඝ විස්තරයක් එක් කරන්න…
 editor.signoff_desc=කැපවූ ලොග් පණිවිඩය අවසානයේ දී කැපකරු විසින් සිග්නෙඩ්-ඕෆ්-විසින් ට්රේලරයක් එක් කරන්න.
-editor.commit_directly_to_this_branch=%s ශාඛාවට කෙලින්ම කැප කරන්න.
+editor.commit_directly_to_this_branch=%[1]s ශාඛාවට කෙලින්ම කැප කරන්න.
 editor.create_new_branch=මෙම කැප කිරීම සඳහා නව ශාඛාවක් සාදා අදින්න ඉල්ලීමක් ආරම්භ කරන්න.
 editor.create_new_branch_np=මෙම කැප කිරීම සඳහා නව ශාඛාවක් සාදන්න.
 editor.propose_file_change=ගොනු වෙනස් කිරීම යෝජනා කරන්න
@@ -1098,12 +1097,12 @@ issues.reopen_comment_issue=අදහස් දක්වා විවෘත ක
 issues.create_comment=අදහස
 issues.closed_at=`මෙම ගැටළුව වසා %[2]s`
 issues.reopened_at=`මෙම ගැටළුව නැවත විවෘත කරන ලදි %[2]s`
-issues.ref_issue_from=මෙම නිකුතුව %[4]s හි %[2]s
-issues.ref_pull_from=මෙම අදින්න ඉල්ලීම%[4]s %[2]s
-issues.ref_closing_from=මෙම ගැටළුව වසා දමනු ඇත%[4]s මෙම ගැටළුව %[2]s
-issues.ref_reopening_from=මෙම ගැටළුව නැවත විවෘත කරනු ඇත%[4]s මෙම ගැටළුව %[2]s
-issues.ref_closed_from=මෙම නිකුතුව%[4]s %[2]s
-issues.ref_reopened_from=මෙම නිකුතුව%[4]s %[2]sනැවත විවෘත කරන ලදි
+issues.ref_issue_from=`මෙම නිකුතුව %[4]s හි %[2]s`
+issues.ref_pull_from=`මෙම අදින්න ඉල්ලීම%[4]s %[2]s`
+issues.ref_closing_from=`මෙම ගැටළුව වසා දමනු ඇත%[4]s මෙම ගැටළුව %[2]s`
+issues.ref_reopening_from=`මෙම ගැටළුව නැවත විවෘත කරනු ඇත%[4]s මෙම ගැටළුව %[2]s`
+issues.ref_closed_from=`මෙම නිකුතුව%[4]s %[2]s`
+issues.ref_reopened_from=`මෙම නිකුතුව%[4]s %[2]sනැවත විවෘත කරන ලදි`
 issues.ref_from=`හිම%[1]s`
 issues.role.owner=හිමිකරු
 issues.role.member=සාමාජික
@@ -1183,7 +1182,7 @@ issues.error_modifying_due_date=නියමිත දිනය වෙනස්
 issues.error_removing_due_date=නියමිත දිනය ඉවත් කිරීමට අපොහොසත් විය.
 issues.push_commit_1=එකතු %d කැප %s
 issues.push_commits_n=එකතු %d විවරයන් %s
-issues.force_push_codes=`බලය-pushed%[1]s සිට %[2]s %[4]s ගේ %[6]s`
+issues.force_push_codes=`බලය-pushed%[1]s සිට %[2]s %[4]s ගේ %[6]s`
 issues.force_push_compare=සසඳන්න
 issues.due_date_form=Yyy-mm-dd
 issues.due_date_form_add=නියමිත දිනය එකතු කරන්න
@@ -1269,7 +1268,7 @@ pulls.nothing_to_compare=මෙම ශාඛා සමාන වේ. අදි
 pulls.nothing_to_compare_and_allow_empty_pr=මෙම ශාඛා සමාන වේ. මෙම මහජන සම්බන්ධතා හිස් වනු ඇත.
 pulls.has_pull_request=`මෙම ශාඛා අතර අදින්න ඉල්ලීම දැනටමත් පවතී: %[2]s #%[3]d`
 pulls.create=අදින්න ඉල්ලීම නිර්මාණය
-pulls.title_desc_few=%[1]d සිට %[2]s දක්වා %[3]s
+pulls.title_desc_few=%[1]d සිට %[2]s දක්වා %[3]s
 pulls.merged_title_desc_few=මර්ජ්%[1]d සිට %[2]s දක්වා %[3]s %[4]s
 pulls.change_target_branch_at=`ඉලක්කගත ශාඛාව %s සිට %s %sදක්වා වෙනස් කර ඇත`
 pulls.tab_conversation=සංවාදය
@@ -1280,7 +1279,7 @@ pulls.cant_reopen_deleted_branch=ශාඛාව මකා දැමූ නි
 pulls.merged=සංයුක්ත කෙරිණි
 pulls.manually_merged=අතින් සංයුක්ත කර ඇත
 pulls.is_closed=අදින්න ඉල්ලීම වසා දමා ඇත.
-pulls.title_wip_desc=අහම්බෙන් ඒකාබද්ධ කිරීමෙන් අදින්න ඉල්ලීම වැළැක්වීම සඳහා %s සමඟ මාතෘකාව ආරම්භ කරන්න.
+pulls.title_wip_desc=`අහම්බෙන් ඒකාබද්ධ කිරීමෙන් අදින්න ඉල්ලීම වැළැක්වීම සඳහා %s සමඟ මාතෘකාව ආරම්භ කරන්න.`
 pulls.cannot_merge_work_in_progress=මෙම අදින්න ඉල්ලීම ක්රියාත්මක වන කාර්යයක් ලෙස සලකුණු කර ඇත.
 pulls.still_in_progress=තවමත් ක්රියාත්මක වෙමින් තිබේද?
 pulls.add_prefix=%s උපසර්ගය එකතු කරන්න
diff --git a/options/locale/locale_sk-SK.ini b/options/locale/locale_sk-SK.ini
index 29824c5b4d..9b7fb5fcd8 100644
--- a/options/locale/locale_sk-SK.ini
+++ b/options/locale/locale_sk-SK.ini
@@ -187,7 +187,6 @@ app_desc=Jednoducho prístupný vlastný Git
 install=Jednoduchá inštalácia
 install_desc=Jednoducho spustite binárku pre vašu platformu, pošlite ju ako Docker, alebo ju získajte ako balíček.
 platform=Multiplatformový
-platform_desc=Forgejo beží všade kde je možné preložiť Go: Windows, macOS, Linux, ARM, a podobne. Vyberte si!
 lightweight=Ľahká
 lightweight_desc=Forgejo má minimálne požiadavky a môže bežať na Raspberry Pi. Šetrite energiou vášho stroja!
 license=Otvorený zdrojový kód
@@ -1030,7 +1029,7 @@ editor.cancel_lower=Zrušiť
 editor.commit_signed_changes=Odoslať podpísané zmeny
 editor.commit_changes=Odoslať zmeny
 editor.patch=Použiť patch
-editor.commit_directly_to_this_branch=Odoslať zmeny revízie priamo do vetvy %s.
+editor.commit_directly_to_this_branch=Odoslať zmeny revízie priamo do vetvy %[1]s.
 editor.cancel=Zrušiť
 editor.commit_empty_file_header=Odoslať prázdny súbor
 editor.commit_empty_file_text=Súbor, ktorý sa chystáte odoslať, je prázdny. Pokračovať?
diff --git a/options/locale/locale_sl.ini b/options/locale/locale_sl.ini
index 56ef337d83..703a5879ea 100644
--- a/options/locale/locale_sl.ini
+++ b/options/locale/locale_sl.ini
@@ -312,7 +312,7 @@ appearance = Videz
 password = Geslo
 authorized_oauth2_applications_description = Tem aplikacijam tretjih oseb ste odobrili dostop do svojega osebnega računa Forgejo. Prosimo, da prekličete dostop do aplikacij, ki jih ne uporabljate več.
 social_desc = S temi družabnimi računi se lahko prijavite v svoj račun. Prepričajte se, da jih vse prepoznate.
-access_token_desc = Izbrana dovoljenja žetona omejujejo avtorizacijo samo na ustrezne poti API. Za več informacij preberite dokumentacijo.
+access_token_desc = Izbrana dovoljenja žetona omejujejo avtorizacijo samo na ustrezne poti API. Za več informacij preberite dokumentacijo.
 oauth2_client_secret_hint = Skrivnost se ne bo več prikazala, ko zapustite ali osvežite to stran. Prepričajte se, da ste jo shranili.
 twofa_desc = Za zaščito računa pred krajo gesla lahko uporabite pametni telefon ali drugo napravo za prejemanje časovno omejenih enkratnih gesel ("TOTP").
 twofa_recovery_tip = Če napravo izgubite, boste lahko z obnovitvenim ključem za enkratno uporabo ponovno pridobili dostop do računa.
diff --git a/options/locale/locale_sr-SP.ini b/options/locale/locale_sr-SP.ini
index e091f91a68..a9c7308f28 100644
--- a/options/locale/locale_sr-SP.ini
+++ b/options/locale/locale_sr-SP.ini
@@ -266,7 +266,7 @@ editor.commit_changes=Изврши комит промена
 editor.add=Додај '%s'
 editor.update=Ажурирај '%s'
 editor.delete=Уклони '%s'
-editor.commit_directly_to_this_branch=Изврши комит директно на %s грану.
+editor.commit_directly_to_this_branch=Изврши комит директно на %[1]s грану.
 editor.create_new_branch=Креирај нову грану за овај комит и поднеси захтев за спајање.
 editor.cancel=Откажи
 editor.branch_already_exists=Грана '%s' већ постоји за ово спремиште.
diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini
index a96e2cc1dc..4bced1db39 100644
--- a/options/locale/locale_sv-SE.ini
+++ b/options/locale/locale_sv-SE.ini
@@ -850,7 +850,7 @@ editor.commit_signed_changes=Committa signerade ändringar
 editor.commit_changes=Checka in ändringar
 editor.add_tmpl=Lägg till ''
 editor.commit_message_desc=Lägg till en valfri utökad beskrivning…
-editor.commit_directly_to_this_branch=Checka in direkt till grenen %s.
+editor.commit_directly_to_this_branch=Checka in direkt till grenen %[1]s.
 editor.create_new_branch=Skapa en ny gren för denna incheckning och påbörja en hämtningsbegäran.
 editor.create_new_branch_np=Skapa en ny branch för den här committen.
 editor.propose_file_change=Föreslå filändring
@@ -1158,7 +1158,7 @@ pulls.filter_branch=Filtrera gren
 pulls.no_results=Inga resultat hittades.
 pulls.nothing_to_compare=Dessa brancher är ekvivalenta. Det finns ingen anledning att skapa en pull-request.
 pulls.create=Skapa Pullförfrågan
-pulls.title_desc_few=vill sammanfoga %[1]d incheckningar från s[2]s in i %[3]s
+pulls.title_desc_few=vill sammanfoga %[1]d incheckningar från s[2]s in i %[3]s
 pulls.merged_title_desc_few=sammanfogade %[1]d incheckningar från %[2]s in i %[3]s %[4]s
 pulls.change_target_branch_at=`ändrade mål-branch från %s till %s%s`
 pulls.tab_conversation=Konversation
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
index d5fc65e261..87dd127d0c 100644
--- a/options/locale/locale_tr-TR.ini
+++ b/options/locale/locale_tr-TR.ini
@@ -214,7 +214,6 @@ app_desc=Zahmetsiz, kendi sunucunuzda barındırabileceğiniz Git servisi
 install=Kurulumu kolay
 install_desc=Platformunuz için ikili dosyayı çalıştırın, Docker ile yükleyin veya paket olarak edinin.
 platform=Farklı platformlarda çalışablir
-platform_desc=Forgejo Go ile derleme yapılabilecek her yerde çalışmaktadır: Windows, macOS, Linux, ARM, vb. Hangisini seviyorsanız onu seçin!
 lightweight=Hafif
 lightweight_desc=Forgejo'nın minimal gereksinimleri çok düşüktür ve ucuz bir Raspberry Pi üzerinde çalışabilmektedir. Makine enerjinizden tasarruf edin!
 license=Açık Kaynak
@@ -908,7 +907,7 @@ select_permissions=İzinleri seçin
 permission_no_access=Erişim Yok
 permission_read=Okunmuş
 permission_write=Okuma ve Yazma
-access_token_desc=Seçili token izinleri, yetkilendirmeyi ilgili API yollarıyla sınırlandıracaktır. Daha fazla bilgi için belgeleri okuyun.
+access_token_desc=Seçili token izinleri, yetkilendirmeyi ilgili API yollarıyla sınırlandıracaktır. Daha fazla bilgi için belgeleri okuyun.
 at_least_one_permission=Bir token oluşturmak için en azından bir izin seçmelisiniz
 permissions_list=İzinler:
 
@@ -1318,7 +1317,7 @@ editor.fail_to_apply_patch=`"%s" yaması uygulanamıyor`
 editor.new_patch=Yeni Yama
 editor.commit_message_desc=İsteğe bağlı uzun bir açıklama ekleyin…
 editor.signoff_desc=İşleme günlüğü mesajının sonuna işleyen tarafından imzalanan bir fragman ekleyin.
-editor.commit_directly_to_this_branch=Doğrudan %s bölümüne uygula.
+editor.commit_directly_to_this_branch=Doğrudan %[1]s bölümüne uygula.
 editor.create_new_branch=Bu işleme için yeni bir dal oluşturun ve bir değişiklik isteği başlatın.
 editor.create_new_branch_np=Bu işleme için yeni bir dal oluştur.
 editor.propose_file_change=Dosya değişikliği öner
@@ -1684,7 +1683,7 @@ issues.error_modifying_due_date=Bitiş tarihi değiştirilemedi.
 issues.error_removing_due_date=Bitiş tarihi silinemedi.
 issues.push_commit_1=%d işlemeyi %s ekledi
 issues.push_commits_n=%d işlemeyi %s ekledi
-issues.force_push_codes=`%[1]s %[2]s hedefinden %[4]s hedefine zorla gönderildi %[6]s`
+issues.force_push_codes=`%[1]s %[2]s hedefinden %[4]s hedefine zorla gönderildi %[6]s`
 issues.force_push_compare=Karşılaştır
 issues.due_date_form=yyyy-aa-gg
 issues.due_date_form_add=Bitiş tarihi ekle
@@ -1799,7 +1798,7 @@ pulls.nothing_to_compare=Bu dallar eşit. Değişiklik isteği oluşturmaya gere
 pulls.nothing_to_compare_and_allow_empty_pr=Bu dallar eşittir. Bu Dİ boş olacak.
 pulls.has_pull_request=`Bu dallar arasında zaten bir değişiklik isteği var: %[2]s#%[3]d`
 pulls.create=Değişiklik İsteği Oluştur
-pulls.title_desc_few=%[2]s içindeki %[1]d işlemeyi %[3]s ile birleştirmek istiyor
+pulls.title_desc_few=%[2]s içindeki %[1]d işlemeyi %[3]s ile birleştirmek istiyor
 pulls.merged_title_desc_few=%[4]s %[2]s içindeki %[1]d işlemeyi %[3]s ile birleştirdi
 pulls.change_target_branch_at='hedef dal %s adresinden %s%s adresine değiştirildi'
 pulls.tab_conversation=Sohbet
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
index c75f9b4cde..9a98b4be81 100644
--- a/options/locale/locale_uk-UA.ini
+++ b/options/locale/locale_uk-UA.ini
@@ -1140,7 +1140,7 @@ editor.commit_changes=Закомітити зміни
 editor.add_tmpl=Додати «»
 editor.commit_message_desc=Додати необов'язковий розширений опис…
 editor.signoff_desc=Додати повідомленню в журналі комітів рядок Signed-off-by від свого імені.
-editor.commit_directly_to_this_branch=Зробіть коміт прямо в гілку %s.
+editor.commit_directly_to_this_branch=Зробіть коміт прямо в гілку %[1]s.
 editor.create_new_branch=Створити нову гілку для цього коміту та відкрити запит на злиття.
 editor.create_new_branch_np=Створити нову гілку для цього коміту.
 editor.propose_file_change=Запропонувати зміну файлу
@@ -1411,7 +1411,7 @@ issues.error_modifying_due_date=Не вдалося змінити дату за
 issues.error_removing_due_date=Не вдалося видалити дату завершення.
 issues.push_commit_1=додав %d коміт %s
 issues.push_commits_n=додав %d коміти(-ів) %s
-issues.force_push_codes=`примусово залито %[1]s з %[2]s до %[4]s %[6]s`
+issues.force_push_codes=`примусово залито %[1]s з %[2]s до %[4]s %[6]s`
 issues.force_push_compare=Порівняти
 issues.due_date_form=рррр-мм-дд
 issues.due_date_form_add=Додати дату завершення
@@ -1497,7 +1497,7 @@ pulls.nothing_to_compare=Ці гілки однакові. Немає необх
 pulls.nothing_to_compare_and_allow_empty_pr=Одинакові гілки. Цей PR буде порожнім.
 pulls.has_pull_request=`Запит злиття для цих гілок вже існує: %[2]s#%[3]d`
 pulls.create=Створити запит на злиття
-pulls.title_desc_few=хоче злити %[1]d комітів з %[2]s в %[3]s
+pulls.title_desc_few=хоче злити %[1]d комітів з %[2]s в %[3]s
 pulls.merged_title_desc_few=злито %[1]d комітів з %[2]s до %[3]s %[4]s
 pulls.change_target_branch_at=`змінена цільова гілка з %s на %s %s`
 pulls.tab_conversation=Обговорення
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 492a43b63b..0f2b99be32 100644
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -935,7 +935,7 @@ select_permissions=选择权限
 permission_no_access=无访问权限
 permission_read=可读
 permission_write=读写
-access_token_desc=所选令牌权限仅限于对应的 API 路由的授权。阅读 文档 以获取更多信息。
+access_token_desc=所选令牌权限仅限于对应的 API 路由的授权。阅读 文档 以获取更多信息。
 at_least_one_permission=你需要选择至少一个权限才能创建令牌
 permissions_list=权限：
 
@@ -1359,7 +1359,7 @@ editor.fail_to_apply_patch=无法应用补丁 %s
 editor.new_patch=新补丁
 editor.commit_message_desc=添加一个可选的扩展描述…
 editor.signoff_desc=在提交日志消息末尾添加签署人信息。
-editor.commit_directly_to_this_branch=直接提交至 %s 分支。
+editor.commit_directly_to_this_branch=直接提交至 %[1]s 分支。
 editor.create_new_branch=为此提交创建一个 新的分支 并发起合并请求。
 editor.create_new_branch_np=为此提交创建 新分支。
 editor.propose_file_change=提议文件更改
@@ -1725,7 +1725,7 @@ issues.error_modifying_due_date=修改到期时间失败。
 issues.error_removing_due_date=删除到期时间失败。
 issues.push_commit_1=于 %[2]s 推送了 %[1]d 个提交
 issues.push_commits_n=于 %[2]s 推送了 %[1]d 个提交
-issues.force_push_codes=`于 %[6]s 强制推送 %[1]s，从 %[2]s，至 %[4]s`
+issues.force_push_codes=`于 %[6]s 强制推送 %[1]s，从 %[2]s，至 %[4]s`
 issues.force_push_compare=比较
 issues.due_date_form=yyyy-mm-dd
 issues.due_date_form_add=设置到期时间
@@ -1841,7 +1841,7 @@ pulls.nothing_to_compare_have_tag=所选分支/标签相同。
 pulls.nothing_to_compare_and_allow_empty_pr=这些分支是相等的，此合并请求将为空。
 pulls.has_pull_request=这些分支之间的合并请求已存在: %[2]s#%[3]d
 pulls.create=创建合并请求
-pulls.title_desc_few=请求将 %[1]d 次代码提交从 %[2]s 合并至 %[3]s
+pulls.title_desc_few=请求将 %[1]d 次代码提交从 %[2]s 合并至 %[3]s
 pulls.merged_title_desc_few=于 %[4]s 将 %[1]d 次代码提交从 %[2]s合并至 %[3]s
 pulls.change_target_branch_at=将目标分支从 %s 更改为 %s %s
 pulls.tab_conversation=对话内容
@@ -2761,7 +2761,7 @@ error.broken_git_hook = 该仓库的 Git 钩子似乎已经损坏，请按照 %[2]s 的 %[1]d 提交合并入 %[3]s %[4]s
 commits.search_branch = 此分支
 open_with_editor = 使用 %s 打开
-pulls.title_desc_one = 想要将来自 %[2]s 的 %[1]d 提交合并到 %[3]s
+pulls.title_desc_one = 想要将来自 %[2]s 的 %[1]d 提交合并到 %[3]s
 settings.rename_branch_failed_protected = 无法重命名受保护的分支 %s。
 stars = 点赞
 settings.confirmation_string = 确认输入
diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini
index 2558c1d43b..37eaf38270 100644
--- a/options/locale/locale_zh-HK.ini
+++ b/options/locale/locale_zh-HK.ini
@@ -478,7 +478,7 @@ editor.preview_changes=預覽更改
 editor.or=或
 editor.cancel_lower=取消
 editor.commit_changes=提交更改嗎？
-editor.commit_directly_to_this_branch=直接提交到 %s 分支。
+editor.commit_directly_to_this_branch=直接提交到 %[1]s 分支。
 editor.create_new_branch=建立 新的分支 為此提交和開始合併請求。
 editor.cancel=取消
 editor.no_changes_to_show=沒有可以顯示的變更。
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
index 8a333cc49e..90181ba4d0 100644
--- a/options/locale/locale_zh-TW.ini
+++ b/options/locale/locale_zh-TW.ini
@@ -215,7 +215,6 @@ server_internal = 伺服器內部錯誤
 app_desc=一套極易架設的 Git 服務
 install=安裝容易
 platform=跨平台
-platform_desc=Forgejo 可以在所有能編譯 Go 語言的平台上執行：Windows，macOS，Linux，ARM 等。挑一個您喜歡的吧！
 lightweight=輕量級
 lightweight_desc=一片便宜的 Raspberry Pi 就可以滿足 Forgejo 的最低需求。節省您的機器資源！
 license=開放原始碼
@@ -1027,7 +1026,7 @@ webauthn_key_loss_warning = 如果您弄丟了您的安全金鑰，您將無法
 user_unblock_success = 已成功解除對此使用者的封鎖。
 webauthn_alternative_tip = 您可能想新增一個額外的驗證方法。
 user_block_success = 已成功封鎖此使用者。
-access_token_desc = 選擇的符記僅授權相對應的 API路徑。請參閱文件來了解更多。
+access_token_desc = 選擇的符記僅授權相對應的 API路徑。請參閱文件來了解更多。
 oauth2_application_locked = 可以在組態中設定 Forgejo 預先註冊一些 OAuth2 應用程式。為了避免不可預料的情況，它們無法被編輯或是移除。請參閱 OAuth2 文件來了解更多。
 hidden_comment_types_description = 在這裡選取的留言種類將不會顯示於問題頁面中。舉例來說，核取「標籤」將隱藏所有「使用者新增／移除了<標籤>」留言。
 authorized_oauth2_applications_description = 您已授權給這些第三方應用程式取用您的 Forgejo 個人帳號的權限。請撤銷您不再使用的應用程式的權限。
@@ -1307,7 +1306,7 @@ editor.fail_to_apply_patch=無法套用補綴「%s」
 editor.new_patch=新增補綴
 editor.commit_message_desc=（選填）加入詳細說明…
 editor.signoff_desc=在提交訊息底部加入提交者的「Signed-off-by」資訊。
-editor.commit_directly_to_this_branch=直接提交到 %s 分支。
+editor.commit_directly_to_this_branch=直接提交到 %[1]s 分支。
 editor.create_new_branch=為此提交建立新分支並提出合併請求。
 editor.create_new_branch_np=為本次提交建立新分支。
 editor.propose_file_change=提出檔案變更
@@ -1643,7 +1642,7 @@ issues.error_modifying_due_date=無法修改截止日期。
 issues.error_removing_due_date=無法移除截止日期。
 issues.push_commit_1=加入了 %d 個提交 %s
 issues.push_commits_n=加入了 %d 個提交 %s
-issues.force_push_codes=`強制推送了 %[1]s 自 %[2]s 至 %[4]s %[6]s`
+issues.force_push_codes=`強制推送了 %[1]s 自 %[2]s 至 %[4]s %[6]s`
 issues.force_push_compare=比較
 issues.due_date_form=yyyy年mm月dd日
 issues.due_date_form_add=新增截止日期
@@ -1745,7 +1744,7 @@ pulls.nothing_to_compare=這些分支的內容相同，無需建立合併請求
 pulls.nothing_to_compare_and_allow_empty_pr=這些分支的內容相同，此合併請求將會是空白的。
 pulls.has_pull_request=`已有介於這些分支間的合併請求：%[2]s#%[3]d`
 pulls.create=建立合併請求
-pulls.title_desc_few=請求將 %[1]d 次程式碼提交從 %[2]s 合併至 %[3]s
+pulls.title_desc_few=請求將 %[1]d 次程式碼提交從 %[2]s 合併至 %[3]s
 pulls.merged_title_desc_few=將 %[1]d 次提交從 %[2]s 合併至 %[3]s %[4]s
 pulls.change_target_branch_at=`將目標分支從 %s 更改為 %s %s`
 pulls.tab_conversation=對話內容
@@ -2626,7 +2625,7 @@ signing.wont_sign.approved = 因為合併請求沒有被核可，這個合併不
 activity.navbar.recent_commits = 最近的提交
 issues.comment.blocked_by_user = 因為您被該儲存庫的所有者或問題的提出者封鎖，您不能在這則問題上留言。
 pulls.closed = 合併請求已關閉
-pulls.title_desc_one = 想從 %[2]s 合併 %[1]d 個提交至 %[3]s
+pulls.title_desc_one = 想從 %[2]s 合併 %[1]d 個提交至 %[3]s
 pulls.merged_title_desc_one = 於 %[4]s 自 %[2]s 合併了 %[1]d 個提交至 %[3]s
 issues.archived_label_description = （已封存）%s
 signing.wont_sign.always = 永遠簽署提交。
diff --git a/templates/repo/editor/commit_form.tmpl b/templates/repo/editor/commit_form.tmpl
index 9f81b1d3a0..f8c1beb027 100644
--- a/templates/repo/editor/commit_form.tmpl
+++ b/templates/repo/editor/commit_form.tmpl
@@ -26,7 +26,7 @@
 					
 					

 			{{end}}
diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl
index 7613643351..d7f05223af 100644
--- a/templates/repo/empty.tmpl
+++ b/templates/repo/empty.tmpl
@@ -10,7 +10,7 @@
 						{{if .Repository.ArchivedUnix.IsZero}}
 							{{ctx.Locale.Tr "repo.archive.title"}}
 						{{else}}
-							{{ctx.Locale.Tr "repo.archive.title_date" (DateTime "long" .Repository.ArchivedUnix)}}
+							{{ctx.Locale.Tr "repo.archive.title_date" (ctx.DateUtils.AbsoluteLong .Repository.ArchivedUnix)}}
 						{{end}}
 					

 				{{end}}
diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl
index 5c768f32bb..2ec4166308 100644
--- a/templates/repo/graph/commits.tmpl
+++ b/templates/repo/graph/commits.tmpl
@@ -71,7 +71,7 @@
 							{{$userName}}
 						{{end}}
 					
-					{{DateTime "full" $commit.Date}}
+					{{ctx.DateUtils.FullTime $commit.Date}}
 				{{end}}
 			
 		{{end}}
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index f2a61794a6..d16e616a81 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -53,7 +53,7 @@
 				{{if .Repository.ArchivedUnix.IsZero}}
 					{{ctx.Locale.Tr "repo.archive.title"}}
 				{{else}}
-					{{ctx.Locale.Tr "repo.archive.title_date" (DateTime "long" .Repository.ArchivedUnix)}}
+					{{ctx.Locale.Tr "repo.archive.title_date" (ctx.DateUtils.AbsoluteLong .Repository.ArchivedUnix)}}
 				{{end}}
 			

 		{{end}}
diff --git a/templates/repo/issue/view_content/sidebar/due_deadline.tmpl b/templates/repo/issue/view_content/sidebar/due_deadline.tmpl
index 2de836b4ed..1a87af6973 100644
--- a/templates/repo/issue/view_content/sidebar/due_deadline.tmpl
+++ b/templates/repo/issue/view_content/sidebar/due_deadline.tmpl
@@ -9,7 +9,7 @@
 			

 				

 					{{svg "octicon-calendar" 16 "tw-mr-2"}}
-					{{DateTime "long" .Issue.DeadlineUnix.FormatDate}}
+					{{ctx.DateUtils.AbsoluteLong .Issue.DeadlineUnix}}
 				

 				

 					{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
diff --git a/templates/repo/pulse.tmpl b/templates/repo/pulse.tmpl
index 3554cf6a19..a630c7c3f2 100644
--- a/templates/repo/pulse.tmpl
+++ b/templates/repo/pulse.tmpl
@@ -1,5 +1,5 @@
 

-	{{DateTime "long" .DateFrom}} - {{DateTime "long" .DateUntil}}
+	{{ctx.DateUtils.AbsoluteLong .DateFrom}} - {{ctx.DateUtils.AbsoluteLong .DateUntil}}
 	
 	

 		

diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 4bc3abf6fb..9c7e1f38cd 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -55,7 +55,7 @@
 									{{.Fingerprint}}
 								

 								

-									
{{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}} — {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}} - {{ctx.Locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{ctx.Locale.Tr "settings.can_write_info"}} {{end}}

+									
{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}} —  {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} {{ctx.DateUtils.AbsoluteShort .UpdatedUnix}}{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}} - {{ctx.Locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{ctx.Locale.Tr "settings.can_write_info"}} {{end}}

 								

 							

 							

diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 09f80cac84..04c159f11d 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -154,7 +154,7 @@
 							
 								{{.PullMirror.RemoteAddress}}
 								{{ctx.Locale.Tr "repo.settings.mirror_settings.direction.pull"}}
-								{{DateTime "full" .PullMirror.UpdatedUnix}}
+								{{ctx.DateUtils.FullTime .PullMirror.UpdatedUnix}}
 								
 									

 										{{.CsrfTokenHtml}}
@@ -243,9 +243,9 @@
 							
 								{{.RemoteAddress}}
 								{{ctx.Locale.Tr "repo.settings.mirror_settings.direction.push"}}
-								{{if .LastUpdateUnix}}{{DateTime "full" .LastUpdateUnix}}{{else}}{{ctx.Locale.Tr "never"}}{{end}} {{if .LastError}}
{{ctx.Locale.Tr "error"}}
{{end}}
+								{{if .LastUpdateUnix}}{{ctx.DateUtils.FullTime .LastUpdateUnix}}{{else}}{{ctx.Locale.Tr "never"}}{{end}} {{if .LastError}}
{{ctx.Locale.Tr "error"}}
{{end}}
 								{{if not (eq (len .GetPublicKey) 0)}}{{ctx.Locale.Tr "repo.settings.mirror_settings.push_mirror.copy_public_key"}}{{else}}{{ctx.Locale.Tr "repo.settings.mirror_settings.push_mirror.none_ssh"}}{{end}}
-								
+								
 									

diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl
index f96c1828d2..941a444612 100644
--- a/templates/shared/issuelist.tmpl
+++ b/templates/shared/issuelist.tmpl
@@ -117,7 +117,7 @@
 						
 							
 								{{svg "octicon-calendar" 14}}
-								{{DateTime "short" (.DeadlineUnix.FormatDate)}}
+								{{ctx.DateUtils.AbsoluteShort .DeadlineUnix}}
 							
 						
 					{{end}}
diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl
index ea59459083..011635a20d 100644
--- a/templates/shared/secrets/add_list.tmpl
+++ b/templates/shared/secrets/add_list.tmpl
@@ -28,7 +28,7 @@
 			

 			

 				
-					{{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}}
+					{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}}
 				
 				

 			

 				
-					{{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}}
+					{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}}
 				
 				

 						

diff --git a/templates/user/settings/grants_oauth2.tmpl b/templates/user/settings/grants_oauth2.tmpl
index e89d275660..41e400767d 100644
--- a/templates/user/settings/grants_oauth2.tmpl
+++ b/templates/user/settings/grants_oauth2.tmpl
@@ -14,7 +14,7 @@
 				

 					
{{.Application.Name}}

 					

-						
{{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}}

+						
{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}}

 					

 				

 				

diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index f5e91cedff..8e08da7fb3 100644
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -63,15 +63,9 @@
 						{{ctx.Locale.Tr "settings.subkeys"}}: {{range .SubsKey}} {{.PaddedKeyID}} {{end}}
 					

 					

-						

-							{{ctx.Locale.Tr "settings.added_on" (DateTime "short" .AddedUnix)}}
-							-
-							{{if not .ExpiredUnix.IsZero}}
-								{{ctx.Locale.Tr "settings.valid_until_date" (DateTime "short" .ExpiredUnix)}}
-							{{else}}
-								{{ctx.Locale.Tr "settings.valid_forever"}}
-							{{end}}
-						

+						
{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .AddedUnix)}}

+						-
+						
{{if not .ExpiredUnix.IsZero}}{{ctx.Locale.Tr "settings.valid_until_date" (ctx.DateUtils.AbsoluteShort .ExpiredUnix)}}{{else}}{{ctx.Locale.Tr "settings.valid_forever"}}{{end}}

 					

 				

 				

diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl
index 94b1b2c8ff..0bb943054f 100644
--- a/templates/user/settings/keys_principal.tmpl
+++ b/templates/user/settings/keys_principal.tmpl
@@ -22,7 +22,7 @@
 					

 						
{{.Name}}

 						

-							
{{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}} —  {{svg "octicon-info" 16}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}}

+							
{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}} —  {{svg "octicon-info" 16}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} {{ctx.DateUtils.AbsoluteShort .UpdatedUnix}}{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}}

 						

 					

 					

diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index 058dc9ceb7..5ba58d2234 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -53,7 +53,7 @@
 								{{.Fingerprint}}
 						

 						

-								
{{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}} — {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}}

+								
{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}} —	{{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} {{ctx.DateUtils.AbsoluteShort .UpdatedUnix}}{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}}

 						

 				

 				

diff --git a/templates/user/settings/security/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl
index 346f61c2ad..19ac8b28a6 100644
--- a/templates/user/settings/security/webauthn.tmpl
+++ b/templates/user/settings/security/webauthn.tmpl
@@ -12,7 +12,7 @@
 				

 					
{{.Name}}

 					

-						
{{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}}

+						
{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}}

 					

 				

 				


From 171de4d107bece9d923c2455dff579aa7cd31ecf Mon Sep 17 00:00:00 2001
From: wxiaoguang 
Date: Sat, 2 Nov 2024 19:20:22 +0800
Subject: [PATCH 284/443] [PORT] Fix git error handling (gitea#32401)

---
Conflict resolution: Trivial, for `repo_attributes.go` move where the
`IsErrCanceledOrKilled` needs to happen because of other changes that
happened in this file.

To add some words to this change: It seems to be mostly simplifying the
error handling of git operations.

(cherry picked from commit e524f63d58900557d7d57fc3bcd19d9facc8b8ee)
---
 .deadcode-out                          |  3 --
 modules/git/error.go                   | 40 ++++++--------------------
 modules/git/repo_attribute.go          |  2 +-
 routers/api/v1/repo/repo.go            |  7 ++---
 routers/private/default_branch.go      | 11 +++----
 routers/web/repo/githttp.go            |  2 +-
 services/gitdiff/gitdiff.go            |  2 +-
 services/mirror/mirror_pull.go         | 10 ++-----
 services/repository/branch.go          |  7 +----
 services/repository/files/temp_repo.go | 34 +++++++++-------------
 services/repository/push.go            |  4 +--
 11 files changed, 36 insertions(+), 86 deletions(-)

diff --git a/.deadcode-out b/.deadcode-out
index f6a194b17f..8c3e3090d2 100644
--- a/.deadcode-out
+++ b/.deadcode-out
@@ -137,9 +137,6 @@ code.gitea.io/gitea/modules/git
 	AddChangesWithArgs
 	CommitChanges
 	CommitChangesWithArgs
-	IsErrExecTimeout
-	ErrExecTimeout.Error
-	ErrUnsupportedVersion.Error
 	SetUpdateHook
 	openRepositoryWithDefaultContext
 	IsTagExist
diff --git a/modules/git/error.go b/modules/git/error.go
index 91d25eca69..10fb37be07 100644
--- a/modules/git/error.go
+++ b/modules/git/error.go
@@ -4,28 +4,14 @@
 package git
 
 import (
+	"context"
+	"errors"
 	"fmt"
 	"strings"
-	"time"
 
 	"code.gitea.io/gitea/modules/util"
 )
 
-// ErrExecTimeout error when exec timed out
-type ErrExecTimeout struct {
-	Duration time.Duration
-}
-
-// IsErrExecTimeout if some error is ErrExecTimeout
-func IsErrExecTimeout(err error) bool {
-	_, ok := err.(ErrExecTimeout)
-	return ok
-}
-
-func (err ErrExecTimeout) Error() string {
-	return fmt.Sprintf("execution is timeout [duration: %v]", err.Duration)
-}
-
 // ErrNotExist commit not exist error
 type ErrNotExist struct {
 	ID      string
@@ -62,21 +48,6 @@ func IsErrBadLink(err error) bool {
 	return ok
 }
 
-// ErrUnsupportedVersion error when required git version not matched
-type ErrUnsupportedVersion struct {
-	Required string
-}
-
-// IsErrUnsupportedVersion if some error is ErrUnsupportedVersion
-func IsErrUnsupportedVersion(err error) bool {
-	_, ok := err.(ErrUnsupportedVersion)
-	return ok
-}
-
-func (err ErrUnsupportedVersion) Error() string {
-	return fmt.Sprintf("Operation requires higher version [required: %s]", err.Required)
-}
-
 // ErrBranchNotExist represents a "BranchNotExist" kind of error.
 type ErrBranchNotExist struct {
 	Name string
@@ -185,3 +156,10 @@ func IsErrMoreThanOne(err error) bool {
 func (err *ErrMoreThanOne) Error() string {
 	return fmt.Sprintf("ErrMoreThanOne Error: %v: %s\n%s", err.Err, err.StdErr, err.StdOut)
 }
+
+func IsErrCanceledOrKilled(err error) bool {
+	// When "cancel()" a git command's context, the returned error of "Run()" could be one of them:
+	// - context.Canceled
+	// - *exec.ExitError: "signal: killed"
+	return err != nil && (errors.Is(err, context.Canceled) || err.Error() == "signal: killed")
+}
diff --git a/modules/git/repo_attribute.go b/modules/git/repo_attribute.go
index 3ccc1b84a6..cfe4cf7156 100644
--- a/modules/git/repo_attribute.go
+++ b/modules/git/repo_attribute.go
@@ -250,7 +250,7 @@ func (repo *Repository) GitAttributeChecker(treeish string, attributes ...string
 			err = e
 		}
 
-		if err != nil { // decorate the returned error
+		if err != nil && !IsErrCanceledOrKilled(err) { // decorate the returned error
 			err = fmt.Errorf("git check-attr (stderr: %q): %w", strings.TrimSpace(stdErr.String()), err)
 			ac.err.Store(err)
 		}
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
index e25593cf6d..e2e784a671 100644
--- a/routers/api/v1/repo/repo.go
+++ b/routers/api/v1/repo/repo.go
@@ -21,7 +21,6 @@ import (
 	repo_model "code.gitea.io/gitea/models/repo"
 	unit_model "code.gitea.io/gitea/models/unit"
 	user_model "code.gitea.io/gitea/models/user"
-	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/label"
 	"code.gitea.io/gitea/modules/log"
@@ -748,10 +747,8 @@ func updateBasicProperties(ctx *context.APIContext, opts api.EditRepoOption) err
 	if opts.DefaultBranch != nil && repo.DefaultBranch != *opts.DefaultBranch && (repo.IsEmpty || ctx.Repo.GitRepo.IsBranchExist(*opts.DefaultBranch)) {
 		if !repo.IsEmpty {
 			if err := gitrepo.SetDefaultBranch(ctx, ctx.Repo.Repository, *opts.DefaultBranch); err != nil {
-				if !git.IsErrUnsupportedVersion(err) {
-					ctx.Error(http.StatusInternalServerError, "SetDefaultBranch", err)
-					return err
-				}
+				ctx.Error(http.StatusInternalServerError, "SetDefaultBranch", err)
+				return err
 			}
 		}
 		repo.DefaultBranch = *opts.DefaultBranch
diff --git a/routers/private/default_branch.go b/routers/private/default_branch.go
index 33890be6a9..af5d75634b 100644
--- a/routers/private/default_branch.go
+++ b/routers/private/default_branch.go
@@ -8,7 +8,6 @@ import (
 	"net/http"
 
 	repo_model "code.gitea.io/gitea/models/repo"
-	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/private"
 	gitea_context "code.gitea.io/gitea/services/context"
@@ -22,12 +21,10 @@ func SetDefaultBranch(ctx *gitea_context.PrivateContext) {
 
 	ctx.Repo.Repository.DefaultBranch = branch
 	if err := gitrepo.SetDefaultBranch(ctx, ctx.Repo.Repository, ctx.Repo.Repository.DefaultBranch); err != nil {
-		if !git.IsErrUnsupportedVersion(err) {
-			ctx.JSON(http.StatusInternalServerError, private.Response{
-				Err: fmt.Sprintf("Unable to set default branch on repository: %s/%s Error: %v", ownerName, repoName, err),
-			})
-			return
-		}
+		ctx.JSON(http.StatusInternalServerError, private.Response{
+			Err: fmt.Sprintf("Unable to set default branch on repository: %s/%s Error: %v", ownerName, repoName, err),
+		})
+		return
 	}
 
 	if err := repo_model.UpdateDefaultBranch(ctx, ctx.Repo.Repository); err != nil {
diff --git a/routers/web/repo/githttp.go b/routers/web/repo/githttp.go
index a082498dfd..c1adca174f 100644
--- a/routers/web/repo/githttp.go
+++ b/routers/web/repo/githttp.go
@@ -467,7 +467,7 @@ func serviceRPC(ctx *context.Context, h *serviceHandler, service string) {
 		Stderr:            &stderr,
 		UseContextTimeout: true,
 	}); err != nil {
-		if err.Error() != "signal: killed" {
+		if !git.IsErrCanceledOrKilled(err) {
 			log.Error("Fail to serve RPC(%s) in %s: %v - %s", service, h.getRepoDir(), err, stderr.String())
 		}
 		return
diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go
index 8f376a1045..91b1f135c4 100644
--- a/services/gitdiff/gitdiff.go
+++ b/services/gitdiff/gitdiff.go
@@ -1159,7 +1159,7 @@ func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, fi
 			Dir:     repoPath,
 			Stdout:  writer,
 			Stderr:  stderr,
-		}); err != nil {
+		}); err != nil && !git.IsErrCanceledOrKilled(err) {
 			log.Error("error during GetDiff(git diff dir: %s): %v, stderr: %s", repoPath, err, stderr.String())
 		}
 
diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go
index 9f7ffb29c9..2d128919f9 100644
--- a/services/mirror/mirror_pull.go
+++ b/services/mirror/mirror_pull.go
@@ -604,14 +604,8 @@ func checkAndUpdateEmptyRepository(ctx context.Context, m *repo_model.Mirror, re
 		}
 		// Update the git repository default branch
 		if err := gitrepo.SetDefaultBranch(ctx, m.Repo, m.Repo.DefaultBranch); err != nil {
-			if !git.IsErrUnsupportedVersion(err) {
-				log.Error("Failed to update default branch of underlying git repository %-v. Error: %v", m.Repo, err)
-				desc := fmt.Sprintf("Failed to update default branch of underlying git repository '%s': %v", m.Repo.RepoPath(), err)
-				if err = system_model.CreateRepositoryNotice(desc); err != nil {
-					log.Error("CreateRepositoryNotice: %v", err)
-				}
-				return false
-			}
+			log.Error("Failed to update default branch of underlying git repository %-v. Error: %v", m.Repo, err)
+			return false
 		}
 		m.Repo.IsEmpty = false
 		// Update the is empty and default_branch columns
diff --git a/services/repository/branch.go b/services/repository/branch.go
index 7d92053178..8d5df98f86 100644
--- a/services/repository/branch.go
+++ b/services/repository/branch.go
@@ -588,12 +588,7 @@ func SetRepoDefaultBranch(ctx context.Context, repo *repo_model.Repository, gitR
 			log.Error("CancelPreviousJobs: %v", err)
 		}
 
-		if err := gitrepo.SetDefaultBranch(ctx, repo, newBranchName); err != nil {
-			if !git.IsErrUnsupportedVersion(err) {
-				return err
-			}
-		}
-		return nil
+		return gitrepo.SetDefaultBranch(ctx, repo, newBranchName)
 	}); err != nil {
 		return err
 	}
diff --git a/services/repository/files/temp_repo.go b/services/repository/files/temp_repo.go
index 50b936cfa7..6e7570b82c 100644
--- a/services/repository/files/temp_repo.go
+++ b/services/repository/files/temp_repo.go
@@ -343,8 +343,7 @@ func (t *TemporaryUploadRepository) Push(doer *user_model.User, commitHash, bran
 func (t *TemporaryUploadRepository) DiffIndex() (*gitdiff.Diff, error) {
 	stdoutReader, stdoutWriter, err := os.Pipe()
 	if err != nil {
-		log.Error("Unable to open stdout pipe: %v", err)
-		return nil, fmt.Errorf("Unable to open stdout pipe: %w", err)
+		return nil, fmt.Errorf("unable to open stdout pipe: %w", err)
 	}
 	defer func() {
 		_ = stdoutReader.Close()
@@ -352,9 +351,7 @@ func (t *TemporaryUploadRepository) DiffIndex() (*gitdiff.Diff, error) {
 	}()
 	stderr := new(bytes.Buffer)
 	var diff *gitdiff.Diff
-	var finalErr error
-
-	if err := git.NewCommand(t.ctx, "diff-index", "--src-prefix=\\a/", "--dst-prefix=\\b/", "--cached", "-p", "HEAD").
+	err = git.NewCommand(t.ctx, "diff-index", "--src-prefix=\\a/", "--dst-prefix=\\b/", "--cached", "-p", "HEAD").
 		Run(&git.RunOpts{
 			Timeout: 30 * time.Second,
 			Dir:     t.basePath,
@@ -362,23 +359,20 @@ func (t *TemporaryUploadRepository) DiffIndex() (*gitdiff.Diff, error) {
 			Stderr:  stderr,
 			PipelineFunc: func(ctx context.Context, cancel context.CancelFunc) error {
 				_ = stdoutWriter.Close()
-				diff, finalErr = gitdiff.ParsePatch(t.ctx, setting.Git.MaxGitDiffLines, setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles, stdoutReader, "")
-				if finalErr != nil {
-					log.Error("ParsePatch: %v", finalErr)
-					cancel()
-				}
+				defer cancel()
+				var diffErr error
+				diff, diffErr = gitdiff.ParsePatch(t.ctx, setting.Git.MaxGitDiffLines, setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles, stdoutReader, "")
 				_ = stdoutReader.Close()
-				return finalErr
+				if diffErr != nil {
+					// if the diffErr is not nil, it will be returned as the error of "Run()"
+					return fmt.Errorf("ParsePatch: %w", diffErr)
+				}
+				return nil
 			},
-		}); err != nil {
-		if finalErr != nil {
-			log.Error("Unable to ParsePatch in temporary repo %s (%s). Error: %v", t.repo.FullName(), t.basePath, finalErr)
-			return nil, finalErr
-		}
-		log.Error("Unable to run diff-index pipeline in temporary repo %s (%s). Error: %v\nStderr: %s",
-			t.repo.FullName(), t.basePath, err, stderr)
-		return nil, fmt.Errorf("Unable to run diff-index pipeline in temporary repo %s. Error: %w\nStderr: %s",
-			t.repo.FullName(), err, stderr)
+		})
+	if err != nil && !git.IsErrCanceledOrKilled(err) {
+		log.Error("Unable to diff-index in temporary repo %s (%s). Error: %v\nStderr: %s", t.repo.FullName(), t.basePath, err, stderr)
+		return nil, fmt.Errorf("unable to run diff-index pipeline in temporary repo: %w", err)
 	}
 
 	diff.NumFiles, diff.TotalAddition, diff.TotalDeletion, err = git.GetDiffShortStat(t.ctx, t.basePath, git.TrustedCmdArgs{"--cached"}, "HEAD")
diff --git a/services/repository/push.go b/services/repository/push.go
index afd6308cdb..0f24295e89 100644
--- a/services/repository/push.go
+++ b/services/repository/push.go
@@ -183,9 +183,7 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
 						repo.IsEmpty = false
 						if repo.DefaultBranch != setting.Repository.DefaultBranch {
 							if err := gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {
-								if !git.IsErrUnsupportedVersion(err) {
-									return err
-								}
+								return err
 							}
 						}
 						// Update the is empty and default_branch columns

From 498b5f9867cb677c7b258ff87347e53eb58aa8fb Mon Sep 17 00:00:00 2001
From: wxiaoguang 
Date: Sun, 27 Oct 2024 19:54:35 +0800
Subject: [PATCH 285/443] [PORT] Refactor the DB migration system slightly
 (gitea#32344)

Introduce "idNumber" for each migration, and clarify the difference
between the migration ID number and database version.

---
Conflict resolution: trivial

(cherry picked from commit d70af38447a759d4a935e315e18efa4dd625f655)
---
 models/migrations/migrations.go      | 831 ++++++++++-----------------
 models/migrations/migrations_test.go |  27 +
 routers/common/db.go                 |   2 +-
 services/doctor/dbversion.go         |   2 +-
 4 files changed, 338 insertions(+), 524 deletions(-)
 create mode 100644 models/migrations/migrations_test.go

diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index d7e951f8bc..77a97fb3f6 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -38,25 +38,15 @@ import (
 
 const minDBVersion = 70 // Gitea 1.5.3
 
-// Migration describes on migration from lower version to high version
-type Migration interface {
-	Description() string
-	Migrate(*xorm.Engine) error
-}
-
 type migration struct {
+	idNumber    int64 // DB version is "the last migration's idNumber" + 1
 	description string
 	migrate     func(*xorm.Engine) error
 }
 
-// NewMigration creates a new migration
-func NewMigration(desc string, fn func(*xorm.Engine) error) Migration {
-	return &migration{desc, fn}
-}
-
-// Description returns the migration's description
-func (m *migration) Description() string {
-	return m.description
+// newMigration creates a new migration
+func newMigration(idNumber int64, desc string, fn func(*xorm.Engine) error) *migration {
+	return &migration{idNumber, desc, fn}
 }
 
 // Migrate executes the migration
@@ -67,538 +57,313 @@ func (m *migration) Migrate(x *xorm.Engine) error {
 // Version describes the version table. Should have only one row with id==1
 type Version struct {
 	ID      int64 `xorm:"pk autoincr"`
-	Version int64
+	Version int64 // DB version is "the last migration's idNumber" + 1
 }
 
 // Use noopMigration when there is a migration that has been no-oped
 var noopMigration = func(_ *xorm.Engine) error { return nil }
 
+var preparedMigrations []*migration
+
 // This is a sequence of migrations. Add new migrations to the bottom of the list.
 // If you want to "retire" a migration, remove it from the top of the list and
 // update minDBVersion accordingly
-var migrations = []Migration{
-	// Gitea 1.5.0 ends at v69
+func prepareMigrationTasks() []*migration {
+	if preparedMigrations != nil {
+		return preparedMigrations
+	}
+	preparedMigrations = []*migration{
+		// Gitea 1.5.0 ends at database version 69
 
-	// v70 -> v71
-	NewMigration("add issue_dependencies", v1_6.AddIssueDependencies),
-	// v71 -> v72
-	NewMigration("protect each scratch token", v1_6.AddScratchHash),
-	// v72 -> v73
-	NewMigration("add review", v1_6.AddReview),
+		newMigration(70, "add issue_dependencies", v1_6.AddIssueDependencies),
+		newMigration(71, "protect each scratch token", v1_6.AddScratchHash),
+		newMigration(72, "add review", v1_6.AddReview),
 
-	// Gitea 1.6.0 ends at v73
+		// Gitea 1.6.0 ends at database version 73
 
-	// v73 -> v74
-	NewMigration("add must_change_password column for users table", v1_7.AddMustChangePassword),
-	// v74 -> v75
-	NewMigration("add approval whitelists to protected branches", v1_7.AddApprovalWhitelistsToProtectedBranches),
-	// v75 -> v76
-	NewMigration("clear nonused data which not deleted when user was deleted", v1_7.ClearNonusedData),
+		newMigration(73, "add must_change_password column for users table", v1_7.AddMustChangePassword),
+		newMigration(74, "add approval whitelists to protected branches", v1_7.AddApprovalWhitelistsToProtectedBranches),
+		newMigration(75, "clear nonused data which not deleted when user was deleted", v1_7.ClearNonusedData),
 
-	// Gitea 1.7.0 ends at v76
+		// Gitea 1.7.0 ends at database version 76
 
-	// v76 -> v77
-	NewMigration("add pull request rebase with merge commit", v1_8.AddPullRequestRebaseWithMerge),
-	// v77 -> v78
-	NewMigration("add theme to users", v1_8.AddUserDefaultTheme),
-	// v78 -> v79
-	NewMigration("rename repo is_bare to repo is_empty", v1_8.RenameRepoIsBareToIsEmpty),
-	// v79 -> v80
-	NewMigration("add can close issues via commit in any branch", v1_8.AddCanCloseIssuesViaCommitInAnyBranch),
-	// v80 -> v81
-	NewMigration("add is locked to issues", v1_8.AddIsLockedToIssues),
-	// v81 -> v82
-	NewMigration("update U2F counter type", v1_8.ChangeU2FCounterType),
+		newMigration(76, "add pull request rebase with merge commit", v1_8.AddPullRequestRebaseWithMerge),
+		newMigration(77, "add theme to users", v1_8.AddUserDefaultTheme),
+		newMigration(78, "rename repo is_bare to repo is_empty", v1_8.RenameRepoIsBareToIsEmpty),
+		newMigration(79, "add can close issues via commit in any branch", v1_8.AddCanCloseIssuesViaCommitInAnyBranch),
+		newMigration(80, "add is locked to issues", v1_8.AddIsLockedToIssues),
+		newMigration(81, "update U2F counter type", v1_8.ChangeU2FCounterType),
 
-	// Gitea 1.8.0 ends at v82
+		// Gitea 1.8.0 ends at database version 82
 
-	// v82 -> v83
-	NewMigration("hot fix for wrong release sha1 on release table", v1_9.FixReleaseSha1OnReleaseTable),
-	// v83 -> v84
-	NewMigration("add uploader id for table attachment", v1_9.AddUploaderIDForAttachment),
-	// v84 -> v85
-	NewMigration("add table to store original imported gpg keys", v1_9.AddGPGKeyImport),
-	// v85 -> v86
-	NewMigration("hash application token", v1_9.HashAppToken),
-	// v86 -> v87
-	NewMigration("add http method to webhook", v1_9.AddHTTPMethodToWebhook),
-	// v87 -> v88
-	NewMigration("add avatar field to repository", v1_9.AddAvatarFieldToRepository),
+		newMigration(82, "hot fix for wrong release sha1 on release table", v1_9.FixReleaseSha1OnReleaseTable),
+		newMigration(83, "add uploader id for table attachment", v1_9.AddUploaderIDForAttachment),
+		newMigration(84, "add table to store original imported gpg keys", v1_9.AddGPGKeyImport),
+		newMigration(85, "hash application token", v1_9.HashAppToken),
+		newMigration(86, "add http method to webhook", v1_9.AddHTTPMethodToWebhook),
+		newMigration(87, "add avatar field to repository", v1_9.AddAvatarFieldToRepository),
 
-	// Gitea 1.9.0 ends at v88
+		// Gitea 1.9.0 ends at database version 88
 
-	// v88 -> v89
-	NewMigration("add commit status context field to commit_status", v1_10.AddCommitStatusContext),
-	// v89 -> v90
-	NewMigration("add original author/url migration info to issues, comments, and repo ", v1_10.AddOriginalMigrationInfo),
-	// v90 -> v91
-	NewMigration("change length of some repository columns", v1_10.ChangeSomeColumnsLengthOfRepo),
-	// v91 -> v92
-	NewMigration("add index on owner_id of repository and type, review_id of comment", v1_10.AddIndexOnRepositoryAndComment),
-	// v92 -> v93
-	NewMigration("remove orphaned repository index statuses", v1_10.RemoveLingeringIndexStatus),
-	// v93 -> v94
-	NewMigration("add email notification enabled preference to user", v1_10.AddEmailNotificationEnabledToUser),
-	// v94 -> v95
-	NewMigration("add enable_status_check, status_check_contexts to protected_branch", v1_10.AddStatusCheckColumnsForProtectedBranches),
-	// v95 -> v96
-	NewMigration("add table columns for cross referencing issues", v1_10.AddCrossReferenceColumns),
-	// v96 -> v97
-	NewMigration("delete orphaned attachments", v1_10.DeleteOrphanedAttachments),
-	// v97 -> v98
-	NewMigration("add repo_admin_change_team_access to user", v1_10.AddRepoAdminChangeTeamAccessColumnForUser),
-	// v98 -> v99
-	NewMigration("add original author name and id on migrated release", v1_10.AddOriginalAuthorOnMigratedReleases),
-	// v99 -> v100
-	NewMigration("add task table and status column for repository table", v1_10.AddTaskTable),
-	// v100 -> v101
-	NewMigration("update migration repositories' service type", v1_10.UpdateMigrationServiceTypes),
-	// v101 -> v102
-	NewMigration("change length of some external login users columns", v1_10.ChangeSomeColumnsLengthOfExternalLoginUser),
+		newMigration(88, "add commit status context field to commit_status", v1_10.AddCommitStatusContext),
+		newMigration(89, "add original author/url migration info to issues, comments, and repo ", v1_10.AddOriginalMigrationInfo),
+		newMigration(90, "change length of some repository columns", v1_10.ChangeSomeColumnsLengthOfRepo),
+		newMigration(91, "add index on owner_id of repository and type, review_id of comment", v1_10.AddIndexOnRepositoryAndComment),
+		newMigration(92, "remove orphaned repository index statuses", v1_10.RemoveLingeringIndexStatus),
+		newMigration(93, "add email notification enabled preference to user", v1_10.AddEmailNotificationEnabledToUser),
+		newMigration(94, "add enable_status_check, status_check_contexts to protected_branch", v1_10.AddStatusCheckColumnsForProtectedBranches),
+		newMigration(95, "add table columns for cross referencing issues", v1_10.AddCrossReferenceColumns),
+		newMigration(96, "delete orphaned attachments", v1_10.DeleteOrphanedAttachments),
+		newMigration(97, "add repo_admin_change_team_access to user", v1_10.AddRepoAdminChangeTeamAccessColumnForUser),
+		newMigration(98, "add original author name and id on migrated release", v1_10.AddOriginalAuthorOnMigratedReleases),
+		newMigration(99, "add task table and status column for repository table", v1_10.AddTaskTable),
+		newMigration(100, "update migration repositories' service type", v1_10.UpdateMigrationServiceTypes),
+		newMigration(101, "change length of some external login users columns", v1_10.ChangeSomeColumnsLengthOfExternalLoginUser),
 
-	// Gitea 1.10.0 ends at v102
+		// Gitea 1.10.0 ends at database version 102
 
-	// v102 -> v103
-	NewMigration("update migration repositories' service type", v1_11.DropColumnHeadUserNameOnPullRequest),
-	// v103 -> v104
-	NewMigration("Add WhitelistDeployKeys to protected branch", v1_11.AddWhitelistDeployKeysToBranches),
-	// v104 -> v105
-	NewMigration("remove unnecessary columns from label", v1_11.RemoveLabelUneededCols),
-	// v105 -> v106
-	NewMigration("add includes_all_repositories to teams", v1_11.AddTeamIncludesAllRepositories),
-	// v106 -> v107
-	NewMigration("add column `mode` to table watch", v1_11.AddModeColumnToWatch),
-	// v107 -> v108
-	NewMigration("Add template options to repository", v1_11.AddTemplateToRepo),
-	// v108 -> v109
-	NewMigration("Add comment_id on table notification", v1_11.AddCommentIDOnNotification),
-	// v109 -> v110
-	NewMigration("add can_create_org_repo to team", v1_11.AddCanCreateOrgRepoColumnForTeam),
-	// v110 -> v111
-	NewMigration("change review content type to text", v1_11.ChangeReviewContentToText),
-	// v111 -> v112
-	NewMigration("update branch protection for can push and whitelist enable", v1_11.AddBranchProtectionCanPushAndEnableWhitelist),
-	// v112 -> v113
-	NewMigration("remove release attachments which repository deleted", v1_11.RemoveAttachmentMissedRepo),
-	// v113 -> v114
-	NewMigration("new feature: change target branch of pull requests", v1_11.FeatureChangeTargetBranch),
-	// v114 -> v115
-	NewMigration("Remove authentication credentials from stored URL", v1_11.SanitizeOriginalURL),
-	// v115 -> v116
-	NewMigration("add user_id prefix to existing user avatar name", v1_11.RenameExistingUserAvatarName),
-	// v116 -> v117
-	NewMigration("Extend TrackedTimes", v1_11.ExtendTrackedTimes),
+		newMigration(102, "update migration repositories' service type", v1_11.DropColumnHeadUserNameOnPullRequest),
+		newMigration(103, "Add WhitelistDeployKeys to protected branch", v1_11.AddWhitelistDeployKeysToBranches),
+		newMigration(104, "remove unnecessary columns from label", v1_11.RemoveLabelUneededCols),
+		newMigration(105, "add includes_all_repositories to teams", v1_11.AddTeamIncludesAllRepositories),
+		newMigration(106, "add column `mode` to table watch", v1_11.AddModeColumnToWatch),
+		newMigration(107, "Add template options to repository", v1_11.AddTemplateToRepo),
+		newMigration(108, "Add comment_id on table notification", v1_11.AddCommentIDOnNotification),
+		newMigration(109, "add can_create_org_repo to team", v1_11.AddCanCreateOrgRepoColumnForTeam),
+		newMigration(110, "change review content type to text", v1_11.ChangeReviewContentToText),
+		newMigration(111, "update branch protection for can push and whitelist enable", v1_11.AddBranchProtectionCanPushAndEnableWhitelist),
+		newMigration(112, "remove release attachments which repository deleted", v1_11.RemoveAttachmentMissedRepo),
+		newMigration(113, "new feature: change target branch of pull requests", v1_11.FeatureChangeTargetBranch),
+		newMigration(114, "Remove authentication credentials from stored URL", v1_11.SanitizeOriginalURL),
+		newMigration(115, "add user_id prefix to existing user avatar name", v1_11.RenameExistingUserAvatarName),
+		newMigration(116, "Extend TrackedTimes", v1_11.ExtendTrackedTimes),
 
-	// Gitea 1.11.0 ends at v117
+		// Gitea 1.11.0 ends at database version 117
 
-	// v117 -> v118
-	NewMigration("Add block on rejected reviews branch protection", v1_12.AddBlockOnRejectedReviews),
-	// v118 -> v119
-	NewMigration("Add commit id and stale to reviews", v1_12.AddReviewCommitAndStale),
-	// v119 -> v120
-	NewMigration("Fix migrated repositories' git service type", v1_12.FixMigratedRepositoryServiceType),
-	// v120 -> v121
-	NewMigration("Add owner_name on table repository", v1_12.AddOwnerNameOnRepository),
-	// v121 -> v122
-	NewMigration("add is_restricted column for users table", v1_12.AddIsRestricted),
-	// v122 -> v123
-	NewMigration("Add Require Signed Commits to ProtectedBranch", v1_12.AddRequireSignedCommits),
-	// v123 -> v124
-	NewMigration("Add original information for reactions", v1_12.AddReactionOriginals),
-	// v124 -> v125
-	NewMigration("Add columns to user and repository", v1_12.AddUserRepoMissingColumns),
-	// v125 -> v126
-	NewMigration("Add some columns on review for migration", v1_12.AddReviewMigrateInfo),
-	// v126 -> v127
-	NewMigration("Fix topic repository count", v1_12.FixTopicRepositoryCount),
-	// v127 -> v128
-	NewMigration("add repository code language statistics", v1_12.AddLanguageStats),
-	// v128 -> v129
-	NewMigration("fix merge base for pull requests", v1_12.FixMergeBase),
-	// v129 -> v130
-	NewMigration("remove dependencies from deleted repositories", v1_12.PurgeUnusedDependencies),
-	// v130 -> v131
-	NewMigration("Expand webhooks for more granularity", v1_12.ExpandWebhooks),
-	// v131 -> v132
-	NewMigration("Add IsSystemWebhook column to webhooks table", v1_12.AddSystemWebhookColumn),
-	// v132 -> v133
-	NewMigration("Add Branch Protection Protected Files Column", v1_12.AddBranchProtectionProtectedFilesColumn),
-	// v133 -> v134
-	NewMigration("Add EmailHash Table", v1_12.AddEmailHashTable),
-	// v134 -> v135
-	NewMigration("Refix merge base for merged pull requests", v1_12.RefixMergeBase),
-	// v135 -> v136
-	NewMigration("Add OrgID column to Labels table", v1_12.AddOrgIDLabelColumn),
-	// v136 -> v137
-	NewMigration("Add CommitsAhead and CommitsBehind Column to PullRequest Table", v1_12.AddCommitDivergenceToPulls),
-	// v137 -> v138
-	NewMigration("Add Branch Protection Block Outdated Branch", v1_12.AddBlockOnOutdatedBranch),
-	// v138 -> v139
-	NewMigration("Add ResolveDoerID to Comment table", v1_12.AddResolveDoerIDCommentColumn),
-	// v139 -> v140
-	NewMigration("prepend refs/heads/ to issue refs", v1_12.PrependRefsHeadsToIssueRefs),
+		newMigration(117, "Add block on rejected reviews branch protection", v1_12.AddBlockOnRejectedReviews),
+		newMigration(118, "Add commit id and stale to reviews", v1_12.AddReviewCommitAndStale),
+		newMigration(119, "Fix migrated repositories' git service type", v1_12.FixMigratedRepositoryServiceType),
+		newMigration(120, "Add owner_name on table repository", v1_12.AddOwnerNameOnRepository),
+		newMigration(121, "add is_restricted column for users table", v1_12.AddIsRestricted),
+		newMigration(122, "Add Require Signed Commits to ProtectedBranch", v1_12.AddRequireSignedCommits),
+		newMigration(123, "Add original information for reactions", v1_12.AddReactionOriginals),
+		newMigration(124, "Add columns to user and repository", v1_12.AddUserRepoMissingColumns),
+		newMigration(125, "Add some columns on review for migration", v1_12.AddReviewMigrateInfo),
+		newMigration(126, "Fix topic repository count", v1_12.FixTopicRepositoryCount),
+		newMigration(127, "add repository code language statistics", v1_12.AddLanguageStats),
+		newMigration(128, "fix merge base for pull requests", v1_12.FixMergeBase),
+		newMigration(129, "remove dependencies from deleted repositories", v1_12.PurgeUnusedDependencies),
+		newMigration(130, "Expand webhooks for more granularity", v1_12.ExpandWebhooks),
+		newMigration(131, "Add IsSystemWebhook column to webhooks table", v1_12.AddSystemWebhookColumn),
+		newMigration(132, "Add Branch Protection Protected Files Column", v1_12.AddBranchProtectionProtectedFilesColumn),
+		newMigration(133, "Add EmailHash Table", v1_12.AddEmailHashTable),
+		newMigration(134, "Refix merge base for merged pull requests", v1_12.RefixMergeBase),
+		newMigration(135, "Add OrgID column to Labels table", v1_12.AddOrgIDLabelColumn),
+		newMigration(136, "Add CommitsAhead and CommitsBehind Column to PullRequest Table", v1_12.AddCommitDivergenceToPulls),
+		newMigration(137, "Add Branch Protection Block Outdated Branch", v1_12.AddBlockOnOutdatedBranch),
+		newMigration(138, "Add ResolveDoerID to Comment table", v1_12.AddResolveDoerIDCommentColumn),
+		newMigration(139, "prepend refs/heads/ to issue refs", v1_12.PrependRefsHeadsToIssueRefs),
 
-	// Gitea 1.12.0 ends at v140
+		// Gitea 1.12.0 ends at database version 140
 
-	// v140 -> v141
-	NewMigration("Save detected language file size to database instead of percent", v1_13.FixLanguageStatsToSaveSize),
-	// v141 -> v142
-	NewMigration("Add KeepActivityPrivate to User table", v1_13.AddKeepActivityPrivateUserColumn),
-	// v142 -> v143
-	NewMigration("Ensure Repository.IsArchived is not null", v1_13.SetIsArchivedToFalse),
-	// v143 -> v144
-	NewMigration("recalculate Stars number for all user", v1_13.RecalculateStars),
-	// v144 -> v145
-	NewMigration("update Matrix Webhook http method to 'PUT'", v1_13.UpdateMatrixWebhookHTTPMethod),
-	// v145 -> v146
-	NewMigration("Increase Language field to 50 in LanguageStats", v1_13.IncreaseLanguageField),
-	// v146 -> v147
-	NewMigration("Add projects info to repository table", v1_13.AddProjectsInfo),
-	// v147 -> v148
-	NewMigration("create review for 0 review id code comments", v1_13.CreateReviewsForCodeComments),
-	// v148 -> v149
-	NewMigration("remove issue dependency comments who refer to non existing issues", v1_13.PurgeInvalidDependenciesComments),
-	// v149 -> v150
-	NewMigration("Add Created and Updated to Milestone table", v1_13.AddCreatedAndUpdatedToMilestones),
-	// v150 -> v151
-	NewMigration("add primary key to repo_topic", v1_13.AddPrimaryKeyToRepoTopic),
-	// v151 -> v152
-	NewMigration("set default password algorithm to Argon2", v1_13.SetDefaultPasswordToArgon2),
-	// v152 -> v153
-	NewMigration("add TrustModel field to Repository", v1_13.AddTrustModelToRepository),
-	// v153 > v154
-	NewMigration("add Team review request support", v1_13.AddTeamReviewRequestSupport),
-	// v154 > v155
-	NewMigration("add timestamps to Star, Label, Follow, Watch and Collaboration", v1_13.AddTimeStamps),
+		newMigration(140, "Save detected language file size to database instead of percent", v1_13.FixLanguageStatsToSaveSize),
+		newMigration(141, "Add KeepActivityPrivate to User table", v1_13.AddKeepActivityPrivateUserColumn),
+		newMigration(142, "Ensure Repository.IsArchived is not null", v1_13.SetIsArchivedToFalse),
+		newMigration(143, "recalculate Stars number for all user", v1_13.RecalculateStars),
+		newMigration(144, "update Matrix Webhook http method to 'PUT'", v1_13.UpdateMatrixWebhookHTTPMethod),
+		newMigration(145, "Increase Language field to 50 in LanguageStats", v1_13.IncreaseLanguageField),
+		newMigration(146, "Add projects info to repository table", v1_13.AddProjectsInfo),
+		newMigration(147, "create review for 0 review id code comments", v1_13.CreateReviewsForCodeComments),
+		newMigration(148, "remove issue dependency comments who refer to non existing issues", v1_13.PurgeInvalidDependenciesComments),
+		newMigration(149, "Add Created and Updated to Milestone table", v1_13.AddCreatedAndUpdatedToMilestones),
+		newMigration(150, "add primary key to repo_topic", v1_13.AddPrimaryKeyToRepoTopic),
+		newMigration(151, "set default password algorithm to Argon2", v1_13.SetDefaultPasswordToArgon2),
+		newMigration(152, "add TrustModel field to Repository", v1_13.AddTrustModelToRepository),
+		newMigration(153, "add Team review request support", v1_13.AddTeamReviewRequestSupport),
+		newMigration(154, "add timestamps to Star, Label, Follow, Watch and Collaboration", v1_13.AddTimeStamps),
 
-	// Gitea 1.13.0 ends at v155
+		// Gitea 1.13.0 ends at database version 155
 
-	// v155 -> v156
-	NewMigration("add changed_protected_files column for pull_request table", v1_14.AddChangedProtectedFilesPullRequestColumn),
-	// v156 -> v157
-	NewMigration("fix publisher ID for tag releases", v1_14.FixPublisherIDforTagReleases),
-	// v157 -> v158
-	NewMigration("ensure repo topics are up-to-date", v1_14.FixRepoTopics),
-	// v158 -> v159
-	NewMigration("code comment replies should have the commitID of the review they are replying to", v1_14.UpdateCodeCommentReplies),
-	// v159 -> v160
-	NewMigration("update reactions constraint", v1_14.UpdateReactionConstraint),
-	// v160 -> v161
-	NewMigration("Add block on official review requests branch protection", v1_14.AddBlockOnOfficialReviewRequests),
-	// v161 -> v162
-	NewMigration("Convert task type from int to string", v1_14.ConvertTaskTypeToString),
-	// v162 -> v163
-	NewMigration("Convert webhook task type from int to string", v1_14.ConvertWebhookTaskTypeToString),
-	// v163 -> v164
-	NewMigration("Convert topic name from 25 to 50", v1_14.ConvertTopicNameFrom25To50),
-	// v164 -> v165
-	NewMigration("Add scope and nonce columns to oauth2_grant table", v1_14.AddScopeAndNonceColumnsToOAuth2Grant),
-	// v165 -> v166
-	NewMigration("Convert hook task type from char(16) to varchar(16) and trim the column", v1_14.ConvertHookTaskTypeToVarcharAndTrim),
-	// v166 -> v167
-	NewMigration("Where Password is Valid with Empty String delete it", v1_14.RecalculateUserEmptyPWD),
-	// v167 -> v168
-	NewMigration("Add user redirect", v1_14.AddUserRedirect),
-	// v168 -> v169
-	NewMigration("Recreate user table to fix default values", v1_14.RecreateUserTableToFixDefaultValues),
-	// v169 -> v170
-	NewMigration("Update DeleteBranch comments to set the old_ref to the commit_sha", v1_14.CommentTypeDeleteBranchUseOldRef),
-	// v170 -> v171
-	NewMigration("Add Dismissed to Review table", v1_14.AddDismissedReviewColumn),
-	// v171 -> v172
-	NewMigration("Add Sorting to ProjectBoard table", v1_14.AddSortingColToProjectBoard),
-	// v172 -> v173
-	NewMigration("Add sessions table for go-chi/session", v1_14.AddSessionTable),
-	// v173 -> v174
-	NewMigration("Add time_id column to Comment", v1_14.AddTimeIDCommentColumn),
-	// v174 -> v175
-	NewMigration("Create repo transfer table", v1_14.AddRepoTransfer),
-	// v175 -> v176
-	NewMigration("Fix Postgres ID Sequences broken by recreate-table", v1_14.FixPostgresIDSequences),
-	// v176 -> v177
-	NewMigration("Remove invalid labels from comments", v1_14.RemoveInvalidLabels),
-	// v177 -> v178
-	NewMigration("Delete orphaned IssueLabels", v1_14.DeleteOrphanedIssueLabels),
+		newMigration(155, "add changed_protected_files column for pull_request table", v1_14.AddChangedProtectedFilesPullRequestColumn),
+		newMigration(156, "fix publisher ID for tag releases", v1_14.FixPublisherIDforTagReleases),
+		newMigration(157, "ensure repo topics are up-to-date", v1_14.FixRepoTopics),
+		newMigration(158, "code comment replies should have the commitID of the review they are replying to", v1_14.UpdateCodeCommentReplies),
+		newMigration(159, "update reactions constraint", v1_14.UpdateReactionConstraint),
+		newMigration(160, "Add block on official review requests branch protection", v1_14.AddBlockOnOfficialReviewRequests),
+		newMigration(161, "Convert task type from int to string", v1_14.ConvertTaskTypeToString),
+		newMigration(162, "Convert webhook task type from int to string", v1_14.ConvertWebhookTaskTypeToString),
+		newMigration(163, "Convert topic name from 25 to 50", v1_14.ConvertTopicNameFrom25To50),
+		newMigration(164, "Add scope and nonce columns to oauth2_grant table", v1_14.AddScopeAndNonceColumnsToOAuth2Grant),
+		newMigration(165, "Convert hook task type from char(16) to varchar(16) and trim the column", v1_14.ConvertHookTaskTypeToVarcharAndTrim),
+		newMigration(166, "Where Password is Valid with Empty String delete it", v1_14.RecalculateUserEmptyPWD),
+		newMigration(167, "Add user redirect", v1_14.AddUserRedirect),
+		newMigration(168, "Recreate user table to fix default values", v1_14.RecreateUserTableToFixDefaultValues),
+		newMigration(169, "Update DeleteBranch comments to set the old_ref to the commit_sha", v1_14.CommentTypeDeleteBranchUseOldRef),
+		newMigration(170, "Add Dismissed to Review table", v1_14.AddDismissedReviewColumn),
+		newMigration(171, "Add Sorting to ProjectBoard table", v1_14.AddSortingColToProjectBoard),
+		newMigration(172, "Add sessions table for go-chi/session", v1_14.AddSessionTable),
+		newMigration(173, "Add time_id column to Comment", v1_14.AddTimeIDCommentColumn),
+		newMigration(174, "Create repo transfer table", v1_14.AddRepoTransfer),
+		newMigration(175, "Fix Postgres ID Sequences broken by recreate-table", v1_14.FixPostgresIDSequences),
+		newMigration(176, "Remove invalid labels from comments", v1_14.RemoveInvalidLabels),
+		newMigration(177, "Delete orphaned IssueLabels", v1_14.DeleteOrphanedIssueLabels),
 
-	// Gitea 1.14.0 ends at v178
+		// Gitea 1.14.0 ends at database version 178
 
-	// v178 -> v179
-	NewMigration("Add LFS columns to Mirror", v1_15.AddLFSMirrorColumns),
-	// v179 -> v180
-	NewMigration("Convert avatar url to text", v1_15.ConvertAvatarURLToText),
-	// v180 -> v181
-	NewMigration("Delete credentials from past migrations", v1_15.DeleteMigrationCredentials),
-	// v181 -> v182
-	NewMigration("Always save primary email on email address table", v1_15.AddPrimaryEmail2EmailAddress),
-	// v182 -> v183
-	NewMigration("Add issue resource index table", v1_15.AddIssueResourceIndexTable),
-	// v183 -> v184
-	NewMigration("Create PushMirror table", v1_15.CreatePushMirrorTable),
-	// v184 -> v185
-	NewMigration("Rename Task errors to message", v1_15.RenameTaskErrorsToMessage),
-	// v185 -> v186
-	NewMigration("Add new table repo_archiver", v1_15.AddRepoArchiver),
-	// v186 -> v187
-	NewMigration("Create protected tag table", v1_15.CreateProtectedTagTable),
-	// v187 -> v188
-	NewMigration("Drop unneeded webhook related columns", v1_15.DropWebhookColumns),
-	// v188 -> v189
-	NewMigration("Add key is verified to gpg key", v1_15.AddKeyIsVerified),
+		newMigration(178, "Add LFS columns to Mirror", v1_15.AddLFSMirrorColumns),
+		newMigration(179, "Convert avatar url to text", v1_15.ConvertAvatarURLToText),
+		newMigration(180, "Delete credentials from past migrations", v1_15.DeleteMigrationCredentials),
+		newMigration(181, "Always save primary email on email address table", v1_15.AddPrimaryEmail2EmailAddress),
+		newMigration(182, "Add issue resource index table", v1_15.AddIssueResourceIndexTable),
+		newMigration(183, "Create PushMirror table", v1_15.CreatePushMirrorTable),
+		newMigration(184, "Rename Task errors to message", v1_15.RenameTaskErrorsToMessage),
+		newMigration(185, "Add new table repo_archiver", v1_15.AddRepoArchiver),
+		newMigration(186, "Create protected tag table", v1_15.CreateProtectedTagTable),
+		newMigration(187, "Drop unneeded webhook related columns", v1_15.DropWebhookColumns),
+		newMigration(188, "Add key is verified to gpg key", v1_15.AddKeyIsVerified),
 
-	// Gitea 1.15.0 ends at v189
+		// Gitea 1.15.0 ends at database version 189
 
-	// v189 -> v190
-	NewMigration("Unwrap ldap.Sources", v1_16.UnwrapLDAPSourceCfg),
-	// v190 -> v191
-	NewMigration("Add agit flow pull request support", v1_16.AddAgitFlowPullRequest),
-	// v191 -> v192
-	NewMigration("Alter issue/comment table TEXT fields to LONGTEXT", v1_16.AlterIssueAndCommentTextFieldsToLongText),
-	// v192 -> v193
-	NewMigration("RecreateIssueResourceIndexTable to have a primary key instead of an unique index", v1_16.RecreateIssueResourceIndexTable),
-	// v193 -> v194
-	NewMigration("Add repo id column for attachment table", v1_16.AddRepoIDForAttachment),
-	// v194 -> v195
-	NewMigration("Add Branch Protection Unprotected Files Column", v1_16.AddBranchProtectionUnprotectedFilesColumn),
-	// v195 -> v196
-	NewMigration("Add table commit_status_index", v1_16.AddTableCommitStatusIndex),
-	// v196 -> v197
-	NewMigration("Add Color to ProjectBoard table", v1_16.AddColorColToProjectBoard),
-	// v197 -> v198
-	NewMigration("Add renamed_branch table", v1_16.AddRenamedBranchTable),
-	// v198 -> v199
-	NewMigration("Add issue content history table", v1_16.AddTableIssueContentHistory),
-	// v199 -> v200
-	NewMigration("No-op (remote version is using AppState now)", noopMigration),
-	// v200 -> v201
-	NewMigration("Add table app_state", v1_16.AddTableAppState),
-	// v201 -> v202
-	NewMigration("Drop table remote_version (if exists)", v1_16.DropTableRemoteVersion),
-	// v202 -> v203
-	NewMigration("Create key/value table for user settings", v1_16.CreateUserSettingsTable),
-	// v203 -> v204
-	NewMigration("Add Sorting to ProjectIssue table", v1_16.AddProjectIssueSorting),
-	// v204 -> v205
-	NewMigration("Add key is verified to ssh key", v1_16.AddSSHKeyIsVerified),
-	// v205 -> v206
-	NewMigration("Migrate to higher varchar on user struct", v1_16.MigrateUserPasswordSalt),
-	// v206 -> v207
-	NewMigration("Add authorize column to team_unit table", v1_16.AddAuthorizeColForTeamUnit),
-	// v207 -> v208
-	NewMigration("Add webauthn table and migrate u2f data to webauthn - NO-OPED", v1_16.AddWebAuthnCred),
-	// v208 -> v209
-	NewMigration("Use base32.HexEncoding instead of base64 encoding for cred ID as it is case insensitive - NO-OPED", v1_16.UseBase32HexForCredIDInWebAuthnCredential),
-	// v209 -> v210
-	NewMigration("Increase WebAuthentication CredentialID size to 410 - NO-OPED", v1_16.IncreaseCredentialIDTo410),
-	// v210 -> v211
-	NewMigration("v208 was completely broken - remigrate", v1_16.RemigrateU2FCredentials),
+		newMigration(189, "Unwrap ldap.Sources", v1_16.UnwrapLDAPSourceCfg),
+		newMigration(190, "Add agit flow pull request support", v1_16.AddAgitFlowPullRequest),
+		newMigration(191, "Alter issue/comment table TEXT fields to LONGTEXT", v1_16.AlterIssueAndCommentTextFieldsToLongText),
+		newMigration(192, "RecreateIssueResourceIndexTable to have a primary key instead of an unique index", v1_16.RecreateIssueResourceIndexTable),
+		newMigration(193, "Add repo id column for attachment table", v1_16.AddRepoIDForAttachment),
+		newMigration(194, "Add Branch Protection Unprotected Files Column", v1_16.AddBranchProtectionUnprotectedFilesColumn),
+		newMigration(195, "Add table commit_status_index", v1_16.AddTableCommitStatusIndex),
+		newMigration(196, "Add Color to ProjectBoard table", v1_16.AddColorColToProjectBoard),
+		newMigration(197, "Add renamed_branch table", v1_16.AddRenamedBranchTable),
+		newMigration(198, "Add issue content history table", v1_16.AddTableIssueContentHistory),
+		newMigration(199, "No-op (remote version is using AppState now)", noopMigration),
+		newMigration(200, "Add table app_state", v1_16.AddTableAppState),
+		newMigration(201, "Drop table remote_version (if exists)", v1_16.DropTableRemoteVersion),
+		newMigration(202, "Create key/value table for user settings", v1_16.CreateUserSettingsTable),
+		newMigration(203, "Add Sorting to ProjectIssue table", v1_16.AddProjectIssueSorting),
+		newMigration(204, "Add key is verified to ssh key", v1_16.AddSSHKeyIsVerified),
+		newMigration(205, "Migrate to higher varchar on user struct", v1_16.MigrateUserPasswordSalt),
+		newMigration(206, "Add authorize column to team_unit table", v1_16.AddAuthorizeColForTeamUnit),
+		newMigration(207, "Add webauthn table and migrate u2f data to webauthn - NO-OPED", v1_16.AddWebAuthnCred),
+		newMigration(208, "Use base32.HexEncoding instead of base64 encoding for cred ID as it is case insensitive - NO-OPED", v1_16.UseBase32HexForCredIDInWebAuthnCredential),
+		newMigration(209, "Increase WebAuthentication CredentialID size to 410 - NO-OPED", v1_16.IncreaseCredentialIDTo410),
+		newMigration(210, "v208 was completely broken - remigrate", v1_16.RemigrateU2FCredentials),
 
-	// Gitea 1.16.2 ends at v211
+		// Gitea 1.16.2 ends at database version 211
 
-	// v211 -> v212
-	NewMigration("Create ForeignReference table", v1_17.CreateForeignReferenceTable),
-	// v212 -> v213
-	NewMigration("Add package tables", v1_17.AddPackageTables),
-	// v213 -> v214
-	NewMigration("Add allow edits from maintainers to PullRequest table", v1_17.AddAllowMaintainerEdit),
-	// v214 -> v215
-	NewMigration("Add auto merge table", v1_17.AddAutoMergeTable),
-	// v215 -> v216
-	NewMigration("allow to view files in PRs", v1_17.AddReviewViewedFiles),
-	// v216 -> v217
-	NewMigration("No-op (Improve Action table indices v1)", noopMigration),
-	// v217 -> v218
-	NewMigration("Alter hook_task table TEXT fields to LONGTEXT", v1_17.AlterHookTaskTextFieldsToLongText),
-	// v218 -> v219
-	NewMigration("Improve Action table indices v2", v1_17.ImproveActionTableIndices),
-	// v219 -> v220
-	NewMigration("Add sync_on_commit column to push_mirror table", v1_17.AddSyncOnCommitColForPushMirror),
-	// v220 -> v221
-	NewMigration("Add container repository property", v1_17.AddContainerRepositoryProperty),
-	// v221 -> v222
-	NewMigration("Store WebAuthentication CredentialID as bytes and increase size to at least 1024", v1_17.StoreWebauthnCredentialIDAsBytes),
-	// v222 -> v223
-	NewMigration("Drop old CredentialID column", v1_17.DropOldCredentialIDColumn),
-	// v223 -> v224
-	NewMigration("Rename CredentialIDBytes column to CredentialID", v1_17.RenameCredentialIDBytes),
+		newMigration(211, "Create ForeignReference table", v1_17.CreateForeignReferenceTable),
+		newMigration(212, "Add package tables", v1_17.AddPackageTables),
+		newMigration(213, "Add allow edits from maintainers to PullRequest table", v1_17.AddAllowMaintainerEdit),
+		newMigration(214, "Add auto merge table", v1_17.AddAutoMergeTable),
+		newMigration(215, "allow to view files in PRs", v1_17.AddReviewViewedFiles),
+		newMigration(216, "No-op (Improve Action table indices v1)", noopMigration),
+		newMigration(217, "Alter hook_task table TEXT fields to LONGTEXT", v1_17.AlterHookTaskTextFieldsToLongText),
+		newMigration(218, "Improve Action table indices v2", v1_17.ImproveActionTableIndices),
+		newMigration(219, "Add sync_on_commit column to push_mirror table", v1_17.AddSyncOnCommitColForPushMirror),
+		newMigration(220, "Add container repository property", v1_17.AddContainerRepositoryProperty),
+		newMigration(221, "Store WebAuthentication CredentialID as bytes and increase size to at least 1024", v1_17.StoreWebauthnCredentialIDAsBytes),
+		newMigration(222, "Drop old CredentialID column", v1_17.DropOldCredentialIDColumn),
+		newMigration(223, "Rename CredentialIDBytes column to CredentialID", v1_17.RenameCredentialIDBytes),
 
-	// Gitea 1.17.0 ends at v224
+		// Gitea 1.17.0 ends at database version 224
 
-	// v224 -> v225
-	NewMigration("Add badges to users", v1_18.CreateUserBadgesTable),
-	// v225 -> v226
-	NewMigration("Alter gpg_key/public_key content TEXT fields to MEDIUMTEXT", v1_18.AlterPublicGPGKeyContentFieldsToMediumText),
-	// v226 -> v227
-	NewMigration("Conan and generic packages do not need to be semantically versioned", v1_18.FixPackageSemverField),
-	// v227 -> v228
-	NewMigration("Create key/value table for system settings", v1_18.CreateSystemSettingsTable),
-	// v228 -> v229
-	NewMigration("Add TeamInvite table", v1_18.AddTeamInviteTable),
-	// v229 -> v230
-	NewMigration("Update counts of all open milestones", v1_18.UpdateOpenMilestoneCounts),
-	// v230 -> v231
-	NewMigration("Add ConfidentialClient column (default true) to OAuth2Application table", v1_18.AddConfidentialClientColumnToOAuth2ApplicationTable),
+		newMigration(224, "Add badges to users", v1_18.CreateUserBadgesTable),
+		newMigration(225, "Alter gpg_key/public_key content TEXT fields to MEDIUMTEXT", v1_18.AlterPublicGPGKeyContentFieldsToMediumText),
+		newMigration(226, "Conan and generic packages do not need to be semantically versioned", v1_18.FixPackageSemverField),
+		newMigration(227, "Create key/value table for system settings", v1_18.CreateSystemSettingsTable),
+		newMigration(228, "Add TeamInvite table", v1_18.AddTeamInviteTable),
+		newMigration(229, "Update counts of all open milestones", v1_18.UpdateOpenMilestoneCounts),
+		newMigration(230, "Add ConfidentialClient column (default true) to OAuth2Application table", v1_18.AddConfidentialClientColumnToOAuth2ApplicationTable),
 
-	// Gitea 1.18.0 ends at v231
+		// Gitea 1.18.0 ends at database version 231
 
-	// v231 -> v232
-	NewMigration("Add index for hook_task", v1_19.AddIndexForHookTask),
-	// v232 -> v233
-	NewMigration("Alter package_version.metadata_json to LONGTEXT", v1_19.AlterPackageVersionMetadataToLongText),
-	// v233 -> v234
-	NewMigration("Add header_authorization_encrypted column to webhook table", v1_19.AddHeaderAuthorizationEncryptedColWebhook),
-	// v234 -> v235
-	NewMigration("Add package cleanup rule table", v1_19.CreatePackageCleanupRuleTable),
-	// v235 -> v236
-	NewMigration("Add index for access_token", v1_19.AddIndexForAccessToken),
-	// v236 -> v237
-	NewMigration("Create secrets table", v1_19.CreateSecretsTable),
-	// v237 -> v238
-	NewMigration("Drop ForeignReference table", v1_19.DropForeignReferenceTable),
-	// v238 -> v239
-	NewMigration("Add updated unix to LFSMetaObject", v1_19.AddUpdatedUnixToLFSMetaObject),
-	// v239 -> v240
-	NewMigration("Add scope for access_token", v1_19.AddScopeForAccessTokens),
-	// v240 -> v241
-	NewMigration("Add actions tables", v1_19.AddActionsTables),
-	// v241 -> v242
-	NewMigration("Add card_type column to project table", v1_19.AddCardTypeToProjectTable),
-	// v242 -> v243
-	NewMigration("Alter gpg_key_import content TEXT field to MEDIUMTEXT", v1_19.AlterPublicGPGKeyImportContentFieldToMediumText),
-	// v243 -> v244
-	NewMigration("Add exclusive label", v1_19.AddExclusiveLabel),
+		newMigration(231, "Add index for hook_task", v1_19.AddIndexForHookTask),
+		newMigration(232, "Alter package_version.metadata_json to LONGTEXT", v1_19.AlterPackageVersionMetadataToLongText),
+		newMigration(233, "Add header_authorization_encrypted column to webhook table", v1_19.AddHeaderAuthorizationEncryptedColWebhook),
+		newMigration(234, "Add package cleanup rule table", v1_19.CreatePackageCleanupRuleTable),
+		newMigration(235, "Add index for access_token", v1_19.AddIndexForAccessToken),
+		newMigration(236, "Create secrets table", v1_19.CreateSecretsTable),
+		newMigration(237, "Drop ForeignReference table", v1_19.DropForeignReferenceTable),
+		newMigration(238, "Add updated unix to LFSMetaObject", v1_19.AddUpdatedUnixToLFSMetaObject),
+		newMigration(239, "Add scope for access_token", v1_19.AddScopeForAccessTokens),
+		newMigration(240, "Add actions tables", v1_19.AddActionsTables),
+		newMigration(241, "Add card_type column to project table", v1_19.AddCardTypeToProjectTable),
+		newMigration(242, "Alter gpg_key_import content TEXT field to MEDIUMTEXT", v1_19.AlterPublicGPGKeyImportContentFieldToMediumText),
+		newMigration(243, "Add exclusive label", v1_19.AddExclusiveLabel),
 
-	// Gitea 1.19.0 ends at v244
+		// Gitea 1.19.0 ends at database version 244
 
-	// v244 -> v245
-	NewMigration("Add NeedApproval to actions tables", v1_20.AddNeedApprovalToActionRun),
-	// v245 -> v246
-	NewMigration("Rename Webhook org_id to owner_id", v1_20.RenameWebhookOrgToOwner),
-	// v246 -> v247
-	NewMigration("Add missed column owner_id for project table", v1_20.AddNewColumnForProject),
-	// v247 -> v248
-	NewMigration("Fix incorrect project type", v1_20.FixIncorrectProjectType),
-	// v248 -> v249
-	NewMigration("Add version column to action_runner table", v1_20.AddVersionToActionRunner),
-	// v249 -> v250
-	NewMigration("Improve Action table indices v3", v1_20.ImproveActionTableIndices),
-	// v250 -> v251
-	NewMigration("Change Container Metadata", v1_20.ChangeContainerMetadataMultiArch),
-	// v251 -> v252
-	NewMigration("Fix incorrect owner team unit access mode", v1_20.FixIncorrectOwnerTeamUnitAccessMode),
-	// v252 -> v253
-	NewMigration("Fix incorrect admin team unit access mode", v1_20.FixIncorrectAdminTeamUnitAccessMode),
-	// v253 -> v254
-	NewMigration("Fix ExternalTracker and ExternalWiki accessMode in owner and admin team", v1_20.FixExternalTrackerAndExternalWikiAccessModeInOwnerAndAdminTeam),
-	// v254 -> v255
-	NewMigration("Add ActionTaskOutput table", v1_20.AddActionTaskOutputTable),
-	// v255 -> v256
-	NewMigration("Add ArchivedUnix Column", v1_20.AddArchivedUnixToRepository),
-	// v256 -> v257
-	NewMigration("Add is_internal column to package", v1_20.AddIsInternalColumnToPackage),
-	// v257 -> v258
-	NewMigration("Add Actions Artifact table", v1_20.CreateActionArtifactTable),
-	// v258 -> v259
-	NewMigration("Add PinOrder Column", v1_20.AddPinOrderToIssue),
-	// v259 -> v260
-	NewMigration("Convert scoped access tokens", v1_20.ConvertScopedAccessTokens),
+		newMigration(244, "Add NeedApproval to actions tables", v1_20.AddNeedApprovalToActionRun),
+		newMigration(245, "Rename Webhook org_id to owner_id", v1_20.RenameWebhookOrgToOwner),
+		newMigration(246, "Add missed column owner_id for project table", v1_20.AddNewColumnForProject),
+		newMigration(247, "Fix incorrect project type", v1_20.FixIncorrectProjectType),
+		newMigration(248, "Add version column to action_runner table", v1_20.AddVersionToActionRunner),
+		newMigration(249, "Improve Action table indices v3", v1_20.ImproveActionTableIndices),
+		newMigration(250, "Change Container Metadata", v1_20.ChangeContainerMetadataMultiArch),
+		newMigration(251, "Fix incorrect owner team unit access mode", v1_20.FixIncorrectOwnerTeamUnitAccessMode),
+		newMigration(252, "Fix incorrect admin team unit access mode", v1_20.FixIncorrectAdminTeamUnitAccessMode),
+		newMigration(253, "Fix ExternalTracker and ExternalWiki accessMode in owner and admin team", v1_20.FixExternalTrackerAndExternalWikiAccessModeInOwnerAndAdminTeam),
+		newMigration(254, "Add ActionTaskOutput table", v1_20.AddActionTaskOutputTable),
+		newMigration(255, "Add ArchivedUnix Column", v1_20.AddArchivedUnixToRepository),
+		newMigration(256, "Add is_internal column to package", v1_20.AddIsInternalColumnToPackage),
+		newMigration(257, "Add Actions Artifact table", v1_20.CreateActionArtifactTable),
+		newMigration(258, "Add PinOrder Column", v1_20.AddPinOrderToIssue),
+		newMigration(259, "Convert scoped access tokens", v1_20.ConvertScopedAccessTokens),
 
-	// Gitea 1.20.0 ends at 260
+		// Gitea 1.20.0 ends at database version 260
 
-	// v260 -> v261
-	NewMigration("Drop custom_labels column of action_runner table", v1_21.DropCustomLabelsColumnOfActionRunner),
-	// v261 -> v262
-	NewMigration("Add variable table", v1_21.CreateVariableTable),
-	// v262 -> v263
-	NewMigration("Add TriggerEvent to action_run table", v1_21.AddTriggerEventToActionRun),
-	// v263 -> v264
-	NewMigration("Add git_size and lfs_size columns to repository table", v1_21.AddGitSizeAndLFSSizeToRepositoryTable),
-	// v264 -> v265
-	NewMigration("Add branch table", v1_21.AddBranchTable),
-	// v265 -> v266
-	NewMigration("Alter Actions Artifact table", v1_21.AlterActionArtifactTable),
-	// v266 -> v267
-	NewMigration("Reduce commit status", v1_21.ReduceCommitStatus),
-	// v267 -> v268
-	NewMigration("Add action_tasks_version table", v1_21.CreateActionTasksVersionTable),
-	// v268 -> v269
-	NewMigration("Update Action Ref", v1_21.UpdateActionsRefIndex),
-	// v269 -> v270
-	NewMigration("Drop deleted branch table", v1_21.DropDeletedBranchTable),
-	// v270 -> v271
-	NewMigration("Fix PackageProperty typo", v1_21.FixPackagePropertyTypo),
-	// v271 -> v272
-	NewMigration("Allow archiving labels", v1_21.AddArchivedUnixColumInLabelTable),
-	// v272 -> v273
-	NewMigration("Add Version to ActionRun table", v1_21.AddVersionToActionRunTable),
-	// v273 -> v274
-	NewMigration("Add Action Schedule Table", v1_21.AddActionScheduleTable),
-	// v274 -> v275
-	NewMigration("Add Actions artifacts expiration date", v1_21.AddExpiredUnixColumnInActionArtifactTable),
-	// v275 -> v276
-	NewMigration("Add ScheduleID for ActionRun", v1_21.AddScheduleIDForActionRun),
-	// v276 -> v277
-	NewMigration("Add RemoteAddress to mirrors", v1_21.AddRemoteAddressToMirrors),
-	// v277 -> v278
-	NewMigration("Add Index to issue_user.issue_id", v1_21.AddIndexToIssueUserIssueID),
-	// v278 -> v279
-	NewMigration("Add Index to comment.dependent_issue_id", v1_21.AddIndexToCommentDependentIssueID),
-	// v279 -> v280
-	NewMigration("Add Index to action.user_id", v1_21.AddIndexToActionUserID),
+		newMigration(260, "Drop custom_labels column of action_runner table", v1_21.DropCustomLabelsColumnOfActionRunner),
+		newMigration(261, "Add variable table", v1_21.CreateVariableTable),
+		newMigration(262, "Add TriggerEvent to action_run table", v1_21.AddTriggerEventToActionRun),
+		newMigration(263, "Add git_size and lfs_size columns to repository table", v1_21.AddGitSizeAndLFSSizeToRepositoryTable),
+		newMigration(264, "Add branch table", v1_21.AddBranchTable),
+		newMigration(265, "Alter Actions Artifact table", v1_21.AlterActionArtifactTable),
+		newMigration(266, "Reduce commit status", v1_21.ReduceCommitStatus),
+		newMigration(267, "Add action_tasks_version table", v1_21.CreateActionTasksVersionTable),
+		newMigration(268, "Update Action Ref", v1_21.UpdateActionsRefIndex),
+		newMigration(269, "Drop deleted branch table", v1_21.DropDeletedBranchTable),
+		newMigration(270, "Fix PackageProperty typo", v1_21.FixPackagePropertyTypo),
+		newMigration(271, "Allow archiving labels", v1_21.AddArchivedUnixColumInLabelTable),
+		newMigration(272, "Add Version to ActionRun table", v1_21.AddVersionToActionRunTable),
+		newMigration(273, "Add Action Schedule Table", v1_21.AddActionScheduleTable),
+		newMigration(274, "Add Actions artifacts expiration date", v1_21.AddExpiredUnixColumnInActionArtifactTable),
+		newMigration(275, "Add ScheduleID for ActionRun", v1_21.AddScheduleIDForActionRun),
+		newMigration(276, "Add RemoteAddress to mirrors", v1_21.AddRemoteAddressToMirrors),
+		newMigration(277, "Add Index to issue_user.issue_id", v1_21.AddIndexToIssueUserIssueID),
+		newMigration(278, "Add Index to comment.dependent_issue_id", v1_21.AddIndexToCommentDependentIssueID),
+		newMigration(279, "Add Index to action.user_id", v1_21.AddIndexToActionUserID),
 
-	// Gitea 1.21.0 ends at 280
+		// Gitea 1.21.0 ends at database version 280
 
-	// v280 -> v281
-	NewMigration("Rename user themes", v1_22.RenameUserThemes),
-	// v281 -> v282
-	NewMigration("Add auth_token table", v1_22.CreateAuthTokenTable),
-	// v282 -> v283
-	NewMigration("Add Index to pull_auto_merge.doer_id", v1_22.AddIndexToPullAutoMergeDoerID),
-	// v283 -> v284
-	NewMigration("Add combined Index to issue_user.uid and issue_id", v1_22.AddCombinedIndexToIssueUser),
-	// v284 -> v285
-	NewMigration("Add ignore stale approval column on branch table", v1_22.AddIgnoreStaleApprovalsColumnToProtectedBranchTable),
-	// v285 -> v286
-	NewMigration("Add PreviousDuration to ActionRun", v1_22.AddPreviousDurationToActionRun),
-	// v286 -> v287
-	NewMigration("Add support for SHA256 git repositories", v1_22.AdjustDBForSha256),
-	// v287 -> v288
-	NewMigration("Use Slug instead of ID for Badges", v1_22.UseSlugInsteadOfIDForBadges),
-	// v288 -> v289
-	NewMigration("Add user_blocking table", v1_22.AddUserBlockingTable),
-	// v289 -> v290
-	NewMigration("Add default_wiki_branch to repository table", v1_22.AddDefaultWikiBranch),
-	// v290 -> v291
-	NewMigration("Add PayloadVersion to HookTask", v1_22.AddPayloadVersionToHookTaskTable),
-	// v291 -> v292
-	NewMigration("Add Index to attachment.comment_id", v1_22.AddCommentIDIndexofAttachment),
-	// v292 -> v293
-	NewMigration("Ensure every project has exactly one default column - No Op", noopMigration),
-	// v293 -> v294
-	NewMigration("Ensure every project has exactly one default column", v1_22.CheckProjectColumnsConsistency),
+		newMigration(280, "Rename user themes", v1_22.RenameUserThemes),
+		newMigration(281, "Add auth_token table", v1_22.CreateAuthTokenTable),
+		newMigration(282, "Add Index to pull_auto_merge.doer_id", v1_22.AddIndexToPullAutoMergeDoerID),
+		newMigration(283, "Add combined Index to issue_user.uid and issue_id", v1_22.AddCombinedIndexToIssueUser),
+		newMigration(284, "Add ignore stale approval column on branch table", v1_22.AddIgnoreStaleApprovalsColumnToProtectedBranchTable),
+		newMigration(285, "Add PreviousDuration to ActionRun", v1_22.AddPreviousDurationToActionRun),
+		newMigration(286, "Add support for SHA256 git repositories", v1_22.AdjustDBForSha256),
+		newMigration(287, "Use Slug instead of ID for Badges", v1_22.UseSlugInsteadOfIDForBadges),
+		newMigration(288, "Add user_blocking table", v1_22.AddUserBlockingTable),
+		newMigration(289, "Add default_wiki_branch to repository table", v1_22.AddDefaultWikiBranch),
+		newMigration(290, "Add PayloadVersion to HookTask", v1_22.AddPayloadVersionToHookTaskTable),
+		newMigration(291, "Add Index to attachment.comment_id", v1_22.AddCommentIDIndexofAttachment),
+		newMigration(292, "Ensure every project has exactly one default column - No Op", noopMigration),
+		newMigration(293, "Ensure every project has exactly one default column", v1_22.CheckProjectColumnsConsistency),
 
-	// Gitea 1.22.0-rc0 ends at 294
+		// Gitea 1.22.0-rc0 ends at database version 294
 
-	// v294 -> v295
-	NewMigration("Add unique index for project issue table", v1_22.AddUniqueIndexForProjectIssue),
-	// v295 -> v296
-	NewMigration("Add commit status summary table", v1_22.AddCommitStatusSummary),
-	// v296 -> v297
-	NewMigration("Add missing field of commit status summary table", v1_22.AddCommitStatusSummary2),
-	// v297 -> v298
-	NewMigration("Add everyone_access_mode for repo_unit", noopMigration),
-	// v298 -> v299
-	NewMigration("Drop wrongly created table o_auth2_application", v1_22.DropWronglyCreatedTable),
+		newMigration(294, "Add unique index for project issue table", v1_22.AddUniqueIndexForProjectIssue),
+		newMigration(295, "Add commit status summary table", v1_22.AddCommitStatusSummary),
+		newMigration(296, "Add missing field of commit status summary table", v1_22.AddCommitStatusSummary2),
+		newMigration(297, "Add everyone_access_mode for repo_unit", noopMigration),
+		newMigration(298, "Drop wrongly created table o_auth2_application", v1_22.DropWronglyCreatedTable),
 
-	// Gitea 1.22.0-rc1 ends at 299
+		// Gitea 1.22.0-rc1 ends at migration ID number 298 (database version 299)
 
-	// v299 -> v300
-	NewMigration("Add content version to issue and comment table", v1_23.AddContentVersionToIssueAndComment),
-	// v300 -> v301
-	NewMigration("Add force-push branch protection support", v1_23.AddForcePushBranchProtection),
-	// v301 -> v302
-	NewMigration("Add skip_secondary_authorization option to oauth2 application table", v1_23.AddSkipSecondaryAuthColumnToOAuth2ApplicationTable),
-	// v302 -> v303
-	NewMigration("Add index to action_task stopped log_expired", v1_23.AddIndexToActionTaskStoppedLogExpired),
+		newMigration(299, "Add content version to issue and comment table", v1_23.AddContentVersionToIssueAndComment),
+		newMigration(300, "Add force-push branch protection support", v1_23.AddForcePushBranchProtection),
+		newMigration(301, "Add skip_secondary_authorization option to oauth2 application table", v1_23.AddSkipSecondaryAuthColumnToOAuth2ApplicationTable),
+		newMigration(302, "Add index to action_task stopped log_expired", v1_23.AddIndexToActionTaskStoppedLogExpired),
+	}
+	return preparedMigrations
 }
 
 // GetCurrentDBVersion returns the current db version
@@ -618,9 +383,20 @@ func GetCurrentDBVersion(x *xorm.Engine) (int64, error) {
 	return currentVersion.Version, nil
 }
 
-// ExpectedVersion returns the expected db version
-func ExpectedVersion() int64 {
-	return int64(minDBVersion + len(migrations))
+func calcDBVersion(migrations []*migration) int64 {
+	dbVer := int64(minDBVersion + len(migrations))
+	if migrations[0].idNumber != minDBVersion {
+		panic("migrations should start at minDBVersion")
+	}
+	if dbVer != migrations[len(migrations)-1].idNumber+1 {
+		panic("migrations are not in order")
+	}
+	return dbVer
+}
+
+// ExpectedDBVersion returns the expected db version
+func ExpectedDBVersion() int64 {
+	return calcDBVersion(prepareMigrationTasks())
 }
 
 // EnsureUpToDate will check if the db is at the correct version
@@ -631,24 +407,35 @@ func EnsureUpToDate(x *xorm.Engine) error {
 	}
 
 	if currentDB < 0 {
-		return fmt.Errorf("Database has not been initialized")
+		return fmt.Errorf("database has not been initialized")
 	}
 
 	if minDBVersion > currentDB {
 		return fmt.Errorf("DB version %d (<= %d) is too old for auto-migration. Upgrade to Gitea 1.6.4 first then upgrade to this version", currentDB, minDBVersion)
 	}
 
-	expected := ExpectedVersion()
+	expectedDB := ExpectedDBVersion()
 
-	if currentDB != expected {
-		return fmt.Errorf(`Current database version %d is not equal to the expected version %d. Please run "forgejo [--config /path/to/app.ini] migrate" to update the database version`, currentDB, expected)
+	if currentDB != expectedDB {
+		return fmt.Errorf(`current database version %d is not equal to the expected version %d. Please run "forgejo [--config /path/to/app.ini] migrate" to update the database version`, currentDB, expectedDB)
 	}
 
 	return forgejo_migrations.EnsureUpToDate(x)
 }
 
+func getPendingMigrations(curDBVer int64, migrations []*migration) []*migration {
+	return migrations[curDBVer-minDBVersion:]
+}
+
+func migrationIDNumberToDBVersion(idNumber int64) int64 {
+	return idNumber + 1
+}
+
 // Migrate database to current version
 func Migrate(x *xorm.Engine) error {
+	migrations := prepareMigrationTasks()
+	maxDBVer := calcDBVersion(migrations)
+
 	// Set a new clean the default mapper to GonicMapper as that is the default for Gitea.
 	x.SetMapper(names.GonicMapper{})
 	if err := x.Sync(new(Version)); err != nil {
@@ -661,11 +448,10 @@ func Migrate(x *xorm.Engine) error {
 	if err != nil {
 		return fmt.Errorf("get: %w", err)
 	} else if !has {
-		// If the version record does not exist we think
-		// it is a fresh installation and we can skip all migrations.
+		// If the version record does not exist, it is a fresh installation, and we can skip all migrations.
+		// XORM model framework will create all tables when initializing.
 		currentVersion.ID = 0
-		currentVersion.Version = int64(minDBVersion + len(migrations))
-
+		currentVersion.Version = maxDBVer
 		if _, err = x.InsertOne(currentVersion); err != nil {
 			return fmt.Errorf("insert: %w", err)
 		}
@@ -673,19 +459,20 @@ func Migrate(x *xorm.Engine) error {
 		previousVersion = currentVersion.Version
 	}
 
-	v := currentVersion.Version
-	if minDBVersion > v {
+	curDBVer := currentVersion.Version
+	// Outdated Forgejo database version is not supported
+	if curDBVer < minDBVersion {
 		log.Fatal(`Forgejo no longer supports auto-migration from your previously installed version.
 Please try upgrading to a lower version first (suggested v1.6.4), then upgrade to this version.`)
 		return nil
 	}
 
-	// Downgrading Forgejo database version is not supported
-	if int(v-minDBVersion) > len(migrations) {
-		msg := fmt.Sprintf("Your database (migration version: %d) is for a newer Forgejo, you can not use the newer database for this old Forgejo release (%d).", v, minDBVersion+len(migrations))
+	// Downgrading Forgejo's database version not supported
+	if maxDBVer < curDBVer {
+		msg := fmt.Sprintf("Your database (migration version: %d) is for a newer Forgejo, you can not use the newer database for this old Forgejo release (%d).", curDBVer, maxDBVer)
 		msg += "\nForgejo will exit to keep your database safe and unchanged. Please use the correct Forgejo release, do not change the migration version manually (incorrect manual operation may lose data)."
 		if !setting.IsProd {
-			msg += fmt.Sprintf("\nIf you are in development and really know what you're doing, you can force changing the migration version by executing: UPDATE version SET version=%d WHERE id=1;", minDBVersion+len(migrations))
+			msg += fmt.Sprintf("\nIf you are in development and really know what you're doing, you can force changing the migration version by executing: UPDATE version SET version=%d WHERE id=1;", maxDBVer)
 		}
 		log.Fatal("Migration Error: %s", msg)
 		return nil
@@ -703,14 +490,14 @@ Please try upgrading to a lower version first (suggested v1.6.4), then upgrade t
 	}
 
 	// Migrate
-	for i, m := range migrations[v-minDBVersion:] {
-		log.Info("Migration[%d]: %s", v+int64(i), m.Description())
+	for _, m := range getPendingMigrations(curDBVer, migrations) {
+		log.Info("Migration[%d]: %s", m.idNumber, m.description)
 		// Reset the mapper between each migration - migrations are not supposed to depend on each other
 		x.SetMapper(names.GonicMapper{})
 		if err = m.Migrate(x); err != nil {
-			return fmt.Errorf("migration[%d]: %s failed: %w", v+int64(i), m.Description(), err)
+			return fmt.Errorf("migration[%d]: %s failed: %w", m.idNumber, m.description, err)
 		}
-		currentVersion.Version = v + int64(i) + 1
+		currentVersion.Version = migrationIDNumberToDBVersion(m.idNumber)
 		if _, err = x.ID(1).Update(currentVersion); err != nil {
 			return err
 		}
diff --git a/models/migrations/migrations_test.go b/models/migrations/migrations_test.go
new file mode 100644
index 0000000000..78c2898996
--- /dev/null
+++ b/models/migrations/migrations_test.go
@@ -0,0 +1,27 @@
+// Copyright 2024 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package migrations
+
+import (
+	"testing"
+
+	"code.gitea.io/gitea/modules/test"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestMigrations(t *testing.T) {
+	defer test.MockVariableValue(&preparedMigrations, []*migration{
+		{idNumber: 70},
+		{idNumber: 71},
+	})()
+	assert.EqualValues(t, 72, calcDBVersion(preparedMigrations))
+	assert.EqualValues(t, 72, ExpectedDBVersion())
+
+	assert.EqualValues(t, 71, migrationIDNumberToDBVersion(70))
+
+	assert.EqualValues(t, []*migration{{idNumber: 70}, {idNumber: 71}}, getPendingMigrations(70, preparedMigrations))
+	assert.EqualValues(t, []*migration{{idNumber: 71}}, getPendingMigrations(71, preparedMigrations))
+	assert.EqualValues(t, []*migration{}, getPendingMigrations(72, preparedMigrations))
+}
diff --git a/routers/common/db.go b/routers/common/db.go
index d7dcfa0122..ac24303989 100644
--- a/routers/common/db.go
+++ b/routers/common/db.go
@@ -51,7 +51,7 @@ func migrateWithSetting(x *xorm.Engine) error {
 	} else if current < 0 {
 		// execute migrations when the database isn't initialized even if AutoMigration is false
 		return migrations.Migrate(x)
-	} else if expected := migrations.ExpectedVersion(); current != expected {
+	} else if expected := migrations.ExpectedDBVersion(); current != expected {
 		log.Fatal(`"database.AUTO_MIGRATION" is disabled, but current database version %d is not equal to the expected version %d.`+
 			`You can set "database.AUTO_MIGRATION" to true or migrate manually by running "forgejo [--config /path/to/app.ini] migrate"`, current, expected)
 	}
diff --git a/services/doctor/dbversion.go b/services/doctor/dbversion.go
index 2b20cb2340..2a102b2194 100644
--- a/services/doctor/dbversion.go
+++ b/services/doctor/dbversion.go
@@ -12,7 +12,7 @@ import (
 )
 
 func checkDBVersion(ctx context.Context, logger log.Logger, autofix bool) error {
-	logger.Info("Expected database version: %d", migrations.ExpectedVersion())
+	logger.Info("Expected database version: %d", migrations.ExpectedDBVersion())
 	if err := db.InitEngineWithMigration(ctx, migrations.EnsureUpToDate); err != nil {
 		if !autofix {
 			logger.Critical("Error: %v during ensure up to date", err)

From fddde93759ee4af0d268564012344b774b75779f Mon Sep 17 00:00:00 2001
From: wxiaoguang 
Date: Sun, 3 Nov 2024 05:04:53 +0800
Subject: [PATCH 286/443] [PORT] Replace DateTime with proper functions
 (gitea#32402)

Follow https://github.com/go-gitea/gitea/pull/32383

This PR cleans up the "Deadline" usages in templates, make them call
`ParseLegacy` first to get a `Time` struct then display by `DateUtils`.

Now it should be pretty clear how "deadline string" works, it makes it
possible to do further refactoring and correcting.

(cherry picked from commit 259811617ba15c77ddd89360178a59251d611af2)
---
 modules/templates/helper.go                   |  4 +--
 modules/templates/util_date.go                | 26 ++++++++++++++
 .../util_date_test.go}                        | 36 ++++++++++---------
 modules/timeutil/datetime.go                  | 12 ++-----
 templates/admin/auth/list.tmpl                |  2 +-
 templates/repo/issue/milestone_issues.tmpl    |  2 +-
 templates/repo/issue/milestones.tmpl          |  2 +-
 .../repo/issue/view_content/comments.tmpl     | 10 +++---
 templates/user/dashboard/milestones.tmpl      |  2 +-
 9 files changed, 60 insertions(+), 36 deletions(-)
 rename modules/{timeutil/datetime_test.go => templates/util_date_test.go} (61%)

diff --git a/modules/templates/helper.go b/modules/templates/helper.go
index e4ae32b323..a1f3f1aa2d 100644
--- a/modules/templates/helper.go
+++ b/modules/templates/helper.go
@@ -52,7 +52,7 @@ func NewFuncMap() template.FuncMap {
 		"StringUtils": NewStringUtils,
 		"SliceUtils":  NewSliceUtils,
 		"JsonUtils":   NewJsonUtils,
-		"DateUtils":   NewDateUtils, // TODO: to be replaced by DateUtils
+		"DateUtils":   NewDateUtils,
 
 		// -----------------------------------------------------------------
 		// svg / avatar / icon / color
@@ -69,7 +69,7 @@ func NewFuncMap() template.FuncMap {
 		"CountFmt":      base.FormatNumberSI,
 		"TimeSince":     timeutil.TimeSince,
 		"TimeSinceUnix": timeutil.TimeSinceUnix,
-		"DateTime":      timeutil.DateTime,
+		"DateTime":      dateTimeLegacy, // for backward compatibility only, do not use it anymore
 		"Sec2Time":      util.SecToTime,
 		"LoadTimes": func(startTime time.Time) string {
 			return fmt.Sprint(time.Since(startTime).Nanoseconds()/1e6) + "ms"
diff --git a/modules/templates/util_date.go b/modules/templates/util_date.go
index ec48a7e4be..45dd8da02f 100644
--- a/modules/templates/util_date.go
+++ b/modules/templates/util_date.go
@@ -6,7 +6,9 @@ package templates
 import (
 	"context"
 	"html/template"
+	"time"
 
+	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/timeutil"
 )
 
@@ -32,3 +34,27 @@ func (du *DateUtils) AbsoluteLong(time any) template.HTML {
 func (du *DateUtils) FullTime(time any) template.HTML {
 	return timeutil.DateTime("full", time)
 }
+
+// ParseLegacy parses the datetime in legacy format, eg: "2016-01-02" in server's timezone.
+// It shouldn't be used in new code. New code should use Time or TimeStamp as much as possible.
+func (du *DateUtils) ParseLegacy(datetime string) time.Time {
+	return parseLegacy(datetime)
+}
+
+func parseLegacy(datetime string) time.Time {
+	t, err := time.Parse(time.RFC3339, datetime)
+	if err != nil {
+		t, _ = time.ParseInLocation(time.DateOnly, datetime, setting.DefaultUILocation)
+	}
+	return t
+}
+
+func dateTimeLegacy(format string, datetime any, _ ...string) template.HTML {
+	if !setting.IsProd || setting.IsInTesting {
+		panic("dateTimeLegacy is for backward compatibility only, do not use it in new code")
+	}
+	if s, ok := datetime.(string); ok {
+		datetime = parseLegacy(s)
+	}
+	return timeutil.DateTime(format, datetime)
+}
diff --git a/modules/timeutil/datetime_test.go b/modules/templates/util_date_test.go
similarity index 61%
rename from modules/timeutil/datetime_test.go
rename to modules/templates/util_date_test.go
index ac2ce35ba2..96c3776d39 100644
--- a/modules/timeutil/datetime_test.go
+++ b/modules/templates/util_date_test.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package timeutil
+package templates
 
 import (
 	"testing"
@@ -9,6 +9,7 @@ import (
 
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/test"
+	"code.gitea.io/gitea/modules/timeutil"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -16,32 +17,35 @@ import (
 func TestDateTime(t *testing.T) {
 	testTz, _ := time.LoadLocation("America/New_York")
 	defer test.MockVariableValue(&setting.DefaultUILocation, testTz)()
+	defer test.MockVariableValue(&setting.IsInTesting, false)()
+
+	du := NewDateUtils(nil)
 
 	refTimeStr := "2018-01-01T00:00:00Z"
 	refDateStr := "2018-01-01"
 	refTime, _ := time.Parse(time.RFC3339, refTimeStr)
-	refTimeStamp := TimeStamp(refTime.Unix())
+	refTimeStamp := timeutil.TimeStamp(refTime.Unix())
 
-	assert.EqualValues(t, "-", DateTime("short", nil))
-	assert.EqualValues(t, "-", DateTime("short", 0))
-	assert.EqualValues(t, "-", DateTime("short", time.Time{}))
-	assert.EqualValues(t, "-", DateTime("short", TimeStamp(0)))
+	assert.EqualValues(t, "-", du.AbsoluteShort(nil))
+	assert.EqualValues(t, "-", du.AbsoluteShort(0))
+	assert.EqualValues(t, "-", du.AbsoluteShort(time.Time{}))
+	assert.EqualValues(t, "-", du.AbsoluteShort(timeutil.TimeStamp(0)))
 
-	actual := DateTime("short", "invalid")
-	assert.EqualValues(t, `invalid`, actual)
+	actual := dateTimeLegacy("short", "invalid")
+	assert.EqualValues(t, `-`, actual)
 
-	actual = DateTime("short", refTimeStr)
-	assert.EqualValues(t, `2018-01-01T00:00:00Z`, actual)
-
-	actual = DateTime("short", refTime)
+	actual = dateTimeLegacy("short", refTimeStr)
 	assert.EqualValues(t, `2018-01-01`, actual)
 
-	actual = DateTime("short", refDateStr)
-	assert.EqualValues(t, `2018-01-01`, actual)
+	actual = du.AbsoluteShort(refTime)
+	assert.EqualValues(t, `2018-01-01`, actual)
 
-	actual = DateTime("short", refTimeStamp)
+	actual = dateTimeLegacy("short", refDateStr)
+	assert.EqualValues(t, `2018-01-01`, actual)
+
+	actual = du.AbsoluteShort(refTimeStamp)
 	assert.EqualValues(t, `2017-12-31`, actual)
 
-	actual = DateTime("full", refTimeStamp)
+	actual = du.FullTime(refTimeStamp)
 	assert.EqualValues(t, `2017-12-31 19:00:00 -05:00`, actual)
 }
diff --git a/modules/timeutil/datetime.go b/modules/timeutil/datetime.go
index c089173560..664e0320b0 100644
--- a/modules/timeutil/datetime.go
+++ b/modules/timeutil/datetime.go
@@ -12,9 +12,7 @@ import (
 )
 
 // DateTime renders an absolute time HTML element by datetime.
-func DateTime(format string, datetime any, extraAttrs ...string) template.HTML {
-	// TODO: remove the extraAttrs argument, it's not used in any call to DateTime
-
+func DateTime(format string, datetime any) template.HTML {
 	if p, ok := datetime.(*time.Time); ok {
 		datetime = *p
 	}
@@ -34,9 +32,6 @@ func DateTime(format string, datetime any, extraAttrs ...string) template.HTML {
 	switch v := datetime.(type) {
 	case nil:
 		return "-"
-	case string:
-		datetimeEscaped = html.EscapeString(v)
-		textEscaped = datetimeEscaped
 	case time.Time:
 		if v.IsZero() || v.Unix() == 0 {
 			return "-"
@@ -51,10 +46,7 @@ func DateTime(format string, datetime any, extraAttrs ...string) template.HTML {
 		panic(fmt.Sprintf("Unsupported time type %T", datetime))
 	}
 
-	attrs := make([]string, 0, 10+len(extraAttrs))
-	attrs = append(attrs, extraAttrs...)
-	attrs = append(attrs, `weekday=""`, `year="numeric"`)
-
+	attrs := []string{`weekday=""`, `year="numeric"`}
 	switch format {
 	case "short", "long": // date only
 		attrs = append(attrs, `month="`+format+`"`, `day="numeric"`)
diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl
index 308390e3bd..5b5affad8a 100644
--- a/templates/admin/auth/list.tmpl
+++ b/templates/admin/auth/list.tmpl
@@ -25,7 +25,7 @@
 							{{.ID}}
 							{{.Name}}
 							{{.TypeName}}
-							{{svg (Iif .IsActive "octicon-check" "octicon-x")}}
+							{{if .IsActive}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
 							{{ctx.DateUtils.AbsoluteShort .UpdatedUnix}}
 							{{ctx.DateUtils.AbsoluteShort .CreatedUnix}}
 							{{svg "octicon-pencil"}}
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl
index e5dc8cb605..bfd64a3205 100644
--- a/templates/repo/issue/milestone_issues.tmpl
+++ b/templates/repo/issue/milestone_issues.tmpl
@@ -38,7 +38,7 @@
 						{{if .Milestone.DeadlineString}}
 							
 								{{svg "octicon-calendar"}}
-								{{DateTime "short" .Milestone.DeadlineString}}
+								{{ctx.DateUtils.AbsoluteShort (.Milestone.DeadlineString|ctx.DateUtils.ParseLegacy)}}
 							
 						{{else}}
 							{{svg "octicon-calendar"}}
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
index 63a6f6b26a..978f81598e 100644
--- a/templates/repo/issue/milestones.tmpl
+++ b/templates/repo/issue/milestones.tmpl
@@ -61,7 +61,7 @@
 									{{if .DeadlineString}}
 										
 											{{svg "octicon-calendar" 14}}
-											{{DateTime "short" .DeadlineString}}
+											{{ctx.DateUtils.AbsoluteShort (.DeadlineString|ctx.DateUtils.ParseLegacy)}}
 										
 									{{else}}
 										{{svg "octicon-calendar" 14}}
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index fb4ceb10c1..0fdb1ca02d 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -300,7 +300,8 @@
 				{{template "shared/user/avatarlink" dict "user" .Poster}}
 				
 					{{template "shared/user/authorlink" .Poster}}
-					{{ctx.Locale.Tr "repo.issues.due_date_added" (DateTime "long" .Content) $createdStr}}
+					{{$dueDate := ctx.DateUtils.AbsoluteLong (.Content|ctx.DateUtils.ParseLegacy)}}
+					{{ctx.Locale.Tr "repo.issues.due_date_added" $dueDate $createdStr}}
 				
 			

 		{{else if eq .Type 17}}
@@ -311,8 +312,8 @@
 					{{template "shared/user/authorlink" .Poster}}
 					{{$parsedDeadline := StringUtils.Split .Content "|"}}
 					{{if eq (len $parsedDeadline) 2}}
-						{{$from := DateTime "long" (index $parsedDeadline 1)}}
-						{{$to := DateTime "long" (index $parsedDeadline 0)}}
+						{{$to := ctx.DateUtils.AbsoluteLong ((index $parsedDeadline 0)|ctx.DateUtils.ParseLegacy)}}
+						{{$from := ctx.DateUtils.AbsoluteLong ((index $parsedDeadline 1)|ctx.DateUtils.ParseLegacy)}}
 						{{ctx.Locale.Tr "repo.issues.due_date_modified" $to $from $createdStr}}
 					{{end}}
 				
@@ -323,7 +324,8 @@
 				{{template "shared/user/avatarlink" dict "user" .Poster}}
 				
 					{{template "shared/user/authorlink" .Poster}}
-					{{ctx.Locale.Tr "repo.issues.due_date_remove" (DateTime "long" .Content) $createdStr}}
+					{{$dueDate := ctx.DateUtils.AbsoluteLong (.Content|ctx.DateUtils.ParseLegacy)}}
+					{{ctx.Locale.Tr "repo.issues.due_date_remove" $dueDate $createdStr}}
 				
 			

 		{{else if eq .Type 19}}
diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl
index fe8e246db6..15c14e46d3 100644
--- a/templates/user/dashboard/milestones.tmpl
+++ b/templates/user/dashboard/milestones.tmpl
@@ -116,7 +116,7 @@
 											{{if .DeadlineString}}
 												
 													{{svg "octicon-calendar" 14}}
-													{{DateTime "short" .DeadlineString}}
+													{{ctx.DateUtils.AbsoluteShort (.DeadlineString|ctx.DateUtils.ParseLegacy)}}
 												
 											{{else}}
 												{{svg "octicon-calendar" 14}}

From fb1b3e2c6dd24cb48a5625a4ed3e1432bd10137d Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Mon, 4 Nov 2024 05:52:26 +0000
Subject: [PATCH 287/443] Update renovate to v38.142.5 (forgejo) (#5802)

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5802
Reviewed-by: Michael Kriese 
Co-authored-by: Renovate Bot 
Co-committed-by: Renovate Bot 
---
 .forgejo/workflows/renovate.yml | 2 +-
 Makefile                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml
index c399731430..011d90da00 100644
--- a/.forgejo/workflows/renovate.yml
+++ b/.forgejo/workflows/renovate.yml
@@ -23,7 +23,7 @@ jobs:
 
     runs-on: docker
     container:
-      image: code.forgejo.org/forgejo-contrib/renovate:38.133.0
+      image: code.forgejo.org/forgejo-contrib/renovate:38.142.5
 
     steps:
       - name: Load renovate repo cache
diff --git a/Makefile b/Makefile
index ff327037ea..13fdb5194a 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1 # renovate: datasour
 DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.26.0 # renovate: datasource=go
 GOMOCK_PACKAGE ?= go.uber.org/mock/mockgen@v0.4.0 # renovate: datasource=go
 GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.16.2 # renovate: datasource=go
-RENOVATE_NPM_PACKAGE ?= renovate@38.133.0 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate
+RENOVATE_NPM_PACKAGE ?= renovate@38.142.5 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate
 
 ifeq ($(HAS_GO), yes)
 	CGO_EXTRA_CFLAGS := -DSQLITE_MAX_VARIABLE_NUMBER=32766

From 6e1c0e4cb0986f9938de7be97f198205ea79a473 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Mon, 4 Nov 2024 05:54:02 +0000
Subject: [PATCH 288/443] Lock file maintenance (forgejo) (#5804)

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5804
Reviewed-by: Michael Kriese 
Co-authored-by: Renovate Bot 
Co-committed-by: Renovate Bot 
---
 package-lock.json                  | 889 +++++++++++++++++++++++------
 poetry.lock                        |   6 +-
 web_src/fomantic/package-lock.json |  18 +-
 3 files changed, 716 insertions(+), 197 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 23a6f86479..d9847ecb89 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -176,9 +176,9 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.0.tgz",
-      "integrity": "sha512-INCKxTtbXtcNbUZ3YXutwMpEleqttcswhAdee7dhuoVrD2cnuc3PqtERBtxkX5nziX9vnBL8WXmSGwv8CuPV6g==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.25.9",
@@ -190,9 +190,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.0.tgz",
-      "integrity": "sha512-qETICbZSLe7uXv9VE8T/RWOdIE5qqyTucOt4zLYMafj2MRO271VGgLd4RACJMeBO37UPWhXiKMBk7YlJ0fOzQA==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.2.tgz",
+      "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -280,13 +280,13 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.0.tgz",
-      "integrity": "sha512-/AIkAmInnWwgEAJGQr9vY0c66Mj6kjkE2ZPB1PurTRaRAh3U+J45sAQMjQDJdh4WbR3l0x5xkimXBKyBXXAu2w==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz",
+      "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.26.0",
+        "@babel/parser": "^7.26.2",
         "@babel/types": "^7.26.0",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
@@ -618,9 +618,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.26.1",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.1.tgz",
-      "integrity": "sha512-reoQYNiAJreZNsJzyrDNzFQ+IQ5JFiIzAHJg9bn94S3l+4++J7RsIhNMoB+lgP/9tpmiAQqspv+xfdxTSzREOw==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz",
+      "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.26.0"
@@ -2380,9 +2380,9 @@
       }
     },
     "node_modules/@csstools/css-parser-algorithms": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.3.tgz",
-      "integrity": "sha512-15WQTALDyxAwSgAvLt7BksAssiSrNNhTv4zM7qX9U6R7FtpNskVVakzWQlYODlwPwXhGpKPmB10LM943pxMe7w==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz",
+      "integrity": "sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==",
       "dev": true,
       "funding": [
         {
@@ -2399,7 +2399,7 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-tokenizer": "^3.0.2"
+        "@csstools/css-tokenizer": "^3.0.3"
       }
     },
     "node_modules/@csstools/css-tokenizer": {
@@ -2489,6 +2489,262 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+      "cpu": [
+        "loong64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+      "cpu": [
+        "mips64el"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+      "cpu": [
+        "s390x"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@esbuild/linux-x64": {
       "version": "0.21.5",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
@@ -2505,6 +2761,102 @@
         "node": ">=12"
       }
     },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@eslint-community/eslint-plugin-eslint-comments": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-4.4.1.tgz",
@@ -2722,9 +3074,9 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.1.tgz",
-      "integrity": "sha512-HFZ4Mp26nbWk9d/BpvP0YNL6W4UoZF0VFcTw/aPPA8RpOxeFQgK+ClABGgAUXs9Y/RGX/l1vOmrqz1MQt9MNuw==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.2.tgz",
+      "integrity": "sha512-CXtq5nR4Su+2I47WPOlWud98Y5Lv8Kyxp2ukhgFx/eW6Blm18VXJO5WuQylPugRo8nbluoi6GvvxBLqHcvqUUw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -2763,9 +3115,9 @@
       }
     },
     "node_modules/@humanfs/core": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.0.tgz",
-      "integrity": "sha512-2cbWIHbZVEweE853g8jymffCA+NCMiuqeECeBBLm8dg2oFdjuGJhgN4UAbI+6v0CKbbhvtXA4qV8YR5Ji86nmw==",
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -2773,13 +3125,13 @@
       }
     },
     "node_modules/@humanfs/node": {
-      "version": "0.16.5",
-      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.5.tgz",
-      "integrity": "sha512-KSPA4umqSG4LHYRodq31VDwKAvaTF4xmVlzM8Aeh4PlU1JQ3IG0wiA8C25d3RQ9nJyM3mBHyI53K06VVL/oFFg==",
+      "version": "0.16.6",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
+      "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@humanfs/core": "^0.19.0",
+        "@humanfs/core": "^0.19.1",
         "@humanwhocodes/retry": "^0.3.0"
       },
       "engines": {
@@ -3276,10 +3628,192 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.3.tgz",
+      "integrity": "sha512-ufb2CH2KfBWPJok95frEZZ82LtDl0A6QKTa8MoM+cWwDZvVGl5/jNb79pIhRvAalUu+7LD91VYR0nwRD799HkQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.3.tgz",
+      "integrity": "sha512-iAHpft/eQk9vkWIV5t22V77d90CRofgR2006UiCjHcHJFVI1E0oBkQIAbz+pLtthFw3hWEmVB4ilxGyBf48i2Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.3.tgz",
+      "integrity": "sha512-QPW2YmkWLlvqmOa2OwrfqLJqkHm7kJCIMq9kOz40Zo9Ipi40kf9ONG5Sz76zszrmIZZ4hgRIkez69YnTHgEz1w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.3.tgz",
+      "integrity": "sha512-KO0pN5x3+uZm1ZXeIfDqwcvnQ9UEGN8JX5ufhmgH5Lz4ujjZMAnxQygZAVGemFWn+ZZC0FQopruV4lqmGMshow==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.24.3.tgz",
+      "integrity": "sha512-CsC+ZdIiZCZbBI+aRlWpYJMSWvVssPuWqrDy/zi9YfnatKKSLFCe6fjna1grHuo/nVaHG+kiglpRhyBQYRTK4A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.24.3.tgz",
+      "integrity": "sha512-F0nqiLThcfKvRQhZEzMIXOQG4EeX61im61VYL1jo4eBxv4aZRmpin6crnBJQ/nWnCsjH5F6J3W6Stdm0mBNqBg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.3.tgz",
+      "integrity": "sha512-KRSFHyE/RdxQ1CSeOIBVIAxStFC/hnBgVcaiCkQaVC+EYDtTe4X7z5tBkFyRoBgUGtB6Xg6t9t2kulnX6wJc6A==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.3.tgz",
+      "integrity": "sha512-h6Q8MT+e05zP5BxEKz0vi0DhthLdrNEnspdLzkoFqGwnmOzakEHSlXfVyA4HJ322QtFy7biUAVFPvIDEDQa6rw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.3.tgz",
+      "integrity": "sha512-fKElSyXhXIJ9pqiYRqisfirIo2Z5pTTve5K438URf08fsypXrEkVmShkSfM8GJ1aUyvjakT+fn2W7Czlpd/0FQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.3.tgz",
+      "integrity": "sha512-YlddZSUk8G0px9/+V9PVilVDC6ydMz7WquxozToozSnfFK6wa6ne1ATUjUvjin09jp34p84milxlY5ikueoenw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.3.tgz",
+      "integrity": "sha512-yNaWw+GAO8JjVx3s3cMeG5Esz1cKVzz8PkTJSfYzE5u7A+NvGmbVFEHP+BikTIyYWuz0+DX9kaA3pH9Sqxp69g==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.3.tgz",
+      "integrity": "sha512-lWKNQfsbpv14ZCtM/HkjCTm4oWTKTfxPmr7iPfp3AHSqyoTz5AgLemYkWLwOBWc+XxBbrU9SCokZP0WlBZM9lA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.3.tgz",
+      "integrity": "sha512-HoojGXTC2CgCcq0Woc/dn12wQUlkNyfH0I1ABK4Ni9YXyFQa86Fkt2Q0nqgLfbhkyfQ6003i3qQk9pLh/SpAYw==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.2.tgz",
-      "integrity": "sha512-jOG/0nXb3z+EM6SioY8RofqqmZ+9NKYvJ6QQaa9Mvd3RQxlH68/jcB/lpyVt4lCiqr04IyaC34NzhUqcXbB5FQ==",
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.3.tgz",
+      "integrity": "sha512-mnEOh4iE4USSccBOtcrjF5nj+5/zm6NcNhbSEfR3Ot0pxBwvEn5QVUXcuOwwPkapDtGZ6pT02xLoPaNv06w7KQ==",
       "cpu": [
         "x64"
       ],
@@ -3291,9 +3825,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.2.tgz",
-      "integrity": "sha512-XAo7cJec80NWx9LlZFEJQxqKOMz/lX3geWs2iNT5CHIERLFfd90f3RYLLjiCBm1IMaQ4VOX/lTC9lWfzzQm14Q==",
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.3.tgz",
+      "integrity": "sha512-rMTzawBPimBQkG9NKpNHvquIUTQPzrnPxPbCY1Xt+mFkW7pshvyIS5kYgcf74goxXOQk0CP3EoOC1zcEezKXhw==",
       "cpu": [
         "x64"
       ],
@@ -3304,6 +3838,48 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.3.tgz",
+      "integrity": "sha512-2lg1CE305xNvnH3SyiKwPVsTVLCg4TmNCF1z7PSHX2uZY2VbUpdkgAllVoISD7JO7zu+YynpWNSKAtOrX3AiuA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.3.tgz",
+      "integrity": "sha512-9SjYp1sPyxJsPWuhOCX6F4jUMXGbVVd5obVpoVEi8ClZqo52ViZewA6eFz85y8ezuOA+uJMP5A5zo6Oz4S5rVQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.3.tgz",
+      "integrity": "sha512-HGZgRFFYrMrP3TJlq58nR1xy8zHKId25vhmm5S9jETEfDf6xybPxsavFTJaufe2zgOGYJBskGlj49CwtEuFhWQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@rtsao/scc": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
@@ -4239,9 +4815,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.8.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.1.tgz",
-      "integrity": "sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg==",
+      "version": "22.8.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.7.tgz",
+      "integrity": "sha512-LidcG+2UeYIWcMuMUpBKOnryBWG/rnmOHQR5apjn8myTQcx3rinFRn7DcIFhMnS0PPFSC6OafdIKEad0lj6U0Q==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.19.8"
@@ -5806,9 +6382,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001673",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001673.tgz",
-      "integrity": "sha512-WTrjUCSMp3LYX0nE12ECkV0a+e6LC85E0Auz75555/qr78Oc8YWhEPNfDd6SHdtlCMSzqtuXY0uyEMNRcsKpKw==",
+      "version": "1.0.30001677",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001677.tgz",
+      "integrity": "sha512-fmfjsOlJUpMWu+mAAtZZZHz7UEwsUxIIvu1TJfO1HqFQvB/B+ii0xr9B5HpbZY/mC4XZ8SvjHJqtAY6pDPQEog==",
       "funding": [
         {
           "type": "opencollective",
@@ -6181,13 +6757,13 @@
       "license": "MIT"
     },
     "node_modules/core-js-compat": {
-      "version": "3.38.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz",
-      "integrity": "sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==",
+      "version": "3.39.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.39.0.tgz",
+      "integrity": "sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.23.3"
+        "browserslist": "^4.24.2"
       },
       "funding": {
         "type": "opencollective",
@@ -7293,9 +7869,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.47",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.47.tgz",
-      "integrity": "sha512-zS5Yer0MOYw4rtK2iq43cJagHZ8sXN0jDHDKzB+86gSBSAI4v07S97mcq+Gs2vclAxSh1j7vOAHxSVgduiiuVQ==",
+      "version": "1.5.50",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.50.tgz",
+      "integrity": "sha512-eMVObiUQ2LdgeO1F/ySTXsvqvxb6ZH2zPGaMYsWzRDdOddUa77tdmI0ltg+L16UpbWdhPmuF3wIQYyQq65WfZw==",
       "license": "ISC"
     },
     "node_modules/emoji-regex": {
@@ -7850,42 +8426,6 @@
         "eslint": ">=8.51.0"
       }
     },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.31.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
-      "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@rtsao/scc": "^1.1.0",
-        "array-includes": "^3.1.8",
-        "array.prototype.findlastindex": "^1.2.5",
-        "array.prototype.flat": "^1.3.2",
-        "array.prototype.flatmap": "^1.3.2",
-        "debug": "^3.2.7",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.9",
-        "eslint-module-utils": "^2.12.0",
-        "hasown": "^2.0.2",
-        "is-core-module": "^2.15.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.8",
-        "object.groupby": "^1.0.3",
-        "object.values": "^1.2.0",
-        "semver": "^6.3.1",
-        "string.prototype.trimend": "^1.0.8",
-        "tsconfig-paths": "^3.15.0"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
-      }
-    },
     "node_modules/eslint-plugin-import-x": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.4.0.tgz",
@@ -7927,73 +8467,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/eslint-plugin-jsx-a11y": {
       "version": "6.10.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.0.tgz",
@@ -8800,6 +9273,23 @@
         "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
       }
     },
+    "node_modules/eslint-plugin-sonarjs/node_modules/eslint-scope": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.1.0.tgz",
+      "integrity": "sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/eslint-plugin-sonarjs/node_modules/eslint-visitor-keys": {
       "version": "3.4.3",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
@@ -8962,9 +9452,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.1.0.tgz",
-      "integrity": "sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
+      "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -9357,6 +9847,20 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -11512,9 +12016,9 @@
       "license": "MIT"
     },
     "node_modules/markdownlint-cli/node_modules/lru-cache": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.1.tgz",
-      "integrity": "sha512-CgeuL5uom6j/ZVrg7G/+1IXqRY8JXX4Hghfy5YE0EhoYQWvndP1kufu58cmZLNIDKnRhZrXfdS9urVWx98AipQ==",
+      "version": "11.0.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.2.tgz",
+      "integrity": "sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -15198,9 +15702,9 @@
       "license": "MIT"
     },
     "node_modules/ts-api-utils": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
-      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.0.tgz",
+      "integrity": "sha512-032cPxaEKwM+GT3vA5JXNzIaizx388rhsSW79vGRNGXfRRAdEAn2mvk36PvK5HnOchyWZ7afLEXqYCvPCrzuzQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -15252,9 +15756,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
-      "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "dev": true,
       "license": "0BSD"
     },
@@ -15695,10 +16199,25 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/vite/node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/vite/node_modules/rollup": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.2.tgz",
-      "integrity": "sha512-do/DFGq5g6rdDhdpPq5qb2ecoczeK6y+2UAjdJ5trjQJj5f1AiVdLRWRc9A9/fFukfvJRgM0UXzxBIYMovm5ww==",
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.3.tgz",
+      "integrity": "sha512-HBW896xR5HGmoksbi3JBDtmVzWiPAYqp7wip50hjQ67JbDz61nyoMPdqu1DvVW9asYb2M65Z20ZHsyJCMqMyDg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15712,24 +16231,24 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.24.2",
-        "@rollup/rollup-android-arm64": "4.24.2",
-        "@rollup/rollup-darwin-arm64": "4.24.2",
-        "@rollup/rollup-darwin-x64": "4.24.2",
-        "@rollup/rollup-freebsd-arm64": "4.24.2",
-        "@rollup/rollup-freebsd-x64": "4.24.2",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.24.2",
-        "@rollup/rollup-linux-arm-musleabihf": "4.24.2",
-        "@rollup/rollup-linux-arm64-gnu": "4.24.2",
-        "@rollup/rollup-linux-arm64-musl": "4.24.2",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.24.2",
-        "@rollup/rollup-linux-riscv64-gnu": "4.24.2",
-        "@rollup/rollup-linux-s390x-gnu": "4.24.2",
-        "@rollup/rollup-linux-x64-gnu": "4.24.2",
-        "@rollup/rollup-linux-x64-musl": "4.24.2",
-        "@rollup/rollup-win32-arm64-msvc": "4.24.2",
-        "@rollup/rollup-win32-ia32-msvc": "4.24.2",
-        "@rollup/rollup-win32-x64-msvc": "4.24.2",
+        "@rollup/rollup-android-arm-eabi": "4.24.3",
+        "@rollup/rollup-android-arm64": "4.24.3",
+        "@rollup/rollup-darwin-arm64": "4.24.3",
+        "@rollup/rollup-darwin-x64": "4.24.3",
+        "@rollup/rollup-freebsd-arm64": "4.24.3",
+        "@rollup/rollup-freebsd-x64": "4.24.3",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.24.3",
+        "@rollup/rollup-linux-arm-musleabihf": "4.24.3",
+        "@rollup/rollup-linux-arm64-gnu": "4.24.3",
+        "@rollup/rollup-linux-arm64-musl": "4.24.3",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.24.3",
+        "@rollup/rollup-linux-riscv64-gnu": "4.24.3",
+        "@rollup/rollup-linux-s390x-gnu": "4.24.3",
+        "@rollup/rollup-linux-x64-gnu": "4.24.3",
+        "@rollup/rollup-linux-x64-musl": "4.24.3",
+        "@rollup/rollup-win32-arm64-msvc": "4.24.3",
+        "@rollup/rollup-win32-ia32-msvc": "4.24.3",
+        "@rollup/rollup-win32-x64-msvc": "4.24.3",
         "fsevents": "~2.3.2"
       }
     },
@@ -15890,9 +16409,9 @@
       }
     },
     "node_modules/vue-component-type-helpers": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.1.8.tgz",
-      "integrity": "sha512-ii36gDzrYAfOQIkOlo44yceDdT5269gKmNGxf07Qx6seH2U50+tQ2ol02XLhYPmxrh6YabAsOdte8WDrpaO6Tw==",
+      "version": "2.1.10",
+      "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.1.10.tgz",
+      "integrity": "sha512-lfgdSLQKrUmADiSV6PbBvYgQ33KF3Ztv6gP85MfGaGaSGMTXORVaHT1EHfsqCgzRNBstPKYDmvAV9Do5CmJ07A==",
       "dev": true,
       "license": "MIT"
     },
diff --git a/poetry.lock b/poetry.lock
index a8b7b111cc..5bfced4407 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -360,13 +360,13 @@ files = [
 
 [[package]]
 name = "tqdm"
-version = "4.66.5"
+version = "4.66.6"
 description = "Fast, Extensible Progress Meter"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "tqdm-4.66.5-py3-none-any.whl", hash = "sha256:90279a3770753eafc9194a0364852159802111925aa30eb3f9d85b0e805ac7cd"},
-    {file = "tqdm-4.66.5.tar.gz", hash = "sha256:e1020aef2e5096702d8a025ac7d16b1577279c9d63f8375b63083e9a5f0fcbad"},
+    {file = "tqdm-4.66.6-py3-none-any.whl", hash = "sha256:223e8b5359c2efc4b30555531f09e9f2f3589bcd7fdd389271191031b49b7a63"},
+    {file = "tqdm-4.66.6.tar.gz", hash = "sha256:4bdd694238bef1485ce839d67967ab50af8f9272aab687c0d7702a01da0be090"},
 ]
 
 [package.dependencies]
diff --git a/web_src/fomantic/package-lock.json b/web_src/fomantic/package-lock.json
index 3cefb665cc..91e09c75fd 100644
--- a/web_src/fomantic/package-lock.json
+++ b/web_src/fomantic/package-lock.json
@@ -492,9 +492,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.8.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.1.tgz",
-      "integrity": "sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg==",
+      "version": "22.8.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.7.tgz",
+      "integrity": "sha512-LidcG+2UeYIWcMuMUpBKOnryBWG/rnmOHQR5apjn8myTQcx3rinFRn7DcIFhMnS0PPFSC6OafdIKEad0lj6U0Q==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.19.8"
@@ -1219,9 +1219,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001673",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001673.tgz",
-      "integrity": "sha512-WTrjUCSMp3LYX0nE12ECkV0a+e6LC85E0Auz75555/qr78Oc8YWhEPNfDd6SHdtlCMSzqtuXY0uyEMNRcsKpKw==",
+      "version": "1.0.30001677",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001677.tgz",
+      "integrity": "sha512-fmfjsOlJUpMWu+mAAtZZZHz7UEwsUxIIvu1TJfO1HqFQvB/B+ii0xr9B5HpbZY/mC4XZ8SvjHJqtAY6pDPQEog==",
       "funding": [
         {
           "type": "opencollective",
@@ -1961,9 +1961,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.47",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.47.tgz",
-      "integrity": "sha512-zS5Yer0MOYw4rtK2iq43cJagHZ8sXN0jDHDKzB+86gSBSAI4v07S97mcq+Gs2vclAxSh1j7vOAHxSVgduiiuVQ==",
+      "version": "1.5.50",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.50.tgz",
+      "integrity": "sha512-eMVObiUQ2LdgeO1F/ySTXsvqvxb6ZH2zPGaMYsWzRDdOddUa77tdmI0ltg+L16UpbWdhPmuF3wIQYyQq65WfZw==",
       "license": "ISC"
     },
     "node_modules/emoji-regex": {

From fbfb804b29f102bfefc4fcf74eae332d0c4590ed Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Mon, 4 Nov 2024 06:03:59 +0000
Subject: [PATCH 289/443] Update dependency happy-dom to v15.8.3

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d9847ecb89..5332624d1f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -86,7 +86,7 @@
         "eslint-plugin-vue-scoped-css": "2.8.1",
         "eslint-plugin-wc": "2.2.0",
         "globals": "15.11.0",
-        "happy-dom": "15.8.0",
+        "happy-dom": "15.8.3",
         "license-checker-rseidelsohn": "4.4.2",
         "markdownlint-cli": "0.42.0",
         "postcss-html": "1.7.0",
@@ -10227,9 +10227,9 @@
       }
     },
     "node_modules/happy-dom": {
-      "version": "15.8.0",
-      "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-15.8.0.tgz",
-      "integrity": "sha512-LwBvPvR4MQ1xfrf4gbWRJzeL2xQqWiEiHvZF5uA1AwlCCgjH9ht0fGVXciRGQCghdHAIXw1zGX1mJ6a3O0fpeA==",
+      "version": "15.8.3",
+      "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-15.8.3.tgz",
+      "integrity": "sha512-YR9nUWN/T2bH7pPLEYMhTp4DQExPH+mC4KulJDgimCb+FY3Er0Vp6SOOcBXrNfMTri3lAk9uSZqUTG2hgZOYwg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index fa3f44ea2d..c727bf98ed 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "eslint-plugin-vue-scoped-css": "2.8.1",
     "eslint-plugin-wc": "2.2.0",
     "globals": "15.11.0",
-    "happy-dom": "15.8.0",
+    "happy-dom": "15.8.3",
     "license-checker-rseidelsohn": "4.4.2",
     "markdownlint-cli": "0.42.0",
     "postcss-html": "1.7.0",

From 2266e14f3886b94f3294baefe01f632358628346 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Mon, 4 Nov 2024 06:04:10 +0000
Subject: [PATCH 290/443] Update linters

---
 package-lock.json | 135 +++++++++++++++++++++++++++-------------------
 package.json      |   4 +-
 2 files changed, 82 insertions(+), 57 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d9847ecb89..5fc579620a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -71,7 +71,7 @@
         "@vitest/coverage-v8": "2.1.4",
         "@vitest/eslint-plugin": "1.1.7",
         "@vue/test-utils": "2.4.6",
-        "eslint": "9.13.0",
+        "eslint": "9.14.0",
         "eslint-import-resolver-typescript": "3.6.3",
         "eslint-plugin-array-func": "5.0.2",
         "eslint-plugin-import-x": "4.4.0",
@@ -90,7 +90,7 @@
         "license-checker-rseidelsohn": "4.4.2",
         "markdownlint-cli": "0.42.0",
         "postcss-html": "1.7.0",
-        "stylelint": "16.9.0",
+        "stylelint": "16.10.0",
         "stylelint-declaration-block-no-ignored-properties": "2.8.0",
         "stylelint-declaration-strict-value": "1.10.6",
         "stylelint-value-no-unknown-custom-properties": "6.0.1",
@@ -3054,9 +3054,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.13.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.13.0.tgz",
-      "integrity": "sha512-IFLyoY4d72Z5y/6o/BazFBezupzI/taV8sGumxTAVw3lXG9A6md1Dc34T9s1FoD/an9pJH8RHbAxsaEbBed9lA==",
+      "version": "9.14.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.14.0.tgz",
+      "integrity": "sha512-pFoEtFWCPyDOl+C6Ift+wC7Ro89otjigCf5vcuWqWgqNSQbRrpjSvdeE6ofLz4dHmyxD5f7gIdGT4+p36L6Twg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8251,22 +8251,22 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.13.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.13.0.tgz",
-      "integrity": "sha512-EYZK6SX6zjFHST/HRytOdA/zE72Cq/bfw45LSyuwrdvcclb/gqV8RRQxywOBEWO2+WDpva6UZa4CcDeJKzUCFA==",
+      "version": "9.14.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.14.0.tgz",
+      "integrity": "sha512-c2FHsVBr87lnUtjP4Yhvk4yEhKrQavGafRA/Se1ouse8PfbfC/Qh9Mxa00yWsZRlqeUB9raXip0aiiUZkgnr9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.11.0",
+        "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.18.0",
         "@eslint/core": "^0.7.0",
         "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "9.13.0",
+        "@eslint/js": "9.14.0",
         "@eslint/plugin-kit": "^0.2.0",
-        "@humanfs/node": "^0.16.5",
+        "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
-        "@humanwhocodes/retry": "^0.3.1",
+        "@humanwhocodes/retry": "^0.4.0",
         "@types/estree": "^1.0.6",
         "@types/json-schema": "^7.0.15",
         "ajv": "^6.12.4",
@@ -8274,9 +8274,9 @@
         "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.1.0",
-        "eslint-visitor-keys": "^4.1.0",
-        "espree": "^10.2.0",
+        "eslint-scope": "^8.2.0",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0",
         "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -9481,6 +9481,30 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/eslint/node_modules/@eslint-community/regexpp": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/@humanwhocodes/retry": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.0.tgz",
+      "integrity": "sha512-xnRgu9DxZbkWak/te3fcytNyp8MTbuiZIaueg2rgEvBuN55n04nwLYLU9TX/VVlusc9L2ZNXi99nUFNkHXtr5g==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
     "node_modules/eslint/node_modules/@types/estree": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
@@ -14918,9 +14942,9 @@
       "license": "ISC"
     },
     "node_modules/stylelint": {
-      "version": "16.9.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.9.0.tgz",
-      "integrity": "sha512-31Nm3WjxGOBGpQqF43o3wO9L5AC36TPIe6030Lnm13H3vDMTcS21DrLh69bMX+DBilKqMMVLian4iG6ybBoNRQ==",
+      "version": "16.10.0",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.10.0.tgz",
+      "integrity": "sha512-z/8X2rZ52dt2c0stVwI9QL2AFJhLhbPkyfpDFcizs200V/g7v+UYY6SNcB9hKOLcDDX/yGLDsY/pX08sLkz9xQ==",
       "dev": true,
       "funding": [
         {
@@ -14942,17 +14966,17 @@
         "balanced-match": "^2.0.0",
         "colord": "^2.9.3",
         "cosmiconfig": "^9.0.0",
-        "css-functions-list": "^3.2.2",
-        "css-tree": "^2.3.1",
-        "debug": "^4.3.6",
+        "css-functions-list": "^3.2.3",
+        "css-tree": "^3.0.0",
+        "debug": "^4.3.7",
         "fast-glob": "^3.3.2",
         "fastest-levenshtein": "^1.0.16",
-        "file-entry-cache": "^9.0.0",
+        "file-entry-cache": "^9.1.0",
         "global-modules": "^2.0.0",
         "globby": "^11.1.0",
         "globjoin": "^0.1.4",
         "html-tags": "^3.3.1",
-        "ignore": "^5.3.2",
+        "ignore": "^6.0.2",
         "imurmurhash": "^0.1.4",
         "is-plain-object": "^5.0.0",
         "known-css-properties": "^0.34.0",
@@ -14961,14 +14985,13 @@
         "micromatch": "^4.0.8",
         "normalize-path": "^3.0.0",
         "picocolors": "^1.0.1",
-        "postcss": "^8.4.41",
+        "postcss": "^8.4.47",
         "postcss-resolve-nested-selector": "^0.1.6",
-        "postcss-safe-parser": "^7.0.0",
+        "postcss-safe-parser": "^7.0.1",
         "postcss-selector-parser": "^6.1.2",
         "postcss-value-parser": "^4.2.0",
         "resolve-from": "^5.0.0",
         "string-width": "^4.2.3",
-        "strip-ansi": "^7.1.0",
         "supports-hyperlinks": "^3.1.0",
         "svg-tags": "^1.0.0",
         "table": "^6.8.2",
@@ -15024,19 +15047,6 @@
         "stylelint": ">=16"
       }
     },
-    "node_modules/stylelint/node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
     "node_modules/stylelint/node_modules/balanced-match": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
@@ -15044,6 +15054,20 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/stylelint/node_modules/css-tree": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.0.1.tgz",
+      "integrity": "sha512-8Fxxv+tGhORlshCdCwnNJytvlvq46sOLSYEx2ZIGurahWvMucSRnyjPA3AmrMq4VPRYbHVpWj5VkiVasrM2H4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mdn-data": "2.12.1",
+        "source-map-js": "^1.0.1"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+      }
+    },
     "node_modules/stylelint/node_modules/file-entry-cache": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-9.1.0.tgz",
@@ -15071,6 +15095,23 @@
         "node": ">=18"
       }
     },
+    "node_modules/stylelint/node_modules/ignore": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-6.0.2.tgz",
+      "integrity": "sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/stylelint/node_modules/mdn-data": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.12.1.tgz",
+      "integrity": "sha512-rsfnCbOHjqrhWxwt5/wtSLzpoKTzW7OXdT5lLOIH1OTYhWu9rRJveGq0sKvDZODABH7RX+uoR+DYcpFnq4Tf6Q==",
+      "dev": true,
+      "license": "CC0-1.0"
+    },
     "node_modules/stylelint/node_modules/postcss-safe-parser": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-7.0.1.tgz",
@@ -15108,22 +15149,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/stylelint/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
     "node_modules/stylis": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.4.tgz",
diff --git a/package.json b/package.json
index fa3f44ea2d..bdca4efe98 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "@vitest/coverage-v8": "2.1.4",
     "@vitest/eslint-plugin": "1.1.7",
     "@vue/test-utils": "2.4.6",
-    "eslint": "9.13.0",
+    "eslint": "9.14.0",
     "eslint-import-resolver-typescript": "3.6.3",
     "eslint-plugin-array-func": "5.0.2",
     "eslint-plugin-import-x": "4.4.0",
@@ -89,7 +89,7 @@
     "license-checker-rseidelsohn": "4.4.2",
     "markdownlint-cli": "0.42.0",
     "postcss-html": "1.7.0",
-    "stylelint": "16.9.0",
+    "stylelint": "16.10.0",
     "stylelint-declaration-block-no-ignored-properties": "2.8.0",
     "stylelint-declaration-strict-value": "1.10.6",
     "stylelint-value-no-unknown-custom-properties": "6.0.1",

From 3bdca4615cadf816fa300b0484f59d53b9d34729 Mon Sep 17 00:00:00 2001
From: silverwind 
Date: Thu, 31 Oct 2024 15:57:40 +0100
Subject: [PATCH 291/443] [PORT] Fix a number of typescript issues
 (gitea#32308)

- Prefer
[window.location.assign](https://developer.mozilla.org/en-US/docs/Web/API/Location/assign)
over assigning to
[window.location](https://developer.mozilla.org/en-US/docs/Web/API/Window/location)
which typescript does not like. This works in all browsers including
PaleMoon.
- Fix all typescript issues in `web_src/js/webcomponents`, no behaviour
changes.
- ~~Workaround bug in `@typescript-eslint/no-unnecessary-type-assertion`
rule.~~
- Omit vendored file from type checks.
- `tsc` error count is reduce by 53 with these changes.

---
Conflict resolution: Choose our version.
Done differently: Everything related to typescript types isn't ported.
Use `window.location.href` instead of `String(window.location)`, thanks
@viceice!

(cherry picked from commit 810782302652d73c4f7249c4c3df8a7e85bae5f0)
---
 web_src/js/components/DiffCommitSelector.vue | 12 ++++++------
 web_src/js/features/repo-issue.js            |  2 +-
 web_src/js/webcomponents/origin-url.test.js  |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/web_src/js/components/DiffCommitSelector.vue b/web_src/js/components/DiffCommitSelector.vue
index 3f6e4e4638..668c4cfe17 100644
--- a/web_src/js/components/DiffCommitSelector.vue
+++ b/web_src/js/components/DiffCommitSelector.vue
@@ -140,11 +140,11 @@ export default {
       Object.assign(this.locale, results.locale);
     },
     showAllChanges() {
-      window.location = `${this.issueLink}/files${this.queryParams}`;
+      window.location.assign(`${this.issueLink}/files${this.queryParams}`);
     },
     /** Called when user clicks on since last review */
     changesSinceLastReviewClick() {
-      window.location = `${this.issueLink}/files/${this.lastReviewCommitSha}..${this.commits.at(-1).id}${this.queryParams}`;
+      window.location.assign(`${this.issueLink}/files/${this.lastReviewCommitSha}..${this.commits.at(-1).id}${this.queryParams}`);
     },
     /** Clicking on a single commit opens this specific commit */
     commitClicked(commitId, newWindow = false) {
@@ -152,7 +152,7 @@ export default {
       if (newWindow) {
         window.open(url);
       } else {
-        window.location = url;
+        window.location.assign(url);
       }
     },
     /**
@@ -174,14 +174,14 @@ export default {
           const lastCommitIdx = this.commits.findLastIndex((x) => x.selected);
           if (lastCommitIdx === this.commits.length - 1) {
             // user selected all commits - just show the normal diff page
-            window.location = `${this.issueLink}/files${this.queryParams}`;
+            window.location.assign(`${this.issueLink}/files${this.queryParams}`);
           } else {
-            window.location = `${this.issueLink}/files/${this.commits[lastCommitIdx].id}${this.queryParams}`;
+            window.location.assign(`${this.issueLink}/files/${this.commits[lastCommitIdx].id}${this.queryParams}`);
           }
         } else {
           const start = this.commits[this.commits.findIndex((x) => x.selected) - 1].id;
           const end = this.commits.findLast((x) => x.selected).id;
-          window.location = `${this.issueLink}/files/${start}..${end}${this.queryParams}`;
+          window.location.assign(`${this.issueLink}/files/${start}..${end}${this.queryParams}`);
         }
       }
     },
diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js
index cea817ba01..3a0def1786 100644
--- a/web_src/js/features/repo-issue.js
+++ b/web_src/js/features/repo-issue.js
@@ -119,7 +119,7 @@ function excludeLabel(item) {
   const regStr = `labels=((?:-?[0-9]+%2c)*)(${id})((?:%2c-?[0-9]+)*)&`;
   const newStr = 'labels=$1-$2$3&';
 
-  window.location = href.replace(new RegExp(regStr), newStr);
+  window.location.assign(href.replace(new RegExp(regStr), newStr));
 }
 
 export function initRepoIssueSidebarList() {
diff --git a/web_src/js/webcomponents/origin-url.test.js b/web_src/js/webcomponents/origin-url.test.js
index 3b2ab89f2a..ba6a68646d 100644
--- a/web_src/js/webcomponents/origin-url.test.js
+++ b/web_src/js/webcomponents/origin-url.test.js
@@ -1,9 +1,9 @@
 import {toOriginUrl} from './origin-url.js';
 
 test('toOriginUrl', () => {
-  const oldLocation = window.location;
+  const oldLocation = window.location.href;
   for (const origin of ['https://example.com', 'https://example.com:3000']) {
-    window.location = new URL(`${origin}/`);
+    window.location.assign(`${origin}/`);
     expect(toOriginUrl('/')).toEqual(`${origin}/`);
     expect(toOriginUrl('/org/repo.git')).toEqual(`${origin}/org/repo.git`);
     expect(toOriginUrl('https://another.com')).toEqual(`${origin}/`);
@@ -13,5 +13,5 @@ test('toOriginUrl', () => {
     expect(toOriginUrl('https://another.com:4000/')).toEqual(`${origin}/`);
     expect(toOriginUrl('https://another.com:4000/org/repo.git')).toEqual(`${origin}/org/repo.git`);
   }
-  window.location = oldLocation;
+  window.location.assign(oldLocation);
 });

From 58e3c1fbdba0832dc8cbe3f9adca3674f33f70c7 Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Sun, 3 Nov 2024 22:55:06 +0100
Subject: [PATCH 292/443] fix: add label to issues and PR labeled/unlabeled
 events

When a workflow has

on:
  pull_request:
    types:
      - labeled
      - unlabeled

The payload misses the label field describing the added or removed
label.

The unlabeled event type was also incorrectly mapped to the labeled
event type.
---
 modules/structs/hook.go      |  2 ++
 services/actions/notifier.go | 22 +++++++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/modules/structs/hook.go b/modules/structs/hook.go
index 56afed6ee6..a41e172253 100644
--- a/modules/structs/hook.go
+++ b/modules/structs/hook.go
@@ -363,6 +363,7 @@ type IssuePayload struct {
 	Repository *Repository     `json:"repository"`
 	Sender     *User           `json:"sender"`
 	CommitID   string          `json:"commit_id"`
+	Label      *Label          `json:"label,omitempty"`
 }
 
 // JSONPayload encodes the IssuePayload to JSON, with an indentation of two spaces.
@@ -400,6 +401,7 @@ type PullRequestPayload struct {
 	Sender            *User           `json:"sender"`
 	CommitID          string          `json:"commit_id"`
 	Review            *ReviewPayload  `json:"review"`
+	Label             *Label          `json:"label,omitempty"`
 }
 
 // JSONPayload FIXME
diff --git a/services/actions/notifier.go b/services/actions/notifier.go
index e97afad990..2dd81158a7 100644
--- a/services/actions/notifier.go
+++ b/services/actions/notifier.go
@@ -168,7 +168,7 @@ func (n *actionsNotifier) IssueChangeAssignee(ctx context.Context, doer *user_mo
 		hookEvent = webhook_module.HookEventPullRequestAssign
 	}
 
-	notifyIssueChange(ctx, doer, issue, hookEvent, action)
+	notifyIssueChange(ctx, doer, issue, hookEvent, action, nil)
 }
 
 // IssueChangeMilestone notifies assignee to notifiers
@@ -187,11 +187,11 @@ func (n *actionsNotifier) IssueChangeMilestone(ctx context.Context, doer *user_m
 		hookEvent = webhook_module.HookEventPullRequestMilestone
 	}
 
-	notifyIssueChange(ctx, doer, issue, hookEvent, action)
+	notifyIssueChange(ctx, doer, issue, hookEvent, action, nil)
 }
 
 func (n *actionsNotifier) IssueChangeLabels(ctx context.Context, doer *user_model.User, issue *issues_model.Issue,
-	_, _ []*issues_model.Label,
+	addedLabels, removedLabels []*issues_model.Label,
 ) {
 	ctx = withMethod(ctx, "IssueChangeLabels")
 
@@ -200,10 +200,15 @@ func (n *actionsNotifier) IssueChangeLabels(ctx context.Context, doer *user_mode
 		hookEvent = webhook_module.HookEventPullRequestLabel
 	}
 
-	notifyIssueChange(ctx, doer, issue, hookEvent, api.HookIssueLabelUpdated)
+	for _, added := range addedLabels {
+		notifyIssueChange(ctx, doer, issue, hookEvent, api.HookIssueLabelUpdated, added)
+	}
+	for _, removed := range removedLabels {
+		notifyIssueChange(ctx, doer, issue, hookEvent, api.HookIssueLabelCleared, removed)
+	}
 }
 
-func notifyIssueChange(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, event webhook_module.HookEventType, action api.HookIssueAction) {
+func notifyIssueChange(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, event webhook_module.HookEventType, action api.HookIssueAction, label *issues_model.Label) {
 	var err error
 	if err = issue.LoadRepo(ctx); err != nil {
 		log.Error("LoadRepo: %v", err)
@@ -215,6 +220,11 @@ func notifyIssueChange(ctx context.Context, doer *user_model.User, issue *issues
 		return
 	}
 
+	var apiLabel *api.Label
+	if action == api.HookIssueLabelUpdated || action == api.HookIssueLabelCleared {
+		apiLabel = convert.ToLabel(label, issue.Repo, nil)
+	}
+
 	if issue.IsPull {
 		if err = issue.LoadPullRequest(ctx); err != nil {
 			log.Error("loadPullRequest: %v", err)
@@ -228,6 +238,7 @@ func notifyIssueChange(ctx context.Context, doer *user_model.User, issue *issues
 				PullRequest: convert.ToAPIPullRequest(ctx, issue.PullRequest, nil),
 				Repository:  convert.ToRepo(ctx, issue.Repo, access_model.Permission{AccessMode: perm_model.AccessModeNone}),
 				Sender:      convert.ToUser(ctx, doer, nil),
+				Label:       apiLabel,
 			}).
 			WithPullRequest(issue.PullRequest).
 			Notify(ctx)
@@ -242,6 +253,7 @@ func notifyIssueChange(ctx context.Context, doer *user_model.User, issue *issues
 			Issue:      convert.ToAPIIssue(ctx, doer, issue),
 			Repository: convert.ToRepo(ctx, issue.Repo, permission),
 			Sender:     convert.ToUser(ctx, doer, nil),
+			Label:      apiLabel,
 		}).
 		Notify(ctx)
 }

From 66c85b7d8b40d4c1c504b01ab70b6282059b1c21 Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Sun, 3 Nov 2024 23:03:19 +0100
Subject: [PATCH 293/443] fix: Actions PR workflows must update the commit
 status

When a workflow has

on:
  pull_request:
    types:
      - labeled
      - unlabeled

The outcome of the workflow (success or failure) must be associated
with the head sha commit status. Otherwise it cannot be used as a
requirement for merging the pull request (branch protections).
---
 models/actions/run.go                     |   6 +-
 services/actions/commit_status.go         |   2 +-
 tests/integration/actions_trigger_test.go | 236 ++++++++++++++++++++++
 3 files changed, 242 insertions(+), 2 deletions(-)

diff --git a/models/actions/run.go b/models/actions/run.go
index 8b40cb7ba8..f637634575 100644
--- a/models/actions/run.go
+++ b/models/actions/run.go
@@ -146,7 +146,11 @@ func (run *ActionRun) GetPushEventPayload() (*api.PushPayload, error) {
 }
 
 func (run *ActionRun) GetPullRequestEventPayload() (*api.PullRequestPayload, error) {
-	if run.Event == webhook_module.HookEventPullRequest || run.Event == webhook_module.HookEventPullRequestSync {
+	if run.Event == webhook_module.HookEventPullRequest ||
+		run.Event == webhook_module.HookEventPullRequestSync ||
+		run.Event == webhook_module.HookEventPullRequestAssign ||
+		run.Event == webhook_module.HookEventPullRequestMilestone ||
+		run.Event == webhook_module.HookEventPullRequestLabel {
 		var payload api.PullRequestPayload
 		if err := json.Unmarshal([]byte(run.EventPayload), &payload); err != nil {
 			return nil, err
diff --git a/services/actions/commit_status.go b/services/actions/commit_status.go
index 2698059e94..04dffbac88 100644
--- a/services/actions/commit_status.go
+++ b/services/actions/commit_status.go
@@ -53,7 +53,7 @@ func createCommitStatus(ctx context.Context, job *actions_model.ActionRunJob) er
 			return fmt.Errorf("head commit is missing in event payload")
 		}
 		sha = payload.HeadCommit.ID
-	case webhook_module.HookEventPullRequest, webhook_module.HookEventPullRequestSync:
+	case webhook_module.HookEventPullRequest, webhook_module.HookEventPullRequestSync, webhook_module.HookEventPullRequestLabel, webhook_module.HookEventPullRequestAssign, webhook_module.HookEventPullRequestMilestone:
 		if run.TriggerEvent == actions_module.GithubEventPullRequestTarget {
 			event = "pull_request_target"
 		} else {
diff --git a/tests/integration/actions_trigger_test.go b/tests/integration/actions_trigger_test.go
index de646f05b5..c57a64e7dd 100644
--- a/tests/integration/actions_trigger_test.go
+++ b/tests/integration/actions_trigger_test.go
@@ -5,12 +5,14 @@ package integration
 
 import (
 	"fmt"
+	"net/http"
 	"net/url"
 	"strings"
 	"testing"
 	"time"
 
 	actions_model "code.gitea.io/gitea/models/actions"
+	auth_model "code.gitea.io/gitea/models/auth"
 	"code.gitea.io/gitea/models/db"
 	git_model "code.gitea.io/gitea/models/git"
 	issues_model "code.gitea.io/gitea/models/issues"
@@ -22,9 +24,11 @@ import (
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/setting"
+	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/test"
 	webhook_module "code.gitea.io/gitea/modules/webhook"
 	actions_service "code.gitea.io/gitea/services/actions"
+	issue_service "code.gitea.io/gitea/services/issue"
 	pull_service "code.gitea.io/gitea/services/pull"
 	release_service "code.gitea.io/gitea/services/release"
 	repo_service "code.gitea.io/gitea/services/repository"
@@ -35,6 +39,238 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func TestPullRequestCommitStatus(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the base repo
+		session := loginUser(t, "user2")
+		token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue)
+
+		// prepare the repository
+		files := make([]*files_service.ChangeRepoFile, 0, 10)
+		for _, onType := range []string{
+			"opened",
+			"synchronize",
+			"labeled",
+			"unlabeled",
+			"assigned",
+			"unassigned",
+			"milestoned",
+			"demilestoned",
+			"closed",
+			"reopened",
+		} {
+			files = append(files, &files_service.ChangeRepoFile{
+				Operation: "create",
+				TreePath:  fmt.Sprintf(".forgejo/workflows/%s.yml", onType),
+				ContentReader: strings.NewReader(fmt.Sprintf(`name: %[1]s
+on:
+  pull_request:
+    types:
+      - %[1]s
+jobs:
+  %[1]s:
+    runs-on: docker
+    steps:
+      - run: true
+`, onType)),
+			})
+		}
+		baseRepo, _, f := tests.CreateDeclarativeRepo(t, user2, "repo-pull-request",
+			[]unit_model.Type{unit_model.TypeActions}, nil, files)
+		defer f()
+		baseGitRepo, err := gitrepo.OpenRepository(db.DefaultContext, baseRepo)
+		require.NoError(t, err)
+		defer func() {
+			baseGitRepo.Close()
+		}()
+
+		// prepare the pull request
+		testEditFileToNewBranch(t, session, "user2", "repo-pull-request", "main", "wip-something", "README.md", "Hello, world 1")
+		testPullCreate(t, session, "user2", "repo-pull-request", true, "main", "wip-something", "Commit status PR")
+		pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: baseRepo.ID})
+		require.NoError(t, pr.LoadIssue(db.DefaultContext))
+
+		// prepare the assignees
+		issueURL := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%s", "user2", "repo-pull-request", fmt.Sprintf("%d", pr.Issue.Index))
+
+		// prepare the labels
+		labelStr := "/api/v1/repos/user2/repo-pull-request/labels"
+		req := NewRequestWithJSON(t, "POST", labelStr, &api.CreateLabelOption{
+			Name:        "mylabel",
+			Color:       "abcdef",
+			Description: "description mylabel",
+		}).AddTokenAuth(token)
+		resp := MakeRequest(t, req, http.StatusCreated)
+		label := new(api.Label)
+		DecodeJSON(t, resp, &label)
+		labelURL := fmt.Sprintf("%s/labels", issueURL)
+
+		// prepare the milestone
+		milestoneStr := "/api/v1/repos/user2/repo-pull-request/milestones"
+		req = NewRequestWithJSON(t, "POST", milestoneStr, &api.CreateMilestoneOption{
+			Title: "mymilestone",
+			State: "open",
+		}).AddTokenAuth(token)
+		resp = MakeRequest(t, req, http.StatusCreated)
+		milestone := new(api.Milestone)
+		DecodeJSON(t, resp, &milestone)
+
+		// check that one of the status associated with the commit sha matches both
+		// context & state
+		checkCommitStatus := func(sha, context string, state api.CommitStatusState) bool {
+			commitStatuses, _, err := git_model.GetLatestCommitStatus(db.DefaultContext, pr.BaseRepoID, sha, db.ListOptionsAll)
+			require.NoError(t, err)
+			for _, commitStatus := range commitStatuses {
+				if state == commitStatus.State && context == commitStatus.Context {
+					return true
+				}
+			}
+			return false
+		}
+
+		count := 0
+		for _, testCase := range []struct {
+			onType      string
+			jobID       string
+			doSomething func()
+			action      api.HookIssueAction
+			hasLabel    bool
+		}{
+			{
+				onType:      "opened",
+				doSomething: func() {},
+				action:      api.HookIssueOpened,
+			},
+			{
+				onType: "synchronize",
+				doSomething: func() {
+					testEditFile(t, session, "user2", "repo-pull-request", "wip-something", "README.md", "Hello, world 2")
+				},
+				action: api.HookIssueSynchronized,
+			},
+			{
+				onType: "labeled",
+				doSomething: func() {
+					req := NewRequestWithJSON(t, "POST", labelURL, &api.IssueLabelsOption{
+						Labels: []any{label.ID},
+					}).AddTokenAuth(token)
+					MakeRequest(t, req, http.StatusOK)
+				},
+				action:   api.HookIssueLabelUpdated,
+				hasLabel: true,
+			},
+			{
+				onType: "unlabeled",
+				doSomething: func() {
+					req := NewRequestWithJSON(t, "PUT", labelURL, &api.IssueLabelsOption{
+						Labels: []any{},
+					}).AddTokenAuth(token)
+					MakeRequest(t, req, http.StatusOK)
+				},
+				action:   api.HookIssueLabelCleared,
+				hasLabel: true,
+			},
+			{
+				onType: "assigned",
+				doSomething: func() {
+					req := NewRequestWithJSON(t, "PATCH", issueURL, &api.EditIssueOption{
+						Assignees: []string{"user2"},
+					}).AddTokenAuth(token)
+					MakeRequest(t, req, http.StatusCreated)
+				},
+				action: api.HookIssueAssigned,
+			},
+			{
+				onType: "unassigned",
+				doSomething: func() {
+					req := NewRequestWithJSON(t, "PATCH", issueURL, &api.EditIssueOption{
+						Assignees: []string{},
+					}).AddTokenAuth(token)
+					MakeRequest(t, req, http.StatusCreated)
+				},
+				action: api.HookIssueUnassigned,
+			},
+			{
+				onType: "milestoned",
+				doSomething: func() {
+					req := NewRequestWithJSON(t, "PATCH", issueURL, &api.EditIssueOption{
+						Milestone: &milestone.ID,
+					}).AddTokenAuth(token)
+					MakeRequest(t, req, http.StatusCreated)
+				},
+				action: api.HookIssueMilestoned,
+			},
+			{
+				onType: "demilestoned",
+				doSomething: func() {
+					var zero int64
+					req := NewRequestWithJSON(t, "PATCH", issueURL, &api.EditIssueOption{
+						Milestone: &zero,
+					}).AddTokenAuth(token)
+					MakeRequest(t, req, http.StatusCreated)
+				},
+				action: api.HookIssueDemilestoned,
+			},
+			{
+				onType: "closed",
+				doSomething: func() {
+					sha, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName())
+					require.NoError(t, err)
+					err = issue_service.ChangeStatus(db.DefaultContext, pr.Issue, user2, sha, true)
+					require.NoError(t, err)
+				},
+				action: api.HookIssueClosed,
+			},
+			{
+				onType: "reopened",
+				doSomething: func() {
+					sha, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName())
+					require.NoError(t, err)
+					err = issue_service.ChangeStatus(db.DefaultContext, pr.Issue, user2, sha, false)
+					require.NoError(t, err)
+				},
+				action: api.HookIssueReOpened,
+			},
+		} {
+			t.Run(testCase.onType, func(t *testing.T) {
+				// trigger the onType event
+				testCase.doSomething()
+				count++
+				context := fmt.Sprintf("%[1]s / %[1]s (pull_request)", testCase.onType)
+
+				// wait for a new ActionRun to be created
+				assert.Eventually(t, func() bool {
+					return count == unittest.GetCount(t, &actions_model.ActionRun{RepoID: baseRepo.ID})
+				}, 30*time.Second, 1*time.Second)
+
+				// verify the expected  ActionRun was created
+				sha, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName())
+				require.NoError(t, err)
+				actionRun := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{RepoID: baseRepo.ID, WorkflowID: fmt.Sprintf("%s.yml", testCase.onType)})
+
+				assert.Equal(t, sha, actionRun.CommitSHA)
+				assert.Equal(t, actions_module.GithubEventPullRequest, actionRun.TriggerEvent)
+				event, err := actionRun.GetPullRequestEventPayload()
+				if testCase.hasLabel {
+					assert.NotNil(t, event.Label)
+				}
+				require.NoError(t, err)
+				assert.Equal(t, testCase.action, event.Action)
+
+				// verify the expected  ActionRunJob was created and is StatusWaiting
+				job := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{JobID: testCase.onType, CommitSHA: sha})
+				assert.Equal(t, actions_model.StatusWaiting, job.Status)
+
+				// verify the commit status changes to CommitStatusSuccess when the job changes to StatusSuccess
+				assert.True(t, checkCommitStatus(sha, context, api.CommitStatusPending))
+				job.Status = actions_model.StatusSuccess
+				actions_service.CreateCommitStatus(db.DefaultContext, job)
+				assert.True(t, checkCommitStatus(sha, context, api.CommitStatusSuccess))
+			})
+		}
+	})
+}
+
 func TestPullRequestTargetEvent(t *testing.T) {
 	onGiteaRun(t, func(t *testing.T, u *url.URL) {
 		user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the base repo

From f56fc51c74af9cff436abc217309dadaa610dc30 Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Mon, 4 Nov 2024 12:10:15 +0100
Subject: [PATCH 294/443] chore(release-notes): related pull requests workflow
 fixes

---
 release-notes/5778.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 release-notes/5778.md

diff --git a/release-notes/5778.md b/release-notes/5778.md
new file mode 100644
index 0000000000..a3c6305c57
--- /dev/null
+++ b/release-notes/5778.md
@@ -0,0 +1,3 @@
+fix: In a Forgejo Actions workflow, the `unlabeled` event type for pull requests was incorrectly mapped to the labeled event type.
+fix: When a Forgejo Actions issue or pull request workflow is triggered by an `labeled` or `unlabeled` event type, it misses information about the label added or removed. It is now available in the `label` data member of the event payload.
+fix: The pull request workflow must always update the head SHA commit status. Not just when the PR is synchronized, opened or closed. Otherwise it makes it impossible to define a job to be a required check (for instance a job that is triggered when labels are modified and verifies that a given combination is present).

From 0f394fd9e4686bd69f1c8e90786168646a64b9af Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Tue, 5 Nov 2024 05:56:49 +0000
Subject: [PATCH 295/443] Update dependency globals to v15.12.0 (forgejo)
 (#5814)

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5814
Reviewed-by: Michael Kriese 
Co-authored-by: Renovate Bot 
Co-committed-by: Renovate Bot 
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 23c7da3801..224037bc74 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -85,7 +85,7 @@
         "eslint-plugin-vue": "9.30.0",
         "eslint-plugin-vue-scoped-css": "2.8.1",
         "eslint-plugin-wc": "2.2.0",
-        "globals": "15.11.0",
+        "globals": "15.12.0",
         "happy-dom": "15.8.3",
         "license-checker-rseidelsohn": "4.4.2",
         "markdownlint-cli": "0.42.0",
@@ -10152,9 +10152,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "15.11.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-15.11.0.tgz",
-      "integrity": "sha512-yeyNSjdbyVaWurlwCpcA6XNBrHTMIeDdj0/hnvX/OLJ9ekOXYbLsLinH/MucQyGvNnXhidTdNhTtJaffL2sMfw==",
+      "version": "15.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-15.12.0.tgz",
+      "integrity": "sha512-1+gLErljJFhbOVyaetcwJiJ4+eLe45S2E7P5UiZ9xGfeq3ATQf5DOv9G7MH3gGbKQLkzmNh2DxfZwLdw+j6oTQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
diff --git a/package.json b/package.json
index cf168a27e5..c247972f6b 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
     "eslint-plugin-vue": "9.30.0",
     "eslint-plugin-vue-scoped-css": "2.8.1",
     "eslint-plugin-wc": "2.2.0",
-    "globals": "15.11.0",
+    "globals": "15.12.0",
     "happy-dom": "15.8.3",
     "license-checker-rseidelsohn": "4.4.2",
     "markdownlint-cli": "0.42.0",

From 8838f010b9a46610f8763c032a0318c3482dd228 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Tue, 5 Nov 2024 06:03:49 +0000
Subject: [PATCH 296/443] Update dependency happy-dom to v15.9.0

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 224037bc74..d0e42321ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -86,7 +86,7 @@
         "eslint-plugin-vue-scoped-css": "2.8.1",
         "eslint-plugin-wc": "2.2.0",
         "globals": "15.12.0",
-        "happy-dom": "15.8.3",
+        "happy-dom": "15.9.0",
         "license-checker-rseidelsohn": "4.4.2",
         "markdownlint-cli": "0.42.0",
         "postcss-html": "1.7.0",
@@ -10251,9 +10251,9 @@
       }
     },
     "node_modules/happy-dom": {
-      "version": "15.8.3",
-      "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-15.8.3.tgz",
-      "integrity": "sha512-YR9nUWN/T2bH7pPLEYMhTp4DQExPH+mC4KulJDgimCb+FY3Er0Vp6SOOcBXrNfMTri3lAk9uSZqUTG2hgZOYwg==",
+      "version": "15.9.0",
+      "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-15.9.0.tgz",
+      "integrity": "sha512-p+6ySXcpvjVW0Xetv6e8ccT2txbDpHE0RfZOEE84tQ8ESL1nlzCjvS6fZD77DkYXE540D+2N20hhFeBN6B/CJA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index c247972f6b..e48fb5ab88 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "eslint-plugin-vue-scoped-css": "2.8.1",
     "eslint-plugin-wc": "2.2.0",
     "globals": "15.12.0",
-    "happy-dom": "15.8.3",
+    "happy-dom": "15.9.0",
     "license-checker-rseidelsohn": "4.4.2",
     "markdownlint-cli": "0.42.0",
     "postcss-html": "1.7.0",

From 557612c4c1e300c6299aa98af59ad5c73ad1903b Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Tue, 5 Nov 2024 06:03:59 +0000
Subject: [PATCH 297/443] Update linters to v8.13.0

---
 package-lock.json | 100 +++++++++++++++++++++++-----------------------
 package.json      |   4 +-
 2 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 224037bc74..ebc364a485 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -66,7 +66,7 @@
         "@stoplight/spectral-cli": "6.13.1",
         "@stylistic/eslint-plugin-js": "2.10.1",
         "@stylistic/stylelint-plugin": "3.1.1",
-        "@typescript-eslint/parser": "8.12.2",
+        "@typescript-eslint/parser": "8.13.0",
         "@vitejs/plugin-vue": "5.1.4",
         "@vitest/coverage-v8": "2.1.4",
         "@vitest/eslint-plugin": "1.1.7",
@@ -96,7 +96,7 @@
         "stylelint-value-no-unknown-custom-properties": "6.0.1",
         "svgo": "3.2.0",
         "typescript": "5.6.3",
-        "typescript-eslint": "8.12.2",
+        "typescript-eslint": "8.13.0",
         "vite-string-plugin": "1.3.4",
         "vitest": "2.1.4"
       },
@@ -4860,17 +4860,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.12.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.12.2.tgz",
-      "integrity": "sha512-gQxbxM8mcxBwaEmWdtLCIGLfixBMHhQjBqR8sVWNTPpcj45WlYL2IObS/DNMLH1DBP0n8qz+aiiLTGfopPEebw==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.13.0.tgz",
+      "integrity": "sha512-nQtBLiZYMUPkclSeC3id+x4uVd1SGtHuElTxL++SfP47jR0zfkZBJHc+gL4qPsgTuypz0k8Y2GheaDYn6Gy3rg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.12.2",
-        "@typescript-eslint/type-utils": "8.12.2",
-        "@typescript-eslint/utils": "8.12.2",
-        "@typescript-eslint/visitor-keys": "8.12.2",
+        "@typescript-eslint/scope-manager": "8.13.0",
+        "@typescript-eslint/type-utils": "8.13.0",
+        "@typescript-eslint/utils": "8.13.0",
+        "@typescript-eslint/visitor-keys": "8.13.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -4894,16 +4894,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.12.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.12.2.tgz",
-      "integrity": "sha512-MrvlXNfGPLH3Z+r7Tk+Z5moZAc0dzdVjTgUgwsdGweH7lydysQsnSww3nAmsq8blFuRD5VRlAr9YdEFw3e6PBw==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.13.0.tgz",
+      "integrity": "sha512-w0xp+xGg8u/nONcGw1UXAr6cjCPU1w0XVyBs6Zqaj5eLmxkKQAByTdV/uGgNN5tVvN/kKpoQlP2cL7R+ajZZIQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.12.2",
-        "@typescript-eslint/types": "8.12.2",
-        "@typescript-eslint/typescript-estree": "8.12.2",
-        "@typescript-eslint/visitor-keys": "8.12.2",
+        "@typescript-eslint/scope-manager": "8.13.0",
+        "@typescript-eslint/types": "8.13.0",
+        "@typescript-eslint/typescript-estree": "8.13.0",
+        "@typescript-eslint/visitor-keys": "8.13.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -4923,14 +4923,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.12.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.12.2.tgz",
-      "integrity": "sha512-gPLpLtrj9aMHOvxJkSbDBmbRuYdtiEbnvO25bCMza3DhMjTQw0u7Y1M+YR5JPbMsXXnSPuCf5hfq0nEkQDL/JQ==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.13.0.tgz",
+      "integrity": "sha512-XsGWww0odcUT0gJoBZ1DeulY1+jkaHUciUq4jKNv4cpInbvvrtDoyBH9rE/n2V29wQJPk8iCH1wipra9BhmiMA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.12.2",
-        "@typescript-eslint/visitor-keys": "8.12.2"
+        "@typescript-eslint/types": "8.13.0",
+        "@typescript-eslint/visitor-keys": "8.13.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4941,14 +4941,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.12.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.12.2.tgz",
-      "integrity": "sha512-bwuU4TAogPI+1q/IJSKuD4shBLc/d2vGcRT588q+jzayQyjVK2X6v/fbR4InY2U2sgf8MEvVCqEWUzYzgBNcGQ==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.13.0.tgz",
+      "integrity": "sha512-Rqnn6xXTR316fP4D2pohZenJnp+NwQ1mo7/JM+J1LWZENSLkJI8ID8QNtlvFeb0HnFSK94D6q0cnMX6SbE5/vA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.12.2",
-        "@typescript-eslint/utils": "8.12.2",
+        "@typescript-eslint/typescript-estree": "8.13.0",
+        "@typescript-eslint/utils": "8.13.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
@@ -4966,9 +4966,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.12.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.12.2.tgz",
-      "integrity": "sha512-VwDwMF1SZ7wPBUZwmMdnDJ6sIFk4K4s+ALKLP6aIQsISkPv8jhiw65sAK6SuWODN/ix+m+HgbYDkH+zLjrzvOA==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.13.0.tgz",
+      "integrity": "sha512-4cyFErJetFLckcThRUFdReWJjVsPCqyBlJTi6IDEpc1GWCIIZRFxVppjWLIMcQhNGhdWJJRYFHpHoDWvMlDzng==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4980,14 +4980,14 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.12.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.12.2.tgz",
-      "integrity": "sha512-mME5MDwGe30Pq9zKPvyduyU86PH7aixwqYR2grTglAdB+AN8xXQ1vFGpYaUSJ5o5P/5znsSBeNcs5g5/2aQwow==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.13.0.tgz",
+      "integrity": "sha512-v7SCIGmVsRK2Cy/LTLGN22uea6SaUIlpBcO/gnMGT/7zPtxp90bphcGf4fyrCQl3ZtiBKqVTG32hb668oIYy1g==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/types": "8.12.2",
-        "@typescript-eslint/visitor-keys": "8.12.2",
+        "@typescript-eslint/types": "8.13.0",
+        "@typescript-eslint/visitor-keys": "8.13.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -5025,16 +5025,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.12.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.12.2.tgz",
-      "integrity": "sha512-UTTuDIX3fkfAz6iSVa5rTuSfWIYZ6ATtEocQ/umkRSyC9O919lbZ8dcH7mysshrCdrAM03skJOEYaBugxN+M6A==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.13.0.tgz",
+      "integrity": "sha512-A1EeYOND6Uv250nybnLZapeXpYMl8tkzYUxqmoKAWnI4sei3ihf2XdZVd+vVOmHGcp3t+P7yRrNsyyiXTvShFQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.12.2",
-        "@typescript-eslint/types": "8.12.2",
-        "@typescript-eslint/typescript-estree": "8.12.2"
+        "@typescript-eslint/scope-manager": "8.13.0",
+        "@typescript-eslint/types": "8.13.0",
+        "@typescript-eslint/typescript-estree": "8.13.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5048,13 +5048,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.12.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.12.2.tgz",
-      "integrity": "sha512-PChz8UaKQAVNHghsHcPyx1OMHoFRUEA7rJSK/mDhdq85bk+PLsUHUBqTQTFt18VJZbmxBovM65fezlheQRsSDA==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.13.0.tgz",
+      "integrity": "sha512-7N/+lztJqH4Mrf0lb10R/CbI1EaAMMGyF5y0oJvFoAhafwgiRA7TXyd8TFn8FC8k5y2dTsYogg238qavRGNnlw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.12.2",
+        "@typescript-eslint/types": "8.13.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -15902,15 +15902,15 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.12.2",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.12.2.tgz",
-      "integrity": "sha512-UbuVUWSrHVR03q9CWx+JDHeO6B/Hr9p4U5lRH++5tq/EbFq1faYZe50ZSBePptgfIKLEti0aPQ3hFgnPVcd8ZQ==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.13.0.tgz",
+      "integrity": "sha512-vIMpDRJrQd70au2G8w34mPps0ezFSPMEX4pXkTzUkrNbRX+36ais2ksGWN0esZL+ZMaFJEneOBHzCgSqle7DHw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.12.2",
-        "@typescript-eslint/parser": "8.12.2",
-        "@typescript-eslint/utils": "8.12.2"
+        "@typescript-eslint/eslint-plugin": "8.13.0",
+        "@typescript-eslint/parser": "8.13.0",
+        "@typescript-eslint/utils": "8.13.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
diff --git a/package.json b/package.json
index c247972f6b..cc39a99a3e 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "@stoplight/spectral-cli": "6.13.1",
     "@stylistic/eslint-plugin-js": "2.10.1",
     "@stylistic/stylelint-plugin": "3.1.1",
-    "@typescript-eslint/parser": "8.12.2",
+    "@typescript-eslint/parser": "8.13.0",
     "@vitejs/plugin-vue": "5.1.4",
     "@vitest/coverage-v8": "2.1.4",
     "@vitest/eslint-plugin": "1.1.7",
@@ -95,7 +95,7 @@
     "stylelint-value-no-unknown-custom-properties": "6.0.1",
     "svgo": "3.2.0",
     "typescript": "5.6.3",
-    "typescript-eslint": "8.12.2",
+    "typescript-eslint": "8.13.0",
     "vite-string-plugin": "1.3.4",
     "vitest": "2.1.4"
   },

From 643f476e35aa3e5ea00a567fd189b710306a83b0 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 29 Oct 2024 15:43:47 +0100
Subject: [PATCH 298/443] Optimize branch protection rule loading (#32280)

before if it was nonglob each load would try to glob it and the check
that is not glob ... now we only do that once and no future loading will
trigger it

---
*Sponsored by Kithara Software GmbH*

(cherry picked from commit 5d43801b72790ce5862aefdc4520edb06bb4cbba)
---
 models/git/protected_branch.go                | 22 +++++++++-----
 ..._test.go => protected_branch_list_test.go} | 29 +++++++++++++++++++
 2 files changed, 43 insertions(+), 8 deletions(-)
 rename models/git/{protected_banch_list_test.go => protected_branch_list_test.go} (79%)

diff --git a/models/git/protected_branch.go b/models/git/protected_branch.go
index a8b8c81bbe..4fc08020e0 100644
--- a/models/git/protected_branch.go
+++ b/models/git/protected_branch.go
@@ -79,14 +79,20 @@ func IsRuleNameSpecial(ruleName string) bool {
 }
 
 func (protectBranch *ProtectedBranch) loadGlob() {
-	if protectBranch.globRule == nil {
-		var err error
-		protectBranch.globRule, err = glob.Compile(protectBranch.RuleName, '/')
-		if err != nil {
-			log.Warn("Invalid glob rule for ProtectedBranch[%d]: %s %v", protectBranch.ID, protectBranch.RuleName, err)
-			protectBranch.globRule = glob.MustCompile(glob.QuoteMeta(protectBranch.RuleName), '/')
-		}
-		protectBranch.isPlainName = !IsRuleNameSpecial(protectBranch.RuleName)
+	if protectBranch.isPlainName || protectBranch.globRule != nil {
+		return
+	}
+	// detect if it is not glob
+	if !IsRuleNameSpecial(protectBranch.RuleName) {
+		protectBranch.isPlainName = true
+		return
+	}
+	// now we load the glob
+	var err error
+	protectBranch.globRule, err = glob.Compile(protectBranch.RuleName, '/')
+	if err != nil {
+		log.Warn("Invalid glob rule for ProtectedBranch[%d]: %s %v", protectBranch.ID, protectBranch.RuleName, err)
+		protectBranch.globRule = glob.MustCompile(glob.QuoteMeta(protectBranch.RuleName), '/')
 	}
 }
 
diff --git a/models/git/protected_banch_list_test.go b/models/git/protected_branch_list_test.go
similarity index 79%
rename from models/git/protected_banch_list_test.go
rename to models/git/protected_branch_list_test.go
index 09319d21a8..db7e54f685 100644
--- a/models/git/protected_banch_list_test.go
+++ b/models/git/protected_branch_list_test.go
@@ -75,3 +75,32 @@ func TestBranchRuleMatchPriority(t *testing.T) {
 		}
 	}
 }
+
+func TestBranchRuleSort(t *testing.T) {
+	in := []*ProtectedBranch{{
+		RuleName:    "b",
+		CreatedUnix: 1,
+	}, {
+		RuleName:    "b/*",
+		CreatedUnix: 3,
+	}, {
+		RuleName:    "a/*",
+		CreatedUnix: 2,
+	}, {
+		RuleName:    "c",
+		CreatedUnix: 0,
+	}, {
+		RuleName:    "a",
+		CreatedUnix: 4,
+	}}
+	expect := []string{"c", "b", "a", "a/*", "b/*"}
+
+	pbr := ProtectedBranchRules(in)
+	pbr.sort()
+
+	var got []string
+	for i := range pbr {
+		got = append(got, pbr[i].RuleName)
+	}
+	assert.Equal(t, expect, got)
+}

From 42724b09c11b3062b77712dae63530deb4c6a505 Mon Sep 17 00:00:00 2001
From: Lunny Xiao 
Date: Tue, 29 Oct 2024 09:27:03 -0700
Subject: [PATCH 299/443] Fix clean tmp dir (#32360)

Try to fix #31792

Credit to @jeroenlaylo
Copied from
https://github.com/go-gitea/gitea/issues/31792#issuecomment-2311920520

---------

Co-authored-by: wxiaoguang 
(cherry picked from commit feca8802b85dd75090c533ebdb92835d3d529f17)
---
 modules/git/repo_index.go | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/modules/git/repo_index.go b/modules/git/repo_index.go
index 8390570098..f45b6e6191 100644
--- a/modules/git/repo_index.go
+++ b/modules/git/repo_index.go
@@ -50,25 +50,35 @@ func (repo *Repository) readTreeToIndex(id ObjectID, indexFilename ...string) er
 }
 
 // ReadTreeToTemporaryIndex reads a treeish to a temporary index file
-func (repo *Repository) ReadTreeToTemporaryIndex(treeish string) (filename, tmpDir string, cancel context.CancelFunc, err error) {
-	tmpDir, err = os.MkdirTemp("", "index")
-	if err != nil {
-		return filename, tmpDir, cancel, err
-	}
+func (repo *Repository) ReadTreeToTemporaryIndex(treeish string) (tmpIndexFilename, tmpDir string, cancel context.CancelFunc, err error) {
+	defer func() {
+		// if error happens and there is a cancel function, do clean up
+		if err != nil && cancel != nil {
+			cancel()
+			cancel = nil
+		}
+	}()
 
-	filename = filepath.Join(tmpDir, ".tmp-index")
-	cancel = func() {
-		err := util.RemoveAll(tmpDir)
-		if err != nil {
-			log.Error("failed to remove tmp index file: %v", err)
+	removeDirFn := func(dir string) func() { // it can't use the return value "tmpDir" directly because it is empty when error occurs
+		return func() {
+			if err := util.RemoveAll(dir); err != nil {
+				log.Error("failed to remove tmp index dir: %v", err)
+			}
 		}
 	}
-	err = repo.ReadTreeToIndex(treeish, filename)
+
+	tmpDir, err = os.MkdirTemp("", "index")
 	if err != nil {
-		defer cancel()
-		return "", "", func() {}, err
+		return "", "", nil, err
 	}
-	return filename, tmpDir, cancel, err
+
+	tmpIndexFilename = filepath.Join(tmpDir, ".tmp-index")
+	cancel = removeDirFn(tmpDir)
+	err = repo.ReadTreeToIndex(treeish, tmpIndexFilename)
+	if err != nil {
+		return "", "", cancel, err
+	}
+	return tmpIndexFilename, tmpDir, cancel, err
 }
 
 // EmptyIndex empties the index

From e426ce257c2285e3c62233a0577b4acb48c5df0b Mon Sep 17 00:00:00 2001
From: Rowan Bohde 
Date: Wed, 30 Oct 2024 00:12:48 -0500
Subject: [PATCH 300/443] remove unused call to $.HeadRepo in view_title
 template (#32317)

This is only populated in
[`ParseCompareInfo`](https://github.com/search?q=repo%3Ago-gitea%2Fgitea%20%20.Data%5B%22HeadRepo%22%5D&type=code)
which is called in two handlers:

*
[`CompareAndPullRequestPost`](https://github.com/go-gitea/gitea/blob/9206fbb55fd28f21720072fce6a36cc22277934c/routers/web/repo/pull.go#L1246)
- a JSON post handler that doesn't render templates
*
[`CompareDiff`](https://github.com/go-gitea/gitea/blob/9206fbb55fd28f21720072fce6a36cc22277934c/routers/web/repo/compare.go#L706)
- which can render `diff/box.tmpl` and `diff/compare.tmpl`

(cherry picked from commit 1cd3f698591edf4fba7880a150b05855cdf40d47)
---
 templates/repo/issue/view_title.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl
index f63cea1856..13580ebbf9 100644
--- a/templates/repo/issue/view_title.tmpl
+++ b/templates/repo/issue/view_title.tmpl
@@ -117,7 +117,7 @@
 										{{$sameBase := ne $.BaseName $.HeadUserName}}
 										{{$differentBranch := ne . $.HeadBranch}}
 										{{if or $sameBase $differentBranch}}
-											
{{$.BaseName}}{{if $.HeadRepo}}/{{$.HeadRepo}}{{end}}:{{.}}

+											
{{$.BaseName}}:{{.}}

 										{{end}}
 									{{end}}
 								


From fe5adbbbdc0862736de37026808d4cd72adf4dab Mon Sep 17 00:00:00 2001
From: Royce Remer 
Date: Tue, 29 Oct 2024 22:41:55 -0700
Subject: [PATCH 301/443] Add new [lfs_client].BATCH_SIZE and
 [server].LFS_MAX_BATCH_SIZE config settings. (#32307)

This contains two backwards-compatible changes:
* in the lfs http_client, the number of lfs oids requested per batch is
loaded from lfs_client#BATCH_SIZE and defaulted to the previous value of
20
* in the lfs server/service, the max number of lfs oids allowed in a
batch api request is loaded from server#LFS_MAX_BATCH_SIZE and defaults
to 'nil' which equates to the previous behavior of 'infinite'

This fixes #32306

---------

Signed-off-by: Royce Remer 
Co-authored-by: wxiaoguang 
(cherry picked from commit c60e4dc1095ef90a790582cacfad27c972637bb2)

Conflicts:
	- services/lfs/server.go
	  Conflict due to our Quota implementation. Resolved by manually
	  adding the change after the quota check.
---
 custom/conf/app.example.ini |  8 ++++++++
 modules/lfs/http_client.go  |  5 ++---
 modules/setting/lfs.go      | 21 +++++++++++++++++----
 modules/setting/lfs_test.go | 16 ++++++++++++++++
 services/lfs/server.go      |  5 +++++
 5 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index 3f0e9c447d..f0fd40da5f 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -328,6 +328,10 @@ RUN_USER = ; git
 ;; Maximum number of locks returned per page
 ;LFS_LOCKS_PAGING_NUM = 50
 ;;
+;; When clients make lfs batch requests, reject them if there are more pointers than this number
+;; zero means 'unlimited'
+;LFS_MAX_BATCH_SIZE = 0
+;;
 ;; Allow graceful restarts using SIGHUP to fork
 ;ALLOW_GRACEFUL_RESTARTS = true
 ;;
@@ -2672,6 +2676,10 @@ LEVEL = Info
 ;; override the minio base path if storage type is minio
 ;MINIO_BASE_PATH = lfs/
 
+;[lfs_client]
+;; When mirroring an upstream lfs endpoint, limit the number of pointers in each batch request to this number
+;BATCH_SIZE = 20
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; settings for packages, will override storage setting
diff --git a/modules/lfs/http_client.go b/modules/lfs/http_client.go
index 4859fe61e1..aa9e744d72 100644
--- a/modules/lfs/http_client.go
+++ b/modules/lfs/http_client.go
@@ -16,10 +16,9 @@ import (
 	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/proxy"
+	"code.gitea.io/gitea/modules/setting"
 )
 
-const httpBatchSize = 20
-
 // HTTPClient is used to communicate with the LFS server
 // https://github.com/git-lfs/git-lfs/blob/main/docs/api/batch.md
 type HTTPClient struct {
@@ -30,7 +29,7 @@ type HTTPClient struct {
 
 // BatchSize returns the preferred size of batchs to process
 func (c *HTTPClient) BatchSize() int {
-	return httpBatchSize
+	return setting.LFSClient.BatchSize
 }
 
 func newHTTPClient(endpoint *url.URL, httpTransport *http.Transport) *HTTPClient {
diff --git a/modules/setting/lfs.go b/modules/setting/lfs.go
index 750101747f..ebb234a3ef 100644
--- a/modules/setting/lfs.go
+++ b/modules/setting/lfs.go
@@ -10,22 +10,31 @@ import (
 	"code.gitea.io/gitea/modules/generate"
 )
 
-// LFS represents the configuration for Git LFS
+// LFS represents the server-side configuration for Git LFS.
+// Ideally these options should be in a section like "[lfs_server]",
+// but they are in "[server]" section due to historical reasons.
+// Could be refactored in the future while keeping backwards compatibility.
 var LFS = struct {
 	StartServer    bool          `ini:"LFS_START_SERVER"`
 	JWTSecretBytes []byte        `ini:"-"`
 	HTTPAuthExpiry time.Duration `ini:"LFS_HTTP_AUTH_EXPIRY"`
 	MaxFileSize    int64         `ini:"LFS_MAX_FILE_SIZE"`
 	LocksPagingNum int           `ini:"LFS_LOCKS_PAGING_NUM"`
+	MaxBatchSize   int           `ini:"LFS_MAX_BATCH_SIZE"`
 
 	Storage *Storage
 }{}
 
+// LFSClient represents configuration for Gitea's LFS clients, for example: mirroring upstream Git LFS
+var LFSClient = struct {
+	BatchSize int `ini:"BATCH_SIZE"`
+}{}
+
 func loadLFSFrom(rootCfg ConfigProvider) error {
+	mustMapSetting(rootCfg, "lfs_client", &LFSClient)
+
+	mustMapSetting(rootCfg, "server", &LFS)
 	sec := rootCfg.Section("server")
-	if err := sec.MapTo(&LFS); err != nil {
-		return fmt.Errorf("failed to map LFS settings: %v", err)
-	}
 
 	lfsSec, _ := rootCfg.GetSection("lfs")
 
@@ -52,6 +61,10 @@ func loadLFSFrom(rootCfg ConfigProvider) error {
 		LFS.LocksPagingNum = 50
 	}
 
+	if LFSClient.BatchSize < 1 {
+		LFSClient.BatchSize = 20
+	}
+
 	LFS.HTTPAuthExpiry = sec.Key("LFS_HTTP_AUTH_EXPIRY").MustDuration(24 * time.Hour)
 
 	if !LFS.StartServer || !InstallLock {
diff --git a/modules/setting/lfs_test.go b/modules/setting/lfs_test.go
index c7f16379b2..324965781d 100644
--- a/modules/setting/lfs_test.go
+++ b/modules/setting/lfs_test.go
@@ -100,3 +100,19 @@ STORAGE_TYPE = minio
 	assert.EqualValues(t, "gitea", LFS.Storage.MinioConfig.Bucket)
 	assert.EqualValues(t, "lfs/", LFS.Storage.MinioConfig.BasePath)
 }
+
+func Test_LFSClientServerConfigs(t *testing.T) {
+	iniStr := `
+[server]
+LFS_MAX_BATCH_SIZE = 100
+[lfs_client]
+# will default to 20
+BATCH_SIZE = 0
+`
+	cfg, err := NewConfigProviderFromData(iniStr)
+	assert.NoError(t, err)
+
+	assert.NoError(t, loadLFSFrom(cfg))
+	assert.EqualValues(t, 100, LFS.MaxBatchSize)
+	assert.EqualValues(t, 20, LFSClient.BatchSize)
+}
diff --git a/services/lfs/server.go b/services/lfs/server.go
index a300de19c4..225dfdb024 100644
--- a/services/lfs/server.go
+++ b/services/lfs/server.go
@@ -192,6 +192,11 @@ func BatchHandler(ctx *context.Context) {
 		}
 	}
 
+	if setting.LFS.MaxBatchSize != 0 && len(br.Objects) > setting.LFS.MaxBatchSize {
+		writeStatus(ctx, http.StatusRequestEntityTooLarge)
+		return
+	}
+
 	contentStore := lfs_module.NewContentStore()
 
 	var responseObjects []*lfs_module.ObjectResponse

From 2a38208004b124827eeea5322d3edbd9e8ed73a3 Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Thu, 31 Oct 2024 04:05:40 +0900
Subject: [PATCH 302/443] Fix the missing menu in organization project view
 page (#32313)

#29248 didn't modify the view page.
The class name is not good enough, so this is a quick fix.

Before:
org:

![image](https://github.com/user-attachments/assets/3e26502d-66b4-4043-ab03-003ba7391487)
user:

![image](https://github.com/user-attachments/assets/9b22b90c-d63c-4228-acad-4d9fb20590ac)

After:
org:

![image](https://github.com/user-attachments/assets/21bf98a7-8a5b-4dc6-950a-88f529e36450)
user: (no change)

![image](https://github.com/user-attachments/assets/fea0dcae-3625-44e8-bb9e-4c3733da8764)

Co-authored-by: Giteabot 
(cherry picked from commit dd1f67491f5e2f798a537a61c082b1bf12e47635)
---
 templates/org/projects/view.tmpl | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/templates/org/projects/view.tmpl b/templates/org/projects/view.tmpl
index e1ab81c4cd..bd74114fe2 100644
--- a/templates/org/projects/view.tmpl
+++ b/templates/org/projects/view.tmpl
@@ -1,9 +1,13 @@
 {{template "base/head" .}}
-

-	{{template "shared/user/org_profile_avatar" .}}
-	

-		{{template "user/overview/header" .}}
-	

+

+	{{if .ContextUser.IsOrganization}}
+		{{template "org/header" .}}
+	{{else}}
+		{{template "shared/user/org_profile_avatar" .}}
+		

+			{{template "user/overview/header" .}}
+		

+	{{end}}
 	

 		{{template "projects/view" .}}
 	


From 4aa61601c3db92fcd6f0eac55c774d6ab72156b8 Mon Sep 17 00:00:00 2001
From: Oleksandr Redko 
Date: Wed, 30 Oct 2024 21:36:24 +0200
Subject: [PATCH 303/443] refactor: remove redundant err declarations (#32381)

(cherry picked from commit f4d3aaeeb9e1b11c5495e4608a3f52f316c35758)

Conflicts:
	- modules/charset/charset_test.go
	  Resolved by manually changing a `=` to `:=`, as per the
	  original patch. Conflict was due to `require.NoError`.
---
 build/generate-emoji.go             | 4 ----
 models/git/lfs.go                   | 2 --
 models/issues/label_test.go         | 3 +--
 modules/charset/charset_test.go     | 4 +---
 modules/markup/markdown/goldmark.go | 3 +--
 routers/api/v1/repo/repo.go         | 1 -
 routers/api/v1/user/repo.go         | 1 -
 routers/web/repo/actions/view.go    | 1 -
 routers/web/repo/activity.go        | 1 -
 routers/web/repo/view.go            | 1 -
 services/issue/template.go          | 2 --
 11 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/build/generate-emoji.go b/build/generate-emoji.go
index 5a88e456ee..98c2f15d75 100644
--- a/build/generate-emoji.go
+++ b/build/generate-emoji.go
@@ -53,8 +53,6 @@ func (e Emoji) MarshalJSON() ([]byte, error) {
 }
 
 func main() {
-	var err error
-
 	flag.Parse()
 
 	// generate data
@@ -83,8 +81,6 @@ var replacer = strings.NewReplacer(
 var emojiRE = regexp.MustCompile(`\{Emoji:"([^"]*)"`)
 
 func generate() ([]byte, error) {
-	var err error
-
 	// load gemoji data
 	res, err := http.Get(gemojiURL)
 	if err != nil {
diff --git a/models/git/lfs.go b/models/git/lfs.go
index 44b741c4c8..635d70d9bc 100644
--- a/models/git/lfs.go
+++ b/models/git/lfs.go
@@ -136,8 +136,6 @@ var ErrLFSObjectNotExist = db.ErrNotExist{Resource: "LFS Meta object"}
 // NewLFSMetaObject stores a given populated LFSMetaObject structure in the database
 // if it is not already present.
 func NewLFSMetaObject(ctx context.Context, repoID int64, p lfs.Pointer) (*LFSMetaObject, error) {
-	var err error
-
 	ctx, committer, err := db.TxContext(ctx)
 	if err != nil {
 		return nil, err
diff --git a/models/issues/label_test.go b/models/issues/label_test.go
index b03fc1cd20..3e3d097458 100644
--- a/models/issues/label_test.go
+++ b/models/issues/label_test.go
@@ -231,8 +231,7 @@ func TestGetLabelsByOrgID(t *testing.T) {
 	testSuccess(3, "reversealphabetically", []int64{4, 3})
 	testSuccess(3, "default", []int64{3, 4})
 
-	var err error
-	_, err = issues_model.GetLabelsByOrgID(db.DefaultContext, 0, "leastissues", db.ListOptions{})
+	_, err := issues_model.GetLabelsByOrgID(db.DefaultContext, 0, "leastissues", db.ListOptions{})
 	assert.True(t, issues_model.IsErrOrgLabelNotExist(err))
 
 	_, err = issues_model.GetLabelsByOrgID(db.DefaultContext, -1, "leastissues", db.ListOptions{})
diff --git a/modules/charset/charset_test.go b/modules/charset/charset_test.go
index 42c8415376..f7ea2beccf 100644
--- a/modules/charset/charset_test.go
+++ b/modules/charset/charset_test.go
@@ -41,14 +41,12 @@ func TestMaybeRemoveBOM(t *testing.T) {
 
 func TestToUTF8(t *testing.T) {
 	resetDefaultCharsetsOrder()
-	var res string
-	var err error
 
 	// Note: golang compiler seems so behave differently depending on the current
 	// locale, so some conversions might behave differently. For that reason, we don't
 	// depend on particular conversions but in expected behaviors.
 
-	res, err = ToUTF8([]byte{0x41, 0x42, 0x43}, ConvertOpts{})
+	res, err := ToUTF8([]byte{0x41, 0x42, 0x43}, ConvertOpts{})
 	require.NoError(t, err)
 	assert.Equal(t, "ABC", res)
 
diff --git a/modules/markup/markdown/goldmark.go b/modules/markup/markdown/goldmark.go
index 0290e1312d..1d3e04224f 100644
--- a/modules/markup/markdown/goldmark.go
+++ b/modules/markup/markdown/goldmark.go
@@ -203,8 +203,7 @@ func (r *HTMLRenderer) renderIcon(w util.BufWriter, source []byte, node ast.Node
 		return ast.WalkContinue, nil
 	}
 
-	var err error
-	_, err = w.WriteString(fmt.Sprintf(``, name))
+	_, err := w.WriteString(fmt.Sprintf(``, name))
 	if err != nil {
 		return ast.WalkStop, err
 	}
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
index e2e784a671..2c4a65934d 100644
--- a/routers/api/v1/repo/repo.go
+++ b/routers/api/v1/repo/repo.go
@@ -202,7 +202,6 @@ func Search(ctx *context.APIContext) {
 		}
 	}
 
-	var err error
 	repos, count, err := repo_model.SearchRepository(ctx, opts)
 	if err != nil {
 		ctx.JSON(http.StatusInternalServerError, api.SearchError{
diff --git a/routers/api/v1/user/repo.go b/routers/api/v1/user/repo.go
index 86716ff44f..3b304c30b0 100644
--- a/routers/api/v1/user/repo.go
+++ b/routers/api/v1/user/repo.go
@@ -130,7 +130,6 @@ func ListMyRepos(ctx *context.APIContext) {
 		return
 	}
 
-	var err error
 	repos, count, err := repo_model.SearchRepository(ctx, opts)
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "SearchRepository", err)
diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go
index bc1ecbfc1e..a343f60a98 100644
--- a/routers/web/repo/actions/view.go
+++ b/routers/web/repo/actions/view.go
@@ -307,7 +307,6 @@ func ViewPost(ctx *context_module.Context) {
 			if validCursor {
 				length := step.LogLength - cursor.Cursor
 				offset := task.LogIndexes[index]
-				var err error
 				logRows, err := actions.ReadLogs(ctx, task.LogInStorage, task.LogFilename, offset, length)
 				if err != nil {
 					ctx.Error(http.StatusInternalServerError, err.Error())
diff --git a/routers/web/repo/activity.go b/routers/web/repo/activity.go
index ba776c84d3..351578e1d6 100644
--- a/routers/web/repo/activity.go
+++ b/routers/web/repo/activity.go
@@ -94,7 +94,6 @@ func ActivityAuthors(ctx *context.Context) {
 		timeFrom = timeUntil.Add(-time.Hour * 168)
 	}
 
-	var err error
 	authors, err := activities_model.GetActivityStatsTopAuthors(ctx, ctx.Repo.Repository, timeFrom, 10)
 	if err != nil {
 		ctx.ServerError("GetActivityStatsTopAuthors", err)
diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
index f1445c580a..41ff5f97f7 100644
--- a/routers/web/repo/view.go
+++ b/routers/web/repo/view.go
@@ -147,7 +147,6 @@ func FindReadmeFileInEntries(ctx *context.Context, entries []*git.TreeEntry, try
 				// this should be impossible; if subTreeEntry exists so should this.
 				continue
 			}
-			var err error
 			childEntries, err := subTree.ListEntries()
 			if err != nil {
 				return "", nil, err
diff --git a/services/issue/template.go b/services/issue/template.go
index 47633e5d85..9a2b048401 100644
--- a/services/issue/template.go
+++ b/services/issue/template.go
@@ -56,8 +56,6 @@ func GetTemplateConfig(gitRepo *git.Repository, path string, commit *git.Commit)
 		return GetDefaultTemplateConfig(), nil
 	}
 
-	var err error
-
 	treeEntry, err := commit.GetTreeEntryByPath(path)
 	if err != nil {
 		return GetDefaultTemplateConfig(), err

From 6b74043b85ee03215705e789cebf79bc6f604bda Mon Sep 17 00:00:00 2001
From: Zettat123 
Date: Thu, 31 Oct 2024 23:28:25 +0800
Subject: [PATCH 304/443] Fix `missing signature key` error when pulling Docker
 images with `SERVE_DIRECT` enabled (#32365)

Fix #28121

I did some tests and found that the `missing signature key` error is
caused by an incorrect `Content-Type` header. Gitea correctly sets the
`Content-Type` header when serving files.

https://github.com/go-gitea/gitea/blob/348d1d0f322ca57c459acd902f54821d687ca804/routers/api/packages/container/container.go#L712-L717
However, when `SERVE_DIRECT` is enabled, the `Content-Type` header may
be set to an incorrect value by the storage service. To fix this issue,
we can use query parameters to override response header values.

https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html


In this PR, I introduced a new parameter to the `URL` method to support
additional parameters.

```
URL(path, name string, reqParams url.Values) (*url.URL, error)
```

---

Most S3-like services support specifying the content type when storing
objects. However, Gitea always use `application/octet-stream`.
Therefore, I believe we also need to improve the `Save` method to
support storing objects with the correct content type.

https://github.com/go-gitea/gitea/blob/b7fb20e73e63b8edc9b90c52073e248bef428fcc/modules/storage/minio.go#L214-L221
(cherry picked from commit 0690cb076bf63f71988a709f62a9c04660b51a4f)

Conflicts:
	- modules/storage/azureblob.go
	  Dropped the change, as we do not support Azure blob storage.
	- modules/storage/helper.go
	  Resolved by adjusting their `discardStorage` to our
	  `DiscardStorage`
	- routers/api/actions/artifacts.go
	  routers/api/actions/artifactsv4.go
	  routers/web/repo/actions/view.go
	  routers/web/repo/download.go
	  Resolved the conflicts by manually adding the new `nil`
	  parameter to the `storage.Attachments.URL()` calls.

	  Originally conflicted due to differences in the if expression
	  above these calls.
---
 modules/packages/content_store.go           | 4 ++--
 modules/storage/helper.go                   | 2 +-
 modules/storage/helper_test.go              | 2 +-
 modules/storage/local.go                    | 2 +-
 modules/storage/minio.go                    | 8 ++++++--
 modules/storage/storage.go                  | 2 +-
 routers/api/actions/artifacts.go            | 2 +-
 routers/api/actions/artifactsv4.go          | 2 +-
 routers/api/packages/container/container.go | 4 +++-
 routers/api/packages/maven/maven.go         | 2 +-
 routers/api/v1/repo/file.go                 | 4 ++--
 routers/web/base.go                         | 2 +-
 routers/web/repo/actions/view.go            | 3 ++-
 routers/web/repo/attachment.go              | 2 +-
 routers/web/repo/download.go                | 4 ++--
 routers/web/repo/repo.go                    | 2 +-
 services/lfs/server.go                      | 2 +-
 services/packages/packages.go               | 6 +++---
 18 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/modules/packages/content_store.go b/modules/packages/content_store.go
index da93e6cf6b..6438fb174f 100644
--- a/modules/packages/content_store.go
+++ b/modules/packages/content_store.go
@@ -37,8 +37,8 @@ func (s *ContentStore) ShouldServeDirect() bool {
 	return setting.Packages.Storage.MinioConfig.ServeDirect
 }
 
-func (s *ContentStore) GetServeDirectURL(key BlobHash256Key, filename string) (*url.URL, error) {
-	return s.store.URL(KeyToRelativePath(key), filename)
+func (s *ContentStore) GetServeDirectURL(key BlobHash256Key, filename string, reqParams url.Values) (*url.URL, error) {
+	return s.store.URL(KeyToRelativePath(key), filename, reqParams)
 }
 
 // FIXME: Workaround to be removed in v1.20
diff --git a/modules/storage/helper.go b/modules/storage/helper.go
index 95f1c7b9a8..8bec3a0042 100644
--- a/modules/storage/helper.go
+++ b/modules/storage/helper.go
@@ -30,7 +30,7 @@ func (s DiscardStorage) Delete(_ string) error {
 	return fmt.Errorf("%s", s)
 }
 
-func (s DiscardStorage) URL(_, _ string) (*url.URL, error) {
+func (s DiscardStorage) URL(_, _ string, _ url.Values) (*url.URL, error) {
 	return nil, fmt.Errorf("%s", s)
 }
 
diff --git a/modules/storage/helper_test.go b/modules/storage/helper_test.go
index 60a7c61289..dd30c9b8ac 100644
--- a/modules/storage/helper_test.go
+++ b/modules/storage/helper_test.go
@@ -38,7 +38,7 @@ func Test_discardStorage(t *testing.T) {
 				require.Error(t, err, string(tt))
 			}
 			{
-				got, err := tt.URL("path", "name")
+				got, err := tt.URL("path", "name", nil)
 				assert.Nil(t, got)
 				require.Errorf(t, err, string(tt))
 			}
diff --git a/modules/storage/local.go b/modules/storage/local.go
index 9bb532f1df..00c7f668aa 100644
--- a/modules/storage/local.go
+++ b/modules/storage/local.go
@@ -114,7 +114,7 @@ func (l *LocalStorage) Delete(path string) error {
 }
 
 // URL gets the redirect URL to a file
-func (l *LocalStorage) URL(path, name string) (*url.URL, error) {
+func (l *LocalStorage) URL(path, name string, reqParams url.Values) (*url.URL, error) {
 	return nil, ErrURLNotSupported
 }
 
diff --git a/modules/storage/minio.go b/modules/storage/minio.go
index d0c2dec65b..b02eec7aa0 100644
--- a/modules/storage/minio.go
+++ b/modules/storage/minio.go
@@ -276,8 +276,12 @@ func (m *MinioStorage) Delete(path string) error {
 }
 
 // URL gets the redirect URL to a file. The presigned link is valid for 5 minutes.
-func (m *MinioStorage) URL(path, name string) (*url.URL, error) {
-	reqParams := make(url.Values)
+func (m *MinioStorage) URL(path, name string, serveDirectReqParams url.Values) (*url.URL, error) {
+	// copy serveDirectReqParams
+	reqParams, err := url.ParseQuery(serveDirectReqParams.Encode())
+	if err != nil {
+		return nil, err
+	}
 	// TODO it may be good to embed images with 'inline' like ServeData does, but we don't want to have to read the file, do we?
 	reqParams.Set("response-content-disposition", "attachment; filename=\""+quoteEscaper.Replace(name)+"\"")
 	u, err := m.client.PresignedGetObject(m.ctx, m.bucket, m.buildMinioPath(path), 5*time.Minute, reqParams)
diff --git a/modules/storage/storage.go b/modules/storage/storage.go
index b83b1c7929..9cc6949256 100644
--- a/modules/storage/storage.go
+++ b/modules/storage/storage.go
@@ -63,7 +63,7 @@ type ObjectStorage interface {
 	Save(path string, r io.Reader, size int64) (int64, error)
 	Stat(path string) (os.FileInfo, error)
 	Delete(path string) error
-	URL(path, name string) (*url.URL, error)
+	URL(path, name string, reqParams url.Values) (*url.URL, error)
 	IterateObjects(path string, iterator func(path string, obj Object) error) error
 }
 
diff --git a/routers/api/actions/artifacts.go b/routers/api/actions/artifacts.go
index bc29e4481d..405686a058 100644
--- a/routers/api/actions/artifacts.go
+++ b/routers/api/actions/artifacts.go
@@ -437,7 +437,7 @@ func (ar artifactRoutes) getDownloadArtifactURL(ctx *ArtifactContext) {
 	for _, artifact := range artifacts {
 		var downloadURL string
 		if setting.Actions.ArtifactStorage.MinioConfig.ServeDirect {
-			u, err := ar.fs.URL(artifact.StoragePath, artifact.ArtifactName)
+			u, err := ar.fs.URL(artifact.StoragePath, artifact.ArtifactName, nil)
 			if err != nil && !errors.Is(err, storage.ErrURLNotSupported) {
 				log.Error("Error getting serve direct url: %v", err)
 			}
diff --git a/routers/api/actions/artifactsv4.go b/routers/api/actions/artifactsv4.go
index 677e89da2f..0417f98242 100644
--- a/routers/api/actions/artifactsv4.go
+++ b/routers/api/actions/artifactsv4.go
@@ -530,7 +530,7 @@ func (r *artifactV4Routes) getSignedArtifactURL(ctx *ArtifactContext) {
 	respData := GetSignedArtifactURLResponse{}
 
 	if setting.Actions.ArtifactStorage.MinioConfig.ServeDirect {
-		u, err := storage.ActionsArtifacts.URL(artifact.StoragePath, artifact.ArtifactPath)
+		u, err := storage.ActionsArtifacts.URL(artifact.StoragePath, artifact.ArtifactPath, nil)
 		if u != nil && err == nil {
 			respData.SignedUrl = u.String()
 		}
diff --git a/routers/api/packages/container/container.go b/routers/api/packages/container/container.go
index f376e7bc59..9c9da38424 100644
--- a/routers/api/packages/container/container.go
+++ b/routers/api/packages/container/container.go
@@ -689,7 +689,9 @@ func DeleteManifest(ctx *context.Context) {
 }
 
 func serveBlob(ctx *context.Context, pfd *packages_model.PackageFileDescriptor) {
-	s, u, _, err := packages_service.GetPackageBlobStream(ctx, pfd.File, pfd.Blob)
+	serveDirectReqParams := make(url.Values)
+	serveDirectReqParams.Set("response-content-type", pfd.Properties.GetByName(container_module.PropertyMediaType))
+	s, u, _, err := packages_service.GetPackageBlobStream(ctx, pfd.File, pfd.Blob, serveDirectReqParams)
 	if err != nil {
 		apiError(ctx, http.StatusInternalServerError, err)
 		return
diff --git a/routers/api/packages/maven/maven.go b/routers/api/packages/maven/maven.go
index 4181577454..521ef2209a 100644
--- a/routers/api/packages/maven/maven.go
+++ b/routers/api/packages/maven/maven.go
@@ -217,7 +217,7 @@ func servePackageFile(ctx *context.Context, params parameters, serveContent bool
 		return
 	}
 
-	s, u, _, err := packages_service.GetPackageBlobStream(ctx, pf, pb)
+	s, u, _, err := packages_service.GetPackageBlobStream(ctx, pf, pb, nil)
 	if err != nil {
 		apiError(ctx, http.StatusInternalServerError, err)
 		return
diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go
index 1fa44d50c4..50d2786ec8 100644
--- a/routers/api/v1/repo/file.go
+++ b/routers/api/v1/repo/file.go
@@ -214,7 +214,7 @@ func GetRawFileOrLFS(ctx *context.APIContext) {
 
 	if setting.LFS.Storage.MinioConfig.ServeDirect {
 		// If we have a signed url (S3, object storage), redirect to this directly.
-		u, err := storage.LFS.URL(pointer.RelativePath(), blob.Name())
+		u, err := storage.LFS.URL(pointer.RelativePath(), blob.Name(), nil)
 		if u != nil && err == nil {
 			ctx.Redirect(u.String())
 			return
@@ -341,7 +341,7 @@ func download(ctx *context.APIContext, archiveName string, archiver *repo_model.
 	rPath := archiver.RelativePath()
 	if setting.RepoArchive.Storage.MinioConfig.ServeDirect {
 		// If we have a signed url (S3, object storage), redirect to this directly.
-		u, err := storage.RepoArchives.URL(rPath, downloadName)
+		u, err := storage.RepoArchives.URL(rPath, downloadName, nil)
 		if u != nil && err == nil {
 			ctx.Redirect(u.String())
 			return
diff --git a/routers/web/base.go b/routers/web/base.go
index 78dde57fa6..285d1ecddc 100644
--- a/routers/web/base.go
+++ b/routers/web/base.go
@@ -39,7 +39,7 @@ func storageHandler(storageSetting *setting.Storage, prefix string, objStore sto
 			rPath := strings.TrimPrefix(req.URL.Path, "/"+prefix+"/")
 			rPath = util.PathJoinRelX(rPath)
 
-			u, err := objStore.URL(rPath, path.Base(rPath))
+			u, err := objStore.URL(rPath, path.Base(rPath), nil)
 			if err != nil {
 				if os.IsNotExist(err) || errors.Is(err, os.ErrNotExist) {
 					log.Warn("Unable to find %s %s", prefix, rPath)
diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go
index a343f60a98..e7dbb6d975 100644
--- a/routers/web/repo/actions/view.go
+++ b/routers/web/repo/actions/view.go
@@ -688,7 +688,8 @@ func ArtifactsDownloadView(ctx *context_module.Context) {
 	if len(artifacts) == 1 && artifacts[0].ArtifactName+".zip" == artifacts[0].ArtifactPath && artifacts[0].ContentEncoding == "application/zip" {
 		art := artifacts[0]
 		if setting.Actions.ArtifactStorage.MinioConfig.ServeDirect {
-			u, err := storage.ActionsArtifacts.URL(art.StoragePath, art.ArtifactPath)
+			u, err := storage.ActionsArtifacts.URL(art.StoragePath, art.ArtifactPath, nil)
+
 			if u != nil && err == nil {
 				ctx.Redirect(u.String())
 				return
diff --git a/routers/web/repo/attachment.go b/routers/web/repo/attachment.go
index b42effd8c3..b5078e1f63 100644
--- a/routers/web/repo/attachment.go
+++ b/routers/web/repo/attachment.go
@@ -134,7 +134,7 @@ func ServeAttachment(ctx *context.Context, uuid string) {
 
 	if setting.Attachment.Storage.MinioConfig.ServeDirect {
 		// If we have a signed url (S3, object storage), redirect to this directly.
-		u, err := storage.Attachments.URL(attach.RelativePath(), attach.Name)
+		u, err := storage.Attachments.URL(attach.RelativePath(), attach.Name, nil)
 
 		if u != nil && err == nil {
 			ctx.Redirect(u.String())
diff --git a/routers/web/repo/download.go b/routers/web/repo/download.go
index c4a8baecca..1e87bbf015 100644
--- a/routers/web/repo/download.go
+++ b/routers/web/repo/download.go
@@ -54,8 +54,8 @@ func ServeBlobOrLFS(ctx *context.Context, blob *git.Blob, lastModified *time.Tim
 		}
 
 		if setting.LFS.Storage.MinioConfig.ServeDirect {
-			// If we have a signed url (S3, object storage), redirect to this directly.
-			u, err := storage.LFS.URL(pointer.RelativePath(), blob.Name())
+			// If we have a signed url (S3, object storage, blob storage), redirect to this directly.
+			u, err := storage.LFS.URL(pointer.RelativePath(), blob.Name(), nil)
 			if u != nil && err == nil {
 				ctx.Redirect(u.String())
 				return nil
diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go
index 9562491440..8036bcae67 100644
--- a/routers/web/repo/repo.go
+++ b/routers/web/repo/repo.go
@@ -505,7 +505,7 @@ func download(ctx *context.Context, archiveName string, archiver *repo_model.Rep
 	rPath := archiver.RelativePath()
 	if setting.RepoArchive.Storage.MinioConfig.ServeDirect {
 		// If we have a signed url (S3, object storage), redirect to this directly.
-		u, err := storage.RepoArchives.URL(rPath, downloadName)
+		u, err := storage.RepoArchives.URL(rPath, downloadName, nil)
 		if u != nil && err == nil {
 			if archiver.ReleaseID != 0 {
 				err = repo_model.CountArchiveDownload(ctx, ctx.Repo.Repository.ID, archiver.ReleaseID, archiver.Type)
diff --git a/services/lfs/server.go b/services/lfs/server.go
index 225dfdb024..51d6f42776 100644
--- a/services/lfs/server.go
+++ b/services/lfs/server.go
@@ -485,7 +485,7 @@ func buildObjectResponse(rc *requestContext, pointer lfs_module.Pointer, downloa
 			var link *lfs_module.Link
 			if setting.LFS.Storage.MinioConfig.ServeDirect {
 				// If we have a signed url (S3, object storage), redirect to this directly.
-				u, err := storage.LFS.URL(pointer.RelativePath(), pointer.Oid)
+				u, err := storage.LFS.URL(pointer.RelativePath(), pointer.Oid, nil)
 				if u != nil && err == nil {
 					// Presigned url does not need the Authorization header
 					// https://github.com/go-gitea/gitea/issues/21525
diff --git a/services/packages/packages.go b/services/packages/packages.go
index a5b84506de..72ab19ee27 100644
--- a/services/packages/packages.go
+++ b/services/packages/packages.go
@@ -602,12 +602,12 @@ func GetPackageFileStream(ctx context.Context, pf *packages_model.PackageFile) (
 		return nil, nil, nil, err
 	}
 
-	return GetPackageBlobStream(ctx, pf, pb)
+	return GetPackageBlobStream(ctx, pf, pb, nil)
 }
 
 // GetPackageBlobStream returns the content of the specific package blob
 // If the storage supports direct serving and it's enabled, only the direct serving url is returned.
-func GetPackageBlobStream(ctx context.Context, pf *packages_model.PackageFile, pb *packages_model.PackageBlob) (io.ReadSeekCloser, *url.URL, *packages_model.PackageFile, error) {
+func GetPackageBlobStream(ctx context.Context, pf *packages_model.PackageFile, pb *packages_model.PackageBlob, serveDirectReqParams url.Values) (io.ReadSeekCloser, *url.URL, *packages_model.PackageFile, error) {
 	key := packages_module.BlobHash256Key(pb.HashSHA256)
 
 	cs := packages_module.NewContentStore()
@@ -617,7 +617,7 @@ func GetPackageBlobStream(ctx context.Context, pf *packages_model.PackageFile, p
 	var err error
 
 	if cs.ShouldServeDirect() {
-		u, err = cs.GetServeDirectURL(key, pf.Name)
+		u, err = cs.GetServeDirectURL(key, pf.Name, serveDirectReqParams)
 		if err != nil && !errors.Is(err, storage.ErrURLNotSupported) {
 			log.Error("Error getting serve direct url: %v", err)
 		}

From 748ae10e7c1805c7ec4e16f5ca0b144cf5479f5e Mon Sep 17 00:00:00 2001
From: "Kyle D." 
Date: Thu, 31 Oct 2024 22:29:54 -0400
Subject: [PATCH 305/443] Add artifacts test fixture (#30300)

Closes https://github.com/go-gitea/gitea/issues/30296

- Adds a DB fixture for actions artifacts
- Adds artifacts test files
- Clears artifacts test files between each run
- Note: I initially initialized the artifacts only for artifacts tests,
but because the files are small it only takes ~8ms, so I changed it to
always run in test setup for simplicity
- Fix some otherwise flaky tests by making them not depend on previous
tests

(cherry picked from commit 66971e591e5dddd5b6dc1572ac48f4e4ab29b8e0)

Conflicts:
	- tests/integration/api_actions_artifact_test.go
	  Conflict resolved by manually changing the tested artifact
	  name from "artifact" to "artifact-download"
	- tests/integration/api_actions_artifact_v4_test.go
	  Conflict resolved by manually updating the tested artifact
	  names, and adjusting the test case only present in our tree.
	- tests/test_utils.go
	  Resolved by manually copying the added function.
---
 models/fixtures/action_artifact.yml           | 71 ++++++++++++++++++
 modules/storage/storage.go                    |  2 +-
 .../integration/api_actions_artifact_test.go  | 74 +++++++++++--------
 .../api_actions_artifact_v4_test.go           | 24 +++---
 tests/test_utils.go                           | 17 +++++
 .../artifacts/26/1/1712166500347189545.chunk  |  1 +
 .../artifacts/26/19/1712348022422036662.chunk |  1 +
 .../artifacts/26/20/1712348022423431524.chunk |  1 +
 .../artifacts/27/5/1730330775594233150.chunk  |  1 +
 9 files changed, 147 insertions(+), 45 deletions(-)
 create mode 100644 models/fixtures/action_artifact.yml
 create mode 100644 tests/testdata/data/artifacts/26/1/1712166500347189545.chunk
 create mode 100644 tests/testdata/data/artifacts/26/19/1712348022422036662.chunk
 create mode 100644 tests/testdata/data/artifacts/26/20/1712348022423431524.chunk
 create mode 100644 tests/testdata/data/artifacts/27/5/1730330775594233150.chunk

diff --git a/models/fixtures/action_artifact.yml b/models/fixtures/action_artifact.yml
new file mode 100644
index 0000000000..2c51c11ebd
--- /dev/null
+++ b/models/fixtures/action_artifact.yml
@@ -0,0 +1,71 @@
+-
+  id: 1
+  run_id: 791
+  runner_id: 1
+  repo_id: 4
+  owner_id: 1
+  commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
+  storage_path: "26/1/1712166500347189545.chunk"
+  file_size: 1024
+  file_compressed_size: 1024
+  content_encoding: ""
+  artifact_path: "abc.txt"
+  artifact_name: "artifact-download"
+  status: 1
+  created_unix: 1712338649
+  updated_unix: 1712338649
+  expired_unix: 1720114649
+
+-
+  id: 19
+  run_id: 791
+  runner_id: 1
+  repo_id: 4
+  owner_id: 1
+  commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
+  storage_path: "26/19/1712348022422036662.chunk"
+  file_size: 1024
+  file_compressed_size: 1024
+  content_encoding: ""
+  artifact_path: "abc.txt"
+  artifact_name: "multi-file-download"
+  status: 2
+  created_unix: 1712348022
+  updated_unix: 1712348022
+  expired_unix: 1720124022
+
+-
+  id: 20
+  run_id: 791
+  runner_id: 1
+  repo_id: 4
+  owner_id: 1
+  commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
+  storage_path: "26/20/1712348022423431524.chunk"
+  file_size: 1024
+  file_compressed_size: 1024
+  content_encoding: ""
+  artifact_path: "xyz/def.txt"
+  artifact_name: "multi-file-download"
+  status: 2
+  created_unix: 1712348022
+  updated_unix: 1712348022
+  expired_unix: 1720124022
+
+-
+  id: 22
+  run_id: 792
+  runner_id: 1
+  repo_id: 4
+  owner_id: 1
+  commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
+  storage_path: "27/5/1730330775594233150.chunk"
+  file_size: 1024
+  file_compressed_size: 1024
+  content_encoding: "application/zip"
+  artifact_path: "artifact-v4-download.zip"
+  artifact_name: "artifact-v4-download"
+  status: 2
+  created_unix: 1730330775
+  updated_unix: 1730330775
+  expired_unix: 1738106775
diff --git a/modules/storage/storage.go b/modules/storage/storage.go
index 9cc6949256..d944b8618f 100644
--- a/modules/storage/storage.go
+++ b/modules/storage/storage.go
@@ -131,7 +131,7 @@ var (
 	ActionsArtifacts ObjectStorage = UninitializedStorage
 )
 
-// Init init the stoarge
+// Init init the storage
 func Init() error {
 	for _, f := range []func() error{
 		initAttachments,
diff --git a/tests/integration/api_actions_artifact_test.go b/tests/integration/api_actions_artifact_test.go
index 2798024c16..7063d99340 100644
--- a/tests/integration/api_actions_artifact_test.go
+++ b/tests/integration/api_actions_artifact_test.go
@@ -38,21 +38,21 @@ func TestActionsArtifactUploadSingleFile(t *testing.T) {
 
 	// get upload url
 	idx := strings.Index(uploadResp.FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/")
-	url := uploadResp.FileContainerResourceURL[idx:] + "?itemPath=artifact/abc.txt"
+	url := uploadResp.FileContainerResourceURL[idx:] + "?itemPath=artifact/abc-2.txt"
 
 	// upload artifact chunk
-	body := strings.Repeat("A", 1024)
+	body := strings.Repeat("C", 1024)
 	req = NewRequestWithBody(t, "PUT", url, strings.NewReader(body)).
 		AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a").
 		SetHeader("Content-Range", "bytes 0-1023/1024").
 		SetHeader("x-tfs-filelength", "1024").
-		SetHeader("x-actions-results-md5", "1HsSe8LeLWh93ILaw1TEFQ==") // base64(md5(body))
+		SetHeader("x-actions-results-md5", "XVlf820rMInUi64wmMi6EA==") // base64(md5(body))
 	MakeRequest(t, req, http.StatusOK)
 
 	t.Logf("Create artifact confirm")
 
 	// confirm artifact upload
-	req = NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts?artifactName=artifact").
+	req = NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts?artifactName=artifact-single").
 		AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a")
 	MakeRequest(t, req, http.StatusOK)
 }
@@ -115,29 +115,40 @@ func TestActionsArtifactDownload(t *testing.T) {
 	resp := MakeRequest(t, req, http.StatusOK)
 	var listResp listArtifactsResponse
 	DecodeJSON(t, resp, &listResp)
-	assert.Equal(t, int64(1), listResp.Count)
-	assert.Equal(t, "artifact", listResp.Value[0].Name)
-	assert.Contains(t, listResp.Value[0].FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts")
+	assert.Equal(t, int64(2), listResp.Count)
 
-	idx := strings.Index(listResp.Value[0].FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/")
-	url := listResp.Value[0].FileContainerResourceURL[idx+1:] + "?itemPath=artifact"
+	// Return list might be in any order. Get one file.
+	var artifactIdx int
+	for i, artifact := range listResp.Value {
+		if artifact.Name == "artifact-download" {
+			artifactIdx = i
+			break
+		}
+	}
+	assert.NotNil(t, artifactIdx)
+	assert.Equal(t, listResp.Value[artifactIdx].Name, "artifact-download")
+	assert.Contains(t, listResp.Value[artifactIdx].FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts")
+
+	idx := strings.Index(listResp.Value[artifactIdx].FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/")
+	url := listResp.Value[artifactIdx].FileContainerResourceURL[idx+1:] + "?itemPath=artifact-download"
 	req = NewRequest(t, "GET", url).
 		AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a")
 	resp = MakeRequest(t, req, http.StatusOK)
 	var downloadResp downloadArtifactResponse
 	DecodeJSON(t, resp, &downloadResp)
 	assert.Len(t, downloadResp.Value, 1)
-	assert.Equal(t, "artifact/abc.txt", downloadResp.Value[0].Path)
-	assert.Equal(t, "file", downloadResp.Value[0].ItemType)
-	assert.Contains(t, downloadResp.Value[0].ContentLocation, "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts")
+	assert.Equal(t, "artifact-download/abc.txt", downloadResp.Value[artifactIdx].Path)
+	assert.Equal(t, "file", downloadResp.Value[artifactIdx].ItemType)
+	assert.Contains(t, downloadResp.Value[artifactIdx].ContentLocation, "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts")
 
-	idx = strings.Index(downloadResp.Value[0].ContentLocation, "/api/actions_pipeline/_apis/pipelines/")
-	url = downloadResp.Value[0].ContentLocation[idx:]
+	idx = strings.Index(downloadResp.Value[artifactIdx].ContentLocation, "/api/actions_pipeline/_apis/pipelines/")
+	url = downloadResp.Value[artifactIdx].ContentLocation[idx:]
 	req = NewRequest(t, "GET", url).
 		AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a")
 	resp = MakeRequest(t, req, http.StatusOK)
+
 	body := strings.Repeat("A", 1024)
-	assert.Equal(t, resp.Body.String(), body)
+	assert.Equal(t, body, resp.Body.String())
 }
 
 func TestActionsArtifactUploadMultipleFile(t *testing.T) {
@@ -163,14 +174,14 @@ func TestActionsArtifactUploadMultipleFile(t *testing.T) {
 
 	files := []uploadingFile{
 		{
-			Path:    "abc.txt",
-			Content: strings.Repeat("A", 1024),
-			MD5:     "1HsSe8LeLWh93ILaw1TEFQ==",
+			Path:    "abc-3.txt",
+			Content: strings.Repeat("D", 1024),
+			MD5:     "9nqj7E8HZmfQtPifCJ5Zww==",
 		},
 		{
-			Path:    "xyz/def.txt",
-			Content: strings.Repeat("B", 1024),
-			MD5:     "6fgADK/7zjadf+6cB9Q1CQ==",
+			Path:    "xyz/def-2.txt",
+			Content: strings.Repeat("E", 1024),
+			MD5:     "/s1kKvxeHlUX85vaTaVxuA==",
 		},
 	}
 
@@ -199,7 +210,7 @@ func TestActionsArtifactUploadMultipleFile(t *testing.T) {
 func TestActionsArtifactDownloadMultiFiles(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 
-	const testArtifactName = "multi-files"
+	const testArtifactName = "multi-file-download"
 
 	req := NewRequest(t, "GET", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts").
 		AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a")
@@ -226,7 +237,7 @@ func TestActionsArtifactDownloadMultiFiles(t *testing.T) {
 	DecodeJSON(t, resp, &downloadResp)
 	assert.Len(t, downloadResp.Value, 2)
 
-	downloads := [][]string{{"multi-files/abc.txt", "A"}, {"multi-files/xyz/def.txt", "B"}}
+	downloads := [][]string{{"multi-file-download/abc.txt", "B"}, {"multi-file-download/xyz/def.txt", "C"}}
 	for _, v := range downloadResp.Value {
 		var bodyChar string
 		var path string
@@ -247,8 +258,7 @@ func TestActionsArtifactDownloadMultiFiles(t *testing.T) {
 		req = NewRequest(t, "GET", url).
 			AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a")
 		resp = MakeRequest(t, req, http.StatusOK)
-		body := strings.Repeat(bodyChar, 1024)
-		assert.Equal(t, resp.Body.String(), body)
+		assert.Equal(t, strings.Repeat(bodyChar, 1024), resp.Body.String())
 	}
 }
 
@@ -300,7 +310,7 @@ func TestActionsArtifactOverwrite(t *testing.T) {
 		DecodeJSON(t, resp, &listResp)
 
 		idx := strings.Index(listResp.Value[0].FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/")
-		url := listResp.Value[0].FileContainerResourceURL[idx+1:] + "?itemPath=artifact"
+		url := listResp.Value[0].FileContainerResourceURL[idx+1:] + "?itemPath=artifact-download"
 		req = NewRequest(t, "GET", url).
 			AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a")
 		resp = MakeRequest(t, req, http.StatusOK)
@@ -320,14 +330,14 @@ func TestActionsArtifactOverwrite(t *testing.T) {
 		// upload same artifact, it uses 4096 B
 		req := NewRequestWithJSON(t, "POST", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts", getUploadArtifactRequest{
 			Type: "actions_storage",
-			Name: "artifact",
+			Name: "artifact-download",
 		}).AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a")
 		resp := MakeRequest(t, req, http.StatusOK)
 		var uploadResp uploadArtifactResponse
 		DecodeJSON(t, resp, &uploadResp)
 
 		idx := strings.Index(uploadResp.FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/")
-		url := uploadResp.FileContainerResourceURL[idx:] + "?itemPath=artifact/abc.txt"
+		url := uploadResp.FileContainerResourceURL[idx:] + "?itemPath=artifact-download/abc.txt"
 		body := strings.Repeat("B", 4096)
 		req = NewRequestWithBody(t, "PUT", url, strings.NewReader(body)).
 			AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a").
@@ -337,7 +347,7 @@ func TestActionsArtifactOverwrite(t *testing.T) {
 		MakeRequest(t, req, http.StatusOK)
 
 		// confirm artifact upload
-		req = NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts?artifactName=artifact").
+		req = NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts?artifactName=artifact-download").
 			AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a")
 		MakeRequest(t, req, http.StatusOK)
 	}
@@ -352,15 +362,15 @@ func TestActionsArtifactOverwrite(t *testing.T) {
 
 		var uploadedItem listArtifactsResponseItem
 		for _, item := range listResp.Value {
-			if item.Name == "artifact" {
+			if item.Name == "artifact-download" {
 				uploadedItem = item
 				break
 			}
 		}
-		assert.Equal(t, "artifact", uploadedItem.Name)
+		assert.Equal(t, "artifact-download", uploadedItem.Name)
 
 		idx := strings.Index(uploadedItem.FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/")
-		url := uploadedItem.FileContainerResourceURL[idx+1:] + "?itemPath=artifact"
+		url := uploadedItem.FileContainerResourceURL[idx+1:] + "?itemPath=artifact-download"
 		req = NewRequest(t, "GET", url).
 			AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a")
 		resp = MakeRequest(t, req, http.StatusOK)
diff --git a/tests/integration/api_actions_artifact_v4_test.go b/tests/integration/api_actions_artifact_v4_test.go
index f55250f6c1..bf28f23536 100644
--- a/tests/integration/api_actions_artifact_v4_test.go
+++ b/tests/integration/api_actions_artifact_v4_test.go
@@ -313,7 +313,7 @@ func TestActionsArtifactV4DownloadSingle(t *testing.T) {
 
 	// acquire artifact upload url
 	req := NewRequestWithBody(t, "POST", "/twirp/github.actions.results.api.v1.ArtifactService/ListArtifacts", toProtoJSON(&actions.ListArtifactsRequest{
-		NameFilter:              wrapperspb.String("artifact"),
+		NameFilter:              wrapperspb.String("artifact-v4-download"),
 		WorkflowRunBackendId:    "792",
 		WorkflowJobRunBackendId: "193",
 	})).AddTokenAuth(token)
@@ -324,7 +324,7 @@ func TestActionsArtifactV4DownloadSingle(t *testing.T) {
 
 	// confirm artifact upload
 	req = NewRequestWithBody(t, "POST", "/twirp/github.actions.results.api.v1.ArtifactService/GetSignedArtifactURL", toProtoJSON(&actions.GetSignedArtifactURLRequest{
-		Name:                    "artifact",
+		Name:                    "artifact-v4-download",
 		WorkflowRunBackendId:    "792",
 		WorkflowJobRunBackendId: "193",
 	})).
@@ -336,20 +336,20 @@ func TestActionsArtifactV4DownloadSingle(t *testing.T) {
 
 	req = NewRequest(t, "GET", finalizeResp.SignedUrl)
 	resp = MakeRequest(t, req, http.StatusOK)
-	body := strings.Repeat("A", 1024)
+	body := strings.Repeat("D", 1024)
 	assert.Equal(t, "bytes", resp.Header().Get("accept-ranges"))
 	assert.Equal(t, body, resp.Body.String())
 
 	// Download artifact via user-facing URL
-	req = NewRequest(t, "GET", "/user5/repo4/actions/runs/188/artifacts/artifact")
+	req = NewRequest(t, "GET", "/user5/repo4/actions/runs/188/artifacts/artifact-v4-download")
 	resp = MakeRequest(t, req, http.StatusOK)
 	assert.Equal(t, "bytes", resp.Header().Get("accept-ranges"))
 	assert.Equal(t, body, resp.Body.String())
 
 	// Partial artifact download
-	req = NewRequest(t, "GET", "/user5/repo4/actions/runs/188/artifacts/artifact").SetHeader("range", "bytes=0-99")
+	req = NewRequest(t, "GET", "/user5/repo4/actions/runs/188/artifacts/artifact-v4-download").SetHeader("range", "bytes=0-99")
 	resp = MakeRequest(t, req, http.StatusPartialContent)
-	body = strings.Repeat("A", 100)
+	body = strings.Repeat("D", 100)
 	assert.Equal(t, "bytes 0-99/1024", resp.Header().Get("content-range"))
 	assert.Equal(t, body, resp.Body.String())
 }
@@ -357,13 +357,13 @@ func TestActionsArtifactV4DownloadSingle(t *testing.T) {
 func TestActionsArtifactV4DownloadRange(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 
-	bstr := strings.Repeat("B", 100)
+	bstr := strings.Repeat("D", 100)
 	body := strings.Repeat("A", 100) + bstr
 	token := uploadArtifact(t, body)
 
 	// Download (Actions API)
 	req := NewRequestWithBody(t, "POST", "/twirp/github.actions.results.api.v1.ArtifactService/GetSignedArtifactURL", toProtoJSON(&actions.GetSignedArtifactURLRequest{
-		Name:                    "artifact",
+		Name:                    "artifact-v4-download",
 		WorkflowRunBackendId:    "792",
 		WorkflowJobRunBackendId: "193",
 	})).
@@ -375,13 +375,13 @@ func TestActionsArtifactV4DownloadRange(t *testing.T) {
 
 	req = NewRequest(t, "GET", finalizeResp.SignedUrl).SetHeader("range", "bytes=100-199")
 	resp = MakeRequest(t, req, http.StatusPartialContent)
-	assert.Equal(t, "bytes 100-199/200", resp.Header().Get("content-range"))
+	assert.Equal(t, "bytes 100-199/1024", resp.Header().Get("content-range"))
 	assert.Equal(t, bstr, resp.Body.String())
 
 	// Download (user-facing API)
-	req = NewRequest(t, "GET", "/user5/repo4/actions/runs/188/artifacts/artifact").SetHeader("range", "bytes=100-199")
+	req = NewRequest(t, "GET", "/user5/repo4/actions/runs/188/artifacts/artifact-v4-download").SetHeader("range", "bytes=100-199")
 	resp = MakeRequest(t, req, http.StatusPartialContent)
-	assert.Equal(t, "bytes 100-199/200", resp.Header().Get("content-range"))
+	assert.Equal(t, "bytes 100-199/1024", resp.Header().Get("content-range"))
 	assert.Equal(t, bstr, resp.Body.String())
 }
 
@@ -393,7 +393,7 @@ func TestActionsArtifactV4Delete(t *testing.T) {
 
 	// delete artifact by name
 	req := NewRequestWithBody(t, "POST", "/twirp/github.actions.results.api.v1.ArtifactService/DeleteArtifact", toProtoJSON(&actions.DeleteArtifactRequest{
-		Name:                    "artifact",
+		Name:                    "artifact-v4-download",
 		WorkflowRunBackendId:    "792",
 		WorkflowJobRunBackendId: "193",
 	})).AddTokenAuth(token)
diff --git a/tests/test_utils.go b/tests/test_utils.go
index ee1068961c..052fdb3224 100644
--- a/tests/test_utils.go
+++ b/tests/test_utils.go
@@ -224,6 +224,20 @@ func cancelProcesses(t testing.TB, delay time.Duration) {
 	t.Logf("PrepareTestEnv: all processes cancelled within %s", time.Since(start))
 }
 
+func PrepareArtifactsStorage(t testing.TB) {
+	// prepare actions artifacts directory and files
+	assert.NoError(t, storage.Clean(storage.ActionsArtifacts))
+
+	s, err := storage.NewStorage(setting.LocalStorageType, &setting.Storage{
+		Path: filepath.Join(filepath.Dir(setting.AppPath), "tests", "testdata", "data", "artifacts"),
+	})
+	assert.NoError(t, err)
+	assert.NoError(t, s.IterateObjects("", func(p string, obj storage.Object) error {
+		_, err = storage.Copy(storage.ActionsArtifacts, p, s, p)
+		return err
+	}))
+}
+
 func PrepareTestEnv(t testing.TB, skip ...int) func() {
 	t.Helper()
 	ourSkip := 1
@@ -263,6 +277,9 @@ func PrepareTestEnv(t testing.TB, skip ...int) func() {
 		}
 	}
 
+	// Initialize actions artifact data
+	PrepareArtifactsStorage(t)
+
 	// load LFS object fixtures
 	// (LFS storage can be on any of several backends, including remote servers, so we init it with the storage API)
 	lfsFixtures, err := storage.NewStorage(setting.LocalStorageType, &setting.Storage{
diff --git a/tests/testdata/data/artifacts/26/1/1712166500347189545.chunk b/tests/testdata/data/artifacts/26/1/1712166500347189545.chunk
new file mode 100644
index 0000000000..bc7c569e9e
--- /dev/null
+++ b/tests/testdata/data/artifacts/26/1/1712166500347189545.chunk
@@ -0,0 +1 @@
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
\ No newline at end of file
diff --git a/tests/testdata/data/artifacts/26/19/1712348022422036662.chunk b/tests/testdata/data/artifacts/26/19/1712348022422036662.chunk
new file mode 100644
index 0000000000..b4fb0b0783
--- /dev/null
+++ b/tests/testdata/data/artifacts/26/19/1712348022422036662.chunk
@@ -0,0 +1 @@
+BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
\ No newline at end of file
diff --git a/tests/testdata/data/artifacts/26/20/1712348022423431524.chunk b/tests/testdata/data/artifacts/26/20/1712348022423431524.chunk
new file mode 100644
index 0000000000..45b2320ec4
--- /dev/null
+++ b/tests/testdata/data/artifacts/26/20/1712348022423431524.chunk
@@ -0,0 +1 @@
+CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
\ No newline at end of file
diff --git a/tests/testdata/data/artifacts/27/5/1730330775594233150.chunk b/tests/testdata/data/artifacts/27/5/1730330775594233150.chunk
new file mode 100644
index 0000000000..b1d6b8e046
--- /dev/null
+++ b/tests/testdata/data/artifacts/27/5/1730330775594233150.chunk
@@ -0,0 +1 @@
+DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
\ No newline at end of file

From befafe9a05f118b34990db16a57a7ebc188aaa9a Mon Sep 17 00:00:00 2001
From: Rowan Bohde 
Date: Fri, 1 Nov 2024 22:29:37 -0500
Subject: [PATCH 306/443] improve performance of diffs (#32393)

This has two major changes that significantly reduce the amount of work
done for large diffs:

* Kill a running git process when reaching the maximum number of files
in a diff, preventing it from processing the entire diff.
* When loading a diff with the URL param `file-only=true`, skip loading
stats. This speeds up loading both hidden files of a diff and sections
of a diff when clicking the "Show More" button.

A couple of minor things from profiling are also included:

* Reuse existing repo in `PrepareViewPullInfo` if head and base are the
same.

The performance impact is going to depend heavily on the individual diff
and the hardware it runs on, but when testing locally on a diff changing
100k+ lines over hundreds of files, I'm seeing a roughly 75% reduction
in time to load the result of "Show More"

---------

Co-authored-by: wxiaoguang 
(cherry picked from commit 7dcccc3bb19655a6f83dd495ffc332708d0c8678)
---
 routers/web/repo/commit.go  |  1 +
 routers/web/repo/compare.go |  3 ++
 routers/web/repo/pull.go    |  7 +++--
 services/gitdiff/gitdiff.go | 60 ++++++++++++++++---------------------
 4 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go
index 0e5d1f0a1f..1428238074 100644
--- a/routers/web/repo/commit.go
+++ b/routers/web/repo/commit.go
@@ -338,6 +338,7 @@ func Diff(ctx *context.Context) {
 		MaxLineCharacters:  setting.Git.MaxGitDiffLineCharacters,
 		MaxFiles:           maxFiles,
 		WhitespaceBehavior: gitdiff.GetWhitespaceFlag(ctx.Data["WhitespaceBehavior"].(string)),
+		FileOnly:           fileOnly,
 	}, files...)
 	if err != nil {
 		ctx.NotFound("GetDiff", err)
diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go
index 38d6004ec6..e5eab2bffa 100644
--- a/routers/web/repo/compare.go
+++ b/routers/web/repo/compare.go
@@ -611,6 +611,8 @@ func PrepareCompareDiff(
 		maxLines, maxFiles = -1, -1
 	}
 
+	fileOnly := ctx.FormBool("file-only")
+
 	diff, err := gitdiff.GetDiff(ctx, ci.HeadGitRepo,
 		&gitdiff.DiffOptions{
 			BeforeCommitID:     beforeCommitID,
@@ -621,6 +623,7 @@ func PrepareCompareDiff(
 			MaxFiles:           maxFiles,
 			WhitespaceBehavior: whitespaceBehavior,
 			DirectComparison:   ci.DirectComparison,
+			FileOnly:           fileOnly,
 		}, ctx.FormStrings("files")...)
 	if err != nil {
 		ctx.ServerError("GetDiffRangeWithWhitespaceBehavior", err)
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index 9d0dcad61e..98dacc1a0d 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -614,12 +614,12 @@ func PrepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *git.C
 	var headBranchSha string
 	// HeadRepo may be missing
 	if pull.HeadRepo != nil {
-		headGitRepo, err := gitrepo.OpenRepository(ctx, pull.HeadRepo)
+		headGitRepo, closer, err := gitrepo.RepositoryFromContextOrOpen(ctx, pull.HeadRepo)
 		if err != nil {
-			ctx.ServerError("OpenRepository", err)
+			ctx.ServerError("RepositoryFromContextOrOpen", err)
 			return nil
 		}
-		defer headGitRepo.Close()
+		defer closer.Close()
 
 		if pull.Flow == issues_model.PullRequestFlowGithub {
 			headBranchExist = headGitRepo.IsBranchExist(pull.HeadBranch)
@@ -966,6 +966,7 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 		MaxLineCharacters:  setting.Git.MaxGitDiffLineCharacters,
 		MaxFiles:           maxFiles,
 		WhitespaceBehavior: gitdiff.GetWhitespaceFlag(ctx.Data["WhitespaceBehavior"].(string)),
+		FileOnly:           fileOnly,
 	}
 
 	if !willShowSpecifiedCommit {
diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go
index 91b1f135c4..7d137fb214 100644
--- a/services/gitdiff/gitdiff.go
+++ b/services/gitdiff/gitdiff.go
@@ -379,18 +379,11 @@ func (diffFile *DiffFile) GetType() int {
 }
 
 // GetTailSection creates a fake DiffLineSection if the last section is not the end of the file
-func (diffFile *DiffFile) GetTailSection(gitRepo *git.Repository, leftCommitID, rightCommitID string) *DiffSection {
+func (diffFile *DiffFile) GetTailSection(gitRepo *git.Repository, leftCommit, rightCommit *git.Commit) *DiffSection {
 	if len(diffFile.Sections) == 0 || diffFile.Type != DiffFileChange || diffFile.IsBin || diffFile.IsLFSFile {
 		return nil
 	}
-	leftCommit, err := gitRepo.GetCommit(leftCommitID)
-	if err != nil {
-		return nil
-	}
-	rightCommit, err := gitRepo.GetCommit(rightCommitID)
-	if err != nil {
-		return nil
-	}
+
 	lastSection := diffFile.Sections[len(diffFile.Sections)-1]
 	lastLine := lastSection.Lines[len(lastSection.Lines)-1]
 	leftLineCount := getCommitFileLineCount(leftCommit, diffFile.Name)
@@ -532,11 +525,6 @@ parsingLoop:
 			lastFile := createDiffFile(diff, line)
 			diff.End = lastFile.Name
 			diff.IsIncomplete = true
-			_, err := io.Copy(io.Discard, reader)
-			if err != nil {
-				// By the definition of io.Copy this never returns io.EOF
-				return diff, fmt.Errorf("error during io.Copy: %w", err)
-			}
 			break parsingLoop
 		}
 
@@ -1097,6 +1085,7 @@ type DiffOptions struct {
 	MaxFiles           int
 	WhitespaceBehavior git.TrustedCmdArgs
 	DirectComparison   bool
+	FileOnly           bool
 }
 
 // GetDiff builds a Diff between two commits of a repository.
@@ -1105,12 +1094,16 @@ type DiffOptions struct {
 func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, files ...string) (*Diff, error) {
 	repoPath := gitRepo.Path
 
+	var beforeCommit *git.Commit
 	commit, err := gitRepo.GetCommit(opts.AfterCommitID)
 	if err != nil {
 		return nil, err
 	}
 
-	cmdDiff := git.NewCommand(gitRepo.Ctx)
+	cmdCtx, cmdCancel := context.WithCancel(ctx)
+	defer cmdCancel()
+
+	cmdDiff := git.NewCommand(cmdCtx)
 	objectFormat, err := gitRepo.GetObjectFormat()
 	if err != nil {
 		return nil, err
@@ -1132,6 +1125,12 @@ func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, fi
 			AddArguments(opts.WhitespaceBehavior...).
 			AddDynamicArguments(actualBeforeCommitID, opts.AfterCommitID)
 		opts.BeforeCommitID = actualBeforeCommitID
+
+		var err error
+		beforeCommit, err = gitRepo.GetCommit(opts.BeforeCommitID)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	// In git 2.31, git diff learned --skip-to which we can use to shortcut skip to file
@@ -1166,7 +1165,9 @@ func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, fi
 		_ = writer.Close()
 	}()
 
-	diff, err := ParsePatch(ctx, opts.MaxLines, opts.MaxLineCharacters, opts.MaxFiles, reader, parsePatchSkipToFile)
+	diff, err := ParsePatch(cmdCtx, opts.MaxLines, opts.MaxLineCharacters, opts.MaxFiles, reader, parsePatchSkipToFile)
+	// Ensure the git process is killed if it didn't exit already
+	cmdCancel()
 	if err != nil {
 		return nil, fmt.Errorf("unable to ParsePatch: %w", err)
 	}
@@ -1207,37 +1208,28 @@ func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, fi
 			diffFile.IsGenerated = analyze.IsGenerated(diffFile.Name)
 		}
 
-		tailSection := diffFile.GetTailSection(gitRepo, opts.BeforeCommitID, opts.AfterCommitID)
+		tailSection := diffFile.GetTailSection(gitRepo, beforeCommit, commit)
 		if tailSection != nil {
 			diffFile.Sections = append(diffFile.Sections, tailSection)
 		}
 	}
 
-	separator := "..."
-	if opts.DirectComparison {
-		separator = ".."
+	if opts.FileOnly {
+		return diff, nil
 	}
 
-	diffPaths := []string{opts.BeforeCommitID + separator + opts.AfterCommitID}
-	if len(opts.BeforeCommitID) == 0 || opts.BeforeCommitID == objectFormat.EmptyObjectID().String() {
-		diffPaths = []string{objectFormat.EmptyTree().String(), opts.AfterCommitID}
-	}
-	diff.NumFiles, diff.TotalAddition, diff.TotalDeletion, err = git.GetDiffShortStat(gitRepo.Ctx, repoPath, nil, diffPaths...)
-	if err != nil && strings.Contains(err.Error(), "no merge base") {
-		// git >= 2.28 now returns an error if base and head have become unrelated.
-		// previously it would return the results of git diff --shortstat base head so let's try that...
-		diffPaths = []string{opts.BeforeCommitID, opts.AfterCommitID}
-		diff.NumFiles, diff.TotalAddition, diff.TotalDeletion, err = git.GetDiffShortStat(gitRepo.Ctx, repoPath, nil, diffPaths...)
-	}
+	stats, err := GetPullDiffStats(gitRepo, opts)
 	if err != nil {
 		return nil, err
 	}
 
+	diff.NumFiles, diff.TotalAddition, diff.TotalDeletion = stats.NumFiles, stats.TotalAddition, stats.TotalDeletion
+
 	return diff, nil
 }
 
 type PullDiffStats struct {
-	TotalAddition, TotalDeletion int
+	NumFiles, TotalAddition, TotalDeletion int
 }
 
 // GetPullDiffStats
@@ -1261,12 +1253,12 @@ func GetPullDiffStats(gitRepo *git.Repository, opts *DiffOptions) (*PullDiffStat
 		diffPaths = []string{objectFormat.EmptyTree().String(), opts.AfterCommitID}
 	}
 
-	_, diff.TotalAddition, diff.TotalDeletion, err = git.GetDiffShortStat(gitRepo.Ctx, repoPath, nil, diffPaths...)
+	diff.NumFiles, diff.TotalAddition, diff.TotalDeletion, err = git.GetDiffShortStat(gitRepo.Ctx, repoPath, nil, diffPaths...)
 	if err != nil && strings.Contains(err.Error(), "no merge base") {
 		// git >= 2.28 now returns an error if base and head have become unrelated.
 		// previously it would return the results of git diff --shortstat base head so let's try that...
 		diffPaths = []string{opts.BeforeCommitID, opts.AfterCommitID}
-		_, diff.TotalAddition, diff.TotalDeletion, err = git.GetDiffShortStat(gitRepo.Ctx, repoPath, nil, diffPaths...)
+		diff.NumFiles, diff.TotalAddition, diff.TotalDeletion, err = git.GetDiffShortStat(gitRepo.Ctx, repoPath, nil, diffPaths...)
 	}
 	if err != nil {
 		return nil, err

From 268276d4a74af35d46816d54fdb9bb0c0781bca6 Mon Sep 17 00:00:00 2001
From: Lunny Xiao 
Date: Fri, 1 Nov 2024 23:11:38 -0700
Subject: [PATCH 307/443] Fix created_unix for mirroring (#32342)

Fix #32233

(cherry picked from commit 13a203828c40f9ad1005b16b4ae26256a7df8263)
---
 modules/repository/repo.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/repository/repo.go b/modules/repository/repo.go
index e15526d78d..9ce330b218 100644
--- a/modules/repository/repo.go
+++ b/modules/repository/repo.go
@@ -341,9 +341,10 @@ func pullMirrorReleaseSync(ctx context.Context, repo *repo_model.Repository, git
 
 		for _, tag := range updates {
 			if _, err := db.GetEngine(ctx).Where("repo_id = ? AND lower_tag_name = ?", repo.ID, strings.ToLower(tag.Name)).
-				Cols("sha1").
+				Cols("sha1", "created_unix").
 				Update(&repo_model.Release{
-					Sha1: tag.Object.String(),
+					Sha1:        tag.Object.String(),
+					CreatedUnix: timeutil.TimeStamp(tag.Tagger.When.Unix()),
 				}); err != nil {
 				return fmt.Errorf("unable to update tag %s for pull-mirror Repo[%d:%s/%s]: %w", tag.Name, repo.ID, repo.OwnerName, repo.Name, err)
 			}

From ae6292ba380e6af49c6d24522a89313638570dee Mon Sep 17 00:00:00 2001
From: Gergely Nagy 
Date: Sun, 3 Nov 2024 11:33:32 +0100
Subject: [PATCH 308/443] chore: Fix a few lint errors

- Adjust `PrepareArtifactsStorage` to use `require.NoError` instead of
  `assert.NoError`
- Adjust `TestActionsArtifactDownload` to have the proper order of
  `assert.Equal` arguments.

Signed-off-by: Gergely Nagy 
---
 tests/integration/api_actions_artifact_test.go | 2 +-
 tests/test_utils.go                            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/integration/api_actions_artifact_test.go b/tests/integration/api_actions_artifact_test.go
index 7063d99340..2e35d4390a 100644
--- a/tests/integration/api_actions_artifact_test.go
+++ b/tests/integration/api_actions_artifact_test.go
@@ -126,7 +126,7 @@ func TestActionsArtifactDownload(t *testing.T) {
 		}
 	}
 	assert.NotNil(t, artifactIdx)
-	assert.Equal(t, listResp.Value[artifactIdx].Name, "artifact-download")
+	assert.Equal(t, "artifact-download", listResp.Value[artifactIdx].Name)
 	assert.Contains(t, listResp.Value[artifactIdx].FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts")
 
 	idx := strings.Index(listResp.Value[artifactIdx].FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/")
diff --git a/tests/test_utils.go b/tests/test_utils.go
index 052fdb3224..89016f9f64 100644
--- a/tests/test_utils.go
+++ b/tests/test_utils.go
@@ -226,13 +226,13 @@ func cancelProcesses(t testing.TB, delay time.Duration) {
 
 func PrepareArtifactsStorage(t testing.TB) {
 	// prepare actions artifacts directory and files
-	assert.NoError(t, storage.Clean(storage.ActionsArtifacts))
+	require.NoError(t, storage.Clean(storage.ActionsArtifacts))
 
 	s, err := storage.NewStorage(setting.LocalStorageType, &setting.Storage{
 		Path: filepath.Join(filepath.Dir(setting.AppPath), "tests", "testdata", "data", "artifacts"),
 	})
-	assert.NoError(t, err)
-	assert.NoError(t, s.IterateObjects("", func(p string, obj storage.Object) error {
+	require.NoError(t, err)
+	require.NoError(t, s.IterateObjects("", func(p string, obj storage.Object) error {
 		_, err = storage.Copy(storage.ActionsArtifacts, p, s, p)
 		return err
 	}))

From 597f83c73527c1a171bd16f52efccc6eae848bb4 Mon Sep 17 00:00:00 2001
From: Gergely Nagy 
Date: Tue, 5 Nov 2024 09:23:56 +0100
Subject: [PATCH 309/443] fix(tests): Fix TestMigrateActionsArtifacts()

Since we have artifact fixtures now, some ids are in use. To avoid
reusing IDs, start them at 42, rather than 0. That's past the ids used
by the fixtures.

Signed-off-by: Gergely Nagy 
---
 cmd/migrate_storage_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/migrate_storage_test.go b/cmd/migrate_storage_test.go
index 800a15e215..56745e9a38 100644
--- a/cmd/migrate_storage_test.go
+++ b/cmd/migrate_storage_test.go
@@ -91,7 +91,7 @@ func TestMigrateActionsArtifacts(t *testing.T) {
 
 	srcStorage, _ := createLocalStorage(t)
 	defer test.MockVariableValue(&storage.ActionsArtifacts, srcStorage)()
-	id := int64(0)
+	id := int64(42)
 
 	addArtifact := func(storagePath string, status actions.ArtifactStatus) {
 		id++

From cc03ac9e8fc0b4967864ba8409565ef42f1d1bbf Mon Sep 17 00:00:00 2001
From: Gergely Nagy 
Date: Tue, 5 Nov 2024 09:30:22 +0100
Subject: [PATCH 310/443] chore(release-notes): notes for the week 2024-45
 weekly cherry pick

---
 release-notes/5789.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 release-notes/5789.md

diff --git a/release-notes/5789.md b/release-notes/5789.md
new file mode 100644
index 0000000000..0c0763a46e
--- /dev/null
+++ b/release-notes/5789.md
@@ -0,0 +1,6 @@
+fix: [commit](https://codeberg.org/forgejo/forgejo/commit/362ad0ba39bdbc87202e349678e21fc2a75ff7cb) Update force-pushed tags too when syncing mirrors
+chore: [commit](https://codeberg.org/forgejo/forgejo/commit/b308bcca7c950b7f0d127ee4282019c2a9923299) Improved diff view performance
+fix: [commit](https://codeberg.org/forgejo/forgejo/commit/4c5bdddf7751a35985c08ba6506f1f30103749d6) Fix `missing signature key` error when pulling Docker images with `SERVE_DIRECT` enabled
+fix: [commit](https://codeberg.org/forgejo/forgejo/commit/2c5fdb108ff9e23e8f907fb6afe59177c6bb202e) Fix the missing menu in organization project view page
+feat: [commit](https://codeberg.org/forgejo/forgejo/commit/1e595979625e54d375a0eaa440b84ef5e17af160) Add new [lfs_client].BATCH_SIZE and [server].LFS_MAX_BATCH_SIZE config settings.
+fix: [commit](https://codeberg.org/forgejo/forgejo/commit/2358c0d899faec8311e46dcb0550041496bcd532) Properly clean temporary index files

From c68fcaf53d1d594321951cb2a910f5d8b6c4cdb4 Mon Sep 17 00:00:00 2001
From: Michael Kriese 
Date: Tue, 5 Nov 2024 10:37:28 +0100
Subject: [PATCH 311/443] test: enable github migration tests

---
 models/unittest/mock_http.go                  |  9 +++++++
 services/migrations/github_test.go            | 23 +++++++++-------
 .../github/full_download/GET_%2Frate_limit    | 23 ++++++++++++++++
 .../GET_%2Frepos%2Fgo-gitea%2Ftest_repo       | 25 ++++++++++++++++++
 ...issues%2F1%2Freactions%3Fpage=1&per_page=2 | 24 +++++++++++++++++
 ...issues%2F1%2Freactions%3Fpage=2&per_page=2 | 26 +++++++++++++++++++
 ...%3Fdirection=asc&per_page=100&sort=created | 24 +++++++++++++++++
 ...issues%2F2%2Freactions%3Fpage=1&per_page=2 | 25 ++++++++++++++++++
 ...issues%2F2%2Freactions%3Fpage=2&per_page=2 | 25 ++++++++++++++++++
 ...issues%2F2%2Freactions%3Fpage=3&per_page=2 | 25 ++++++++++++++++++
 ...issues%2F2%2Freactions%3Fpage=4&per_page=2 | 26 +++++++++++++++++++
 ...issues%2F3%2Freactions%3Fpage=1&per_page=2 | 25 ++++++++++++++++++
 ...issues%2F4%2Freactions%3Fpage=1&per_page=2 | 24 +++++++++++++++++
 ...issues%2F4%2Freactions%3Fpage=2&per_page=2 | 26 +++++++++++++++++++
 ...53111966%2Freactions%3Fpage=1&per_page=100 | 24 +++++++++++++++++
 ...53111966%2Freactions%3Fpage=2&per_page=100 | 26 +++++++++++++++++++
 ...53138856%2Freactions%3Fpage=1&per_page=100 | 25 ++++++++++++++++++
 ...c&page=1&per_page=2&sort=created&state=all | 25 ++++++++++++++++++
 ...2Ftest_repo%2Flabels%3Fpage=1&per_page=100 | 24 +++++++++++++++++
 ...milestones%3Fpage=1&per_page=100&state=all | 24 +++++++++++++++++
 ...s%2F3%2Frequested_reviewers%3Fper_page=100 | 24 +++++++++++++++++
 ...iews%2F315859956%2Fcomments%3Fper_page=100 | 25 ++++++++++++++++++
 ...iews%2F315860062%2Fcomments%3Fper_page=100 | 25 ++++++++++++++++++
 ...iews%2F315861440%2Fcomments%3Fper_page=100 | 25 ++++++++++++++++++
 ..._repo%2Fpulls%2F3%2Freviews%3Fper_page=100 | 24 +++++++++++++++++
 ...s%2F4%2Frequested_reviewers%3Fper_page=100 | 24 +++++++++++++++++
 ...iews%2F338338740%2Fcomments%3Fper_page=100 | 24 +++++++++++++++++
 ...iews%2F338339651%2Fcomments%3Fper_page=100 | 25 ++++++++++++++++++
 ...iews%2F338349019%2Fcomments%3Fper_page=100 | 24 +++++++++++++++++
 ..._repo%2Fpulls%2F4%2Freviews%3Fper_page=100 | 24 +++++++++++++++++
 ...63017488%2Freactions%3Fpage=1&per_page=100 | 25 ++++++++++++++++++
 ...63029944%2Freactions%3Fpage=1&per_page=100 | 25 ++++++++++++++++++
 ...c&page=1&per_page=2&sort=created&state=all | 24 +++++++++++++++++
 ...test_repo%2Freleases%3Fpage=1&per_page=100 | 24 +++++++++++++++++
 34 files changed, 810 insertions(+), 10 deletions(-)
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frate_limit
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F1%2Freactions%3Fpage=1&per_page=2
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F1%2Freactions%3Fpage=2&per_page=2
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Fcomments%3Fdirection=asc&per_page=100&sort=created
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Freactions%3Fpage=1&per_page=2
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Freactions%3Fpage=2&per_page=2
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Freactions%3Fpage=3&per_page=2
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Freactions%3Fpage=4&per_page=2
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F3%2Freactions%3Fpage=1&per_page=2
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F4%2Freactions%3Fpage=1&per_page=2
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F4%2Freactions%3Fpage=2&per_page=2
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2Fcomments%2F553111966%2Freactions%3Fpage=1&per_page=100
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2Fcomments%2F553111966%2Freactions%3Fpage=2&per_page=100
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2Fcomments%2F553138856%2Freactions%3Fpage=1&per_page=100
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%3Fdirection=asc&page=1&per_page=2&sort=created&state=all
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Flabels%3Fpage=1&per_page=100
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fmilestones%3Fpage=1&per_page=100&state=all
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Frequested_reviewers%3Fper_page=100
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Freviews%2F315859956%2Fcomments%3Fper_page=100
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Freviews%2F315860062%2Fcomments%3Fper_page=100
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Freviews%2F315861440%2Fcomments%3Fper_page=100
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Freviews%3Fper_page=100
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Frequested_reviewers%3Fper_page=100
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Freviews%2F338338740%2Fcomments%3Fper_page=100
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Freviews%2F338339651%2Fcomments%3Fper_page=100
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Freviews%2F338349019%2Fcomments%3Fper_page=100
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Freviews%3Fper_page=100
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2Fcomments%2F363017488%2Freactions%3Fpage=1&per_page=100
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2Fcomments%2F363029944%2Freactions%3Fpage=1&per_page=100
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%3Fdirection=asc&page=1&per_page=2&sort=created&state=all
 create mode 100644 services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Freleases%3Fpage=1&per_page=100

diff --git a/models/unittest/mock_http.go b/models/unittest/mock_http.go
index aea2489d2a..8e79699895 100644
--- a/models/unittest/mock_http.go
+++ b/models/unittest/mock_http.go
@@ -33,6 +33,11 @@ func NewMockWebServer(t *testing.T, liveServerBaseURL, testDataDir string, liveM
 
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		path := NormalizedFullPath(r.URL)
+		isGh := liveServerBaseURL == "https://api.github.com"
+		if isGh {
+			// Workaround for GitHub: trim `/api/v3` from the path
+			path = strings.TrimPrefix(path, "/api/v3")
+		}
 		log.Info("Mock HTTP Server: got request for path %s", r.URL.Path)
 		// TODO check request method (support POST?)
 		fixturePath := fmt.Sprintf("%s/%s_%s", testDataDir, r.Method, url.PathEscape(path))
@@ -86,6 +91,10 @@ func NewMockWebServer(t *testing.T, liveServerBaseURL, testDataDir string, liveM
 
 		// replace any mention of the live HTTP service by the mocked host
 		stringFixture := strings.ReplaceAll(string(fixture), liveServerBaseURL, mockServerBaseURL)
+		if isGh {
+			// Workaround for GitHub: replace github.com by the mock server's base URL
+			stringFixture = strings.ReplaceAll(stringFixture, "https://github.com", mockServerBaseURL)
+		}
 		// parse back the fixture file into a series of HTTP headers followed by response body
 		lines := strings.Split(stringFixture, "\n")
 		for idx, line := range lines {
diff --git a/services/migrations/github_test.go b/services/migrations/github_test.go
index a2134f8bf2..20a9282756 100644
--- a/services/migrations/github_test.go
+++ b/services/migrations/github_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 	"time"
 
+	"code.gitea.io/gitea/models/unittest"
 	base "code.gitea.io/gitea/modules/migration"
 
 	"github.com/stretchr/testify/assert"
@@ -18,11 +19,13 @@ import (
 
 func TestGitHubDownloadRepo(t *testing.T) {
 	GithubLimitRateRemaining = 3 // Wait at 3 remaining since we could have 3 CI in //
+
 	token := os.Getenv("GITHUB_READ_TOKEN")
-	if token == "" {
-		t.Skip("Skipping GitHub migration test because GITHUB_READ_TOKEN is empty")
-	}
-	downloader := NewGithubDownloaderV3(context.Background(), "https://github.com", "", "", token, "go-gitea", "test_repo")
+	fixturePath := "./testdata/github/full_download"
+	server := unittest.NewMockWebServer(t, "https://api.github.com", fixturePath, token != "")
+	defer server.Close()
+
+	downloader := NewGithubDownloaderV3(context.Background(), server.URL, "", "", token, "go-gitea", "test_repo")
 	err := downloader.RefreshRate()
 	require.NoError(t, err)
 
@@ -32,8 +35,8 @@ func TestGitHubDownloadRepo(t *testing.T) {
 		Name:          "test_repo",
 		Owner:         "go-gitea",
 		Description:   "Test repository for testing migration from github to gitea",
-		CloneURL:      "https://github.com/go-gitea/test_repo.git",
-		OriginalURL:   "https://github.com/go-gitea/test_repo",
+		CloneURL:      server.URL + "/go-gitea/test_repo.git",
+		OriginalURL:   server.URL + "/go-gitea/test_repo",
 		DefaultBranch: "master",
 	}, repo)
 
@@ -269,10 +272,10 @@ func TestGitHubDownloadRepo(t *testing.T) {
 					Description: "Improvements or additions to documentation",
 				},
 			},
-			PatchURL: "https://github.com/go-gitea/test_repo/pull/3.patch",
+			PatchURL: server.URL + "/go-gitea/test_repo/pull/3.patch",
 			Head: base.PullRequestBranch{
 				Ref:      "master",
-				CloneURL: "https://github.com/mrsdizzie/test_repo.git",
+				CloneURL: server.URL + "/mrsdizzie/test_repo.git",
 				SHA:      "076160cf0b039f13e5eff19619932d181269414b",
 				RepoName: "test_repo",
 
@@ -307,13 +310,13 @@ func TestGitHubDownloadRepo(t *testing.T) {
 					Description: "Something isn't working",
 				},
 			},
-			PatchURL: "https://github.com/go-gitea/test_repo/pull/4.patch",
+			PatchURL: server.URL + "/go-gitea/test_repo/pull/4.patch",
 			Head: base.PullRequestBranch{
 				Ref:       "test-branch",
 				SHA:       "2be9101c543658591222acbee3eb799edfc3853d",
 				RepoName:  "test_repo",
 				OwnerName: "mrsdizzie",
-				CloneURL:  "https://github.com/mrsdizzie/test_repo.git",
+				CloneURL:  server.URL + "/mrsdizzie/test_repo.git",
 			},
 			Base: base.PullRequestBranch{
 				Ref:       "master",
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frate_limit b/services/migrations/testdata/github/full_download/GET_%2Frate_limit
new file mode 100644
index 0000000000..74e43a0765
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frate_limit
@@ -0,0 +1,23 @@
+Cache-Control: no-cache
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+X-Ratelimit-Reset: 1730800941
+Access-Control-Allow-Origin: *
+Content-Type: application/json; charset=utf-8
+X-Oauth-Scopes: 
+X-Github-Media-Type: github.v3; format=json
+X-Ratelimit-Remaining: 4899
+X-Xss-Protection: 0
+Content-Security-Policy: default-src 'none'
+X-Accepted-Oauth-Scopes: 
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+X-Frame-Options: deny
+X-Content-Type-Options: nosniff
+Vary: Accept-Encoding, Accept, X-Requested-With
+X-Github-Request-Id: C7CC:3118FC:3F6234D:4038C5B:6729E6C0
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Used: 101
+X-Ratelimit-Resource: core
+
+{"resources":{"core":{"limit":5000,"used":101,"remaining":4899,"reset":1730800941},"search":{"limit":30,"used":0,"remaining":30,"reset":1730799356},"graphql":{"limit":5000,"used":162,"remaining":4838,"reset":1730801064},"integration_manifest":{"limit":5000,"used":0,"remaining":5000,"reset":1730802896},"source_import":{"limit":100,"used":0,"remaining":100,"reset":1730799356},"code_scanning_upload":{"limit":1000,"used":0,"remaining":1000,"reset":1730802896},"actions_runner_registration":{"limit":10000,"used":0,"remaining":10000,"reset":1730802896},"scim":{"limit":15000,"used":0,"remaining":15000,"reset":1730802896},"dependency_snapshots":{"limit":100,"used":0,"remaining":100,"reset":1730799356},"audit_log":{"limit":1750,"used":0,"remaining":1750,"reset":1730802896},"audit_log_streaming":{"limit":15,"used":0,"remaining":15,"reset":1730802896},"code_search":{"limit":10,"used":0,"remaining":10,"reset":1730799356}},"rate":{"limit":5000,"used":101,"remaining":4899,"reset":1730800941}}
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo
new file mode 100644
index 0000000000..261a153a32
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo
@@ -0,0 +1,25 @@
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Resource: core
+Access-Control-Allow-Origin: *
+X-Github-Request-Id: C7CC:3118FC:3F5EFD7:403585D:6729E6B3
+Cache-Control: private, max-age=60, s-maxage=60
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+X-Xss-Protection: 0
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+X-Github-Media-Type: github.v3; param=scarlet-witch-preview; format=json, github.mercy-preview; param=baptiste-preview.nebula-preview; format=json
+Etag: W/"bb1c9e0186e52dbd9f2c34aaf0827517384a15fd0cee7b81ad13784901db15c0"
+X-Oauth-Scopes: 
+X-Accepted-Oauth-Scopes: repo
+X-Ratelimit-Limit: 5000
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+X-Content-Type-Options: nosniff
+Content-Type: application/json; charset=utf-8
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+Last-Modified: Thu, 02 Mar 2023 14:02:26 GMT
+X-Ratelimit-Remaining: 4928
+X-Ratelimit-Reset: 1730800941
+X-Ratelimit-Used: 72
+X-Frame-Options: deny
+Content-Security-Policy: default-src 'none'
+
+{"id":220672974,"node_id":"MDEwOlJlcG9zaXRvcnkyMjA2NzI5NzQ=","name":"test_repo","full_name":"go-gitea/test_repo","private":false,"owner":{"login":"go-gitea","id":12724356,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEyNzI0MzU2","avatar_url":"https://avatars.githubusercontent.com/u/12724356?v=4","gravatar_id":"","url":"https://api.github.com/users/go-gitea","html_url":"https://github.com/go-gitea","followers_url":"https://api.github.com/users/go-gitea/followers","following_url":"https://api.github.com/users/go-gitea/following{/other_user}","gists_url":"https://api.github.com/users/go-gitea/gists{/gist_id}","starred_url":"https://api.github.com/users/go-gitea/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/go-gitea/subscriptions","organizations_url":"https://api.github.com/users/go-gitea/orgs","repos_url":"https://api.github.com/users/go-gitea/repos","events_url":"https://api.github.com/users/go-gitea/events{/privacy}","received_events_url":"https://api.github.com/users/go-gitea/received_events","type":"Organization","user_view_type":"public","site_admin":false},"html_url":"https://github.com/go-gitea/test_repo","description":"Test repository for testing migration from github to gitea","fork":false,"url":"https://api.github.com/repos/go-gitea/test_repo","forks_url":"https://api.github.com/repos/go-gitea/test_repo/forks","keys_url":"https://api.github.com/repos/go-gitea/test_repo/keys{/key_id}","collaborators_url":"https://api.github.com/repos/go-gitea/test_repo/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/go-gitea/test_repo/teams","hooks_url":"https://api.github.com/repos/go-gitea/test_repo/hooks","issue_events_url":"https://api.github.com/repos/go-gitea/test_repo/issues/events{/number}","events_url":"https://api.github.com/repos/go-gitea/test_repo/events","assignees_url":"https://api.github.com/repos/go-gitea/test_repo/assignees{/user}","branches_url":"https://api.github.com/repos/go-gitea/test_repo/branches{/branch}","tags_url":"https://api.github.com/repos/go-gitea/test_repo/tags","blobs_url":"https://api.github.com/repos/go-gitea/test_repo/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/go-gitea/test_repo/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/go-gitea/test_repo/git/refs{/sha}","trees_url":"https://api.github.com/repos/go-gitea/test_repo/git/trees{/sha}","statuses_url":"https://api.github.com/repos/go-gitea/test_repo/statuses/{sha}","languages_url":"https://api.github.com/repos/go-gitea/test_repo/languages","stargazers_url":"https://api.github.com/repos/go-gitea/test_repo/stargazers","contributors_url":"https://api.github.com/repos/go-gitea/test_repo/contributors","subscribers_url":"https://api.github.com/repos/go-gitea/test_repo/subscribers","subscription_url":"https://api.github.com/repos/go-gitea/test_repo/subscription","commits_url":"https://api.github.com/repos/go-gitea/test_repo/commits{/sha}","git_commits_url":"https://api.github.com/repos/go-gitea/test_repo/git/commits{/sha}","comments_url":"https://api.github.com/repos/go-gitea/test_repo/comments{/number}","issue_comment_url":"https://api.github.com/repos/go-gitea/test_repo/issues/comments{/number}","contents_url":"https://api.github.com/repos/go-gitea/test_repo/contents/{+path}","compare_url":"https://api.github.com/repos/go-gitea/test_repo/compare/{base}...{head}","merges_url":"https://api.github.com/repos/go-gitea/test_repo/merges","archive_url":"https://api.github.com/repos/go-gitea/test_repo/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/go-gitea/test_repo/downloads","issues_url":"https://api.github.com/repos/go-gitea/test_repo/issues{/number}","pulls_url":"https://api.github.com/repos/go-gitea/test_repo/pulls{/number}","milestones_url":"https://api.github.com/repos/go-gitea/test_repo/milestones{/number}","notifications_url":"https://api.github.com/repos/go-gitea/test_repo/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/go-gitea/test_repo/labels{/name}","releases_url":"https://api.github.com/repos/go-gitea/test_repo/releases{/id}","deployments_url":"https://api.github.com/repos/go-gitea/test_repo/deployments","created_at":"2019-11-09T16:49:20Z","updated_at":"2023-03-02T14:02:26Z","pushed_at":"2019-11-12T21:54:19Z","git_url":"git://github.com/go-gitea/test_repo.git","ssh_url":"git@github.com:go-gitea/test_repo.git","clone_url":"https://github.com/go-gitea/test_repo.git","svn_url":"https://github.com/go-gitea/test_repo","homepage":null,"size":1,"stargazers_count":3,"watchers_count":3,"language":null,"has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"has_discussions":false,"forks_count":6,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":2,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"allow_forking":true,"is_template":false,"web_commit_signoff_required":false,"topics":["gitea"],"visibility":"public","forks":6,"open_issues":2,"watchers":3,"default_branch":"master","permissions":{"admin":false,"maintain":false,"push":false,"triage":false,"pull":true},"temp_clone_token":"","custom_properties":{},"organization":{"login":"go-gitea","id":12724356,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEyNzI0MzU2","avatar_url":"https://avatars.githubusercontent.com/u/12724356?v=4","gravatar_id":"","url":"https://api.github.com/users/go-gitea","html_url":"https://github.com/go-gitea","followers_url":"https://api.github.com/users/go-gitea/followers","following_url":"https://api.github.com/users/go-gitea/following{/other_user}","gists_url":"https://api.github.com/users/go-gitea/gists{/gist_id}","starred_url":"https://api.github.com/users/go-gitea/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/go-gitea/subscriptions","organizations_url":"https://api.github.com/users/go-gitea/orgs","repos_url":"https://api.github.com/users/go-gitea/repos","events_url":"https://api.github.com/users/go-gitea/events{/privacy}","received_events_url":"https://api.github.com/users/go-gitea/received_events","type":"Organization","user_view_type":"public","site_admin":false},"network_count":6,"subscribers_count":6}
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F1%2Freactions%3Fpage=1&per_page=2 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F1%2Freactions%3Fpage=1&per_page=2
new file mode 100644
index 0000000000..f1f9afee15
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F1%2Freactions%3Fpage=1&per_page=2
@@ -0,0 +1,24 @@
+Cache-Control: private, max-age=60, s-maxage=60
+X-Ratelimit-Remaining: 4923
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+X-Accepted-Oauth-Scopes: repo
+X-Github-Media-Type: github.v3; param=squirrel-girl-preview
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Reset: 1730800941
+X-Ratelimit-Resource: core
+Content-Security-Policy: default-src 'none'
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Ratelimit-Used: 77
+Access-Control-Allow-Origin: *
+X-Xss-Protection: 0
+X-Github-Request-Id: C7CC:3118FC:3F5F8DA:403618E:6729E6B6
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+Content-Type: application/json; charset=utf-8
+Etag: W/"07b6d56c5fdc728f96fceef3d45d26b4ebac96ef5138156668055f7d496c9a75"
+X-Oauth-Scopes: 
+X-Ratelimit-Limit: 5000
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+X-Frame-Options: deny
+X-Content-Type-Options: nosniff
+
+[{"id":55441655,"node_id":"MDEzOklzc3VlUmVhY3Rpb241NTQ0MTY1NQ==","user":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?u=7c1ba931adbdd9bab5be1a41d244425d463568cd&v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"content":"+1","created_at":"2019-11-12T20:22:13Z"}]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F1%2Freactions%3Fpage=2&per_page=2 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F1%2Freactions%3Fpage=2&per_page=2
new file mode 100644
index 0000000000..fe993d3c3b
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F1%2Freactions%3Fpage=2&per_page=2
@@ -0,0 +1,26 @@
+Etag: "f87b0fd59e59458a9a808311324b873c6baf3fde861298a99de9986270dd4d79"
+X-Github-Media-Type: github.v3; param=squirrel-girl-preview
+X-Github-Api-Version-Selected: 2022-11-28
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+X-Content-Type-Options: nosniff
+Content-Type: application/json; charset=utf-8
+Content-Length: 2
+Cache-Control: private, max-age=60, s-maxage=60
+Link: ; rel="prev", ; rel="last", ; rel="first"
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Remaining: 4922
+X-Ratelimit-Reset: 1730800941
+X-Xss-Protection: 0
+X-Github-Request-Id: C7CC:3118FC:3F5FA7C:403633C:6729E6B6
+X-Oauth-Scopes: 
+X-Ratelimit-Used: 78
+X-Frame-Options: deny
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Accepted-Oauth-Scopes: repo
+X-Ratelimit-Resource: core
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+Access-Control-Allow-Origin: *
+Content-Security-Policy: default-src 'none'
+
+[]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Fcomments%3Fdirection=asc&per_page=100&sort=created b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Fcomments%3Fdirection=asc&per_page=100&sort=created
new file mode 100644
index 0000000000..61867c5ae6
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Fcomments%3Fdirection=asc&per_page=100&sort=created
@@ -0,0 +1,24 @@
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Github-Media-Type: github.v3; param=squirrel-girl-preview
+X-Ratelimit-Remaining: 4917
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+Content-Type: application/json; charset=utf-8
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Reset: 1730800941
+X-Ratelimit-Used: 83
+X-Content-Type-Options: nosniff
+X-Github-Request-Id: C7CC:3118FC:3F60409:4036CD0:6729E6B8
+Etag: W/"5f4d715f2578719997e324fe7b29e7eeeec048288237b44d4f320666514813ad"
+X-Accepted-Oauth-Scopes: 
+X-Frame-Options: deny
+X-Xss-Protection: 0
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+X-Ratelimit-Resource: core
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+Access-Control-Allow-Origin: *
+Content-Security-Policy: default-src 'none'
+Cache-Control: private, max-age=60, s-maxage=60
+X-Oauth-Scopes: 
+
+[{"url":"https://api.github.com/repos/go-gitea/test_repo/issues/comments/553111966","html_url":"https://github.com/go-gitea/test_repo/issues/2#issuecomment-553111966","issue_url":"https://api.github.com/repos/go-gitea/test_repo/issues/2","id":553111966,"node_id":"MDEyOklzc3VlQ29tbWVudDU1MzExMTk2Ng==","user":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"created_at":"2019-11-12T21:00:13Z","updated_at":"2019-11-12T21:00:13Z","author_association":"MEMBER","body":"This is a comment","reactions":{"url":"https://api.github.com/repos/go-gitea/test_repo/issues/comments/553111966/reactions","total_count":1,"+1":1,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":0,"rocket":0,"eyes":0},"performed_via_github_app":null},{"url":"https://api.github.com/repos/go-gitea/test_repo/issues/comments/553138856","html_url":"https://github.com/go-gitea/test_repo/issues/2#issuecomment-553138856","issue_url":"https://api.github.com/repos/go-gitea/test_repo/issues/2","id":553138856,"node_id":"MDEyOklzc3VlQ29tbWVudDU1MzEzODg1Ng==","user":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"created_at":"2019-11-12T22:07:14Z","updated_at":"2019-11-12T22:07:14Z","author_association":"MEMBER","body":"A second comment","reactions":{"url":"https://api.github.com/repos/go-gitea/test_repo/issues/comments/553138856/reactions","total_count":0,"+1":0,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":0,"rocket":0,"eyes":0},"performed_via_github_app":null}]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Freactions%3Fpage=1&per_page=2 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Freactions%3Fpage=1&per_page=2
new file mode 100644
index 0000000000..bb9dea395c
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Freactions%3Fpage=1&per_page=2
@@ -0,0 +1,25 @@
+X-Ratelimit-Resource: core
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+X-Xss-Protection: 0
+X-Accepted-Oauth-Scopes: repo
+Link: ; rel="next", ; rel="last"
+X-Ratelimit-Remaining: 4921
+X-Ratelimit-Reset: 1730800941
+X-Github-Request-Id: C7CC:3118FC:3F5FC1A:40364D4:6729E6B6
+Content-Security-Policy: default-src 'none'
+X-Oauth-Scopes: 
+X-Ratelimit-Used: 79
+X-Frame-Options: deny
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+X-Github-Api-Version-Selected: 2022-11-28
+Content-Type: application/json; charset=utf-8
+Etag: W/"27408cb5dd95878d6267de226341c84fd1d2c49695867baecf930579608e16a5"
+X-Github-Media-Type: github.v3; param=squirrel-girl-preview
+X-Content-Type-Options: nosniff
+Cache-Control: private, max-age=60, s-maxage=60
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Ratelimit-Limit: 5000
+Access-Control-Allow-Origin: *
+
+[{"id":55445108,"node_id":"MDEzOklzc3VlUmVhY3Rpb241NTQ0NTEwOA==","user":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?u=7c1ba931adbdd9bab5be1a41d244425d463568cd&v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"content":"heart","created_at":"2019-11-12T21:02:05Z"},{"id":55445150,"node_id":"MDEzOklzc3VlUmVhY3Rpb241NTQ0NTE1MA==","user":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?u=7c1ba931adbdd9bab5be1a41d244425d463568cd&v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"content":"laugh","created_at":"2019-11-12T21:02:35Z"}]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Freactions%3Fpage=2&per_page=2 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Freactions%3Fpage=2&per_page=2
new file mode 100644
index 0000000000..e59fc93546
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Freactions%3Fpage=2&per_page=2
@@ -0,0 +1,25 @@
+X-Ratelimit-Reset: 1730800941
+X-Ratelimit-Resource: core
+X-Frame-Options: deny
+Etag: W/"cb64a4e91ab70a1ab9fe2f77cdbf7452120169f4c2cce397014efe94cc0d60bb"
+Link: ; rel="prev", ; rel="next", ; rel="last", ; rel="first"
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Oauth-Scopes: 
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+X-Content-Type-Options: nosniff
+Content-Security-Policy: default-src 'none'
+Content-Type: application/json; charset=utf-8
+Cache-Control: private, max-age=60, s-maxage=60
+X-Xss-Protection: 0
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+X-Github-Request-Id: C7CC:3118FC:3F5FDBD:4036670:6729E6B7
+X-Github-Media-Type: github.v3; param=squirrel-girl-preview
+Access-Control-Allow-Origin: *
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Remaining: 4920
+X-Ratelimit-Used: 80
+X-Accepted-Oauth-Scopes: repo
+
+[{"id":55445169,"node_id":"MDEzOklzc3VlUmVhY3Rpb241NTQ0NTE2OQ==","user":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?u=7c1ba931adbdd9bab5be1a41d244425d463568cd&v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"content":"-1","created_at":"2019-11-12T21:02:47Z"},{"id":55445177,"node_id":"MDEzOklzc3VlUmVhY3Rpb241NTQ0NTE3Nw==","user":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?u=7c1ba931adbdd9bab5be1a41d244425d463568cd&v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"content":"confused","created_at":"2019-11-12T21:02:52Z"}]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Freactions%3Fpage=3&per_page=2 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Freactions%3Fpage=3&per_page=2
new file mode 100644
index 0000000000..57f03c8a64
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Freactions%3Fpage=3&per_page=2
@@ -0,0 +1,25 @@
+Etag: W/"17b0dca978a885d2234548248a7d5c22264c161b73e28c5cd144e33a24dd9ed4"
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Reset: 1730800941
+X-Ratelimit-Used: 81
+Content-Security-Policy: default-src 'none'
+Content-Type: application/json; charset=utf-8
+X-Oauth-Scopes: 
+Link: ; rel="prev", ; rel="first"
+X-Ratelimit-Limit: 5000
+X-Frame-Options: deny
+X-Content-Type-Options: nosniff
+X-Accepted-Oauth-Scopes: repo
+X-Github-Media-Type: github.v3; param=squirrel-girl-preview
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+X-Xss-Protection: 0
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+Cache-Control: private, max-age=60, s-maxage=60
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Ratelimit-Remaining: 4919
+X-Ratelimit-Resource: core
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+X-Github-Request-Id: C7CC:3118FC:3F5FF70:403681F:6729E6B7
+
+[{"id":55445188,"node_id":"MDEzOklzc3VlUmVhY3Rpb241NTQ0NTE4OA==","user":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?u=7c1ba931adbdd9bab5be1a41d244425d463568cd&v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"content":"hooray","created_at":"2019-11-12T21:02:58Z"},{"id":55445441,"node_id":"MDEzOklzc3VlUmVhY3Rpb241NTQ0NTQ0MQ==","user":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?u=7c1ba931adbdd9bab5be1a41d244425d463568cd&v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"content":"+1","created_at":"2019-11-12T21:06:04Z"}]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Freactions%3Fpage=4&per_page=2 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Freactions%3Fpage=4&per_page=2
new file mode 100644
index 0000000000..f14d4ba904
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F2%2Freactions%3Fpage=4&per_page=2
@@ -0,0 +1,26 @@
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+X-Oauth-Scopes: 
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Remaining: 4918
+X-Ratelimit-Reset: 1730800941
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+X-Content-Type-Options: nosniff
+X-Github-Request-Id: C7CC:3118FC:3F60229:4036AE8:6729E6B8
+Etag: "f87b0fd59e59458a9a808311324b873c6baf3fde861298a99de9986270dd4d79"
+Link: ; rel="prev", ; rel="last", ; rel="first"
+X-Accepted-Oauth-Scopes: repo
+X-Github-Media-Type: github.v3; param=squirrel-girl-preview
+X-Ratelimit-Used: 82
+X-Frame-Options: deny
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+Cache-Control: private, max-age=60, s-maxage=60
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Resource: core
+Access-Control-Allow-Origin: *
+X-Xss-Protection: 0
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+Content-Type: application/json; charset=utf-8
+Content-Length: 2
+Content-Security-Policy: default-src 'none'
+
+[]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F3%2Freactions%3Fpage=1&per_page=2 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F3%2Freactions%3Fpage=1&per_page=2
new file mode 100644
index 0000000000..a7a105b3e7
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F3%2Freactions%3Fpage=1&per_page=2
@@ -0,0 +1,25 @@
+X-Ratelimit-Used: 88
+X-Ratelimit-Resource: core
+X-Content-Type-Options: nosniff
+Content-Security-Policy: default-src 'none'
+X-Github-Request-Id: C7CC:3118FC:3F60B4F:403741E:6729E6BA
+Content-Type: application/json; charset=utf-8
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Ratelimit-Reset: 1730800941
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+Cache-Control: private, max-age=60, s-maxage=60
+X-Github-Media-Type: github.v3; param=squirrel-girl-preview
+Access-Control-Allow-Origin: *
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+X-Frame-Options: deny
+X-Xss-Protection: 0
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+Etag: "f87b0fd59e59458a9a808311324b873c6baf3fde861298a99de9986270dd4d79"
+X-Oauth-Scopes: 
+X-Accepted-Oauth-Scopes: repo
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Remaining: 4912
+Content-Length: 2
+
+[]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F4%2Freactions%3Fpage=1&per_page=2 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F4%2Freactions%3Fpage=1&per_page=2
new file mode 100644
index 0000000000..f5398c3a9f
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F4%2Freactions%3Fpage=1&per_page=2
@@ -0,0 +1,24 @@
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+Etag: W/"dc9d10e1714eadc1507466c7d11d2dd84ae539a378835f8763b9948da44b22e1"
+X-Accepted-Oauth-Scopes: repo
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+Access-Control-Allow-Origin: *
+X-Frame-Options: deny
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Reset: 1730800941
+Content-Type: application/json; charset=utf-8
+X-Github-Media-Type: github.v3; param=squirrel-girl-preview
+X-Ratelimit-Remaining: 4911
+X-Ratelimit-Used: 89
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+X-Content-Type-Options: nosniff
+X-Xss-Protection: 0
+Content-Security-Policy: default-src 'none'
+X-Github-Request-Id: C7CC:3118FC:3F60D0F:40375F2:6729E6BB
+Cache-Control: private, max-age=60, s-maxage=60
+X-Oauth-Scopes: 
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Resource: core
+
+[{"id":59496724,"node_id":"MDEzOklzc3VlUmVhY3Rpb241OTQ5NjcyNA==","user":{"login":"lunny","id":81045,"node_id":"MDQ6VXNlcjgxMDQ1","avatar_url":"https://avatars.githubusercontent.com/u/81045?u=99b64f0ca6ef63643c7583ab87dd31c52d28e673&v=4","gravatar_id":"","url":"https://api.github.com/users/lunny","html_url":"https://github.com/lunny","followers_url":"https://api.github.com/users/lunny/followers","following_url":"https://api.github.com/users/lunny/following{/other_user}","gists_url":"https://api.github.com/users/lunny/gists{/gist_id}","starred_url":"https://api.github.com/users/lunny/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lunny/subscriptions","organizations_url":"https://api.github.com/users/lunny/orgs","repos_url":"https://api.github.com/users/lunny/repos","events_url":"https://api.github.com/users/lunny/events{/privacy}","received_events_url":"https://api.github.com/users/lunny/received_events","type":"User","user_view_type":"public","site_admin":false},"content":"heart","created_at":"2020-01-10T08:31:30Z"},{"id":59496731,"node_id":"MDEzOklzc3VlUmVhY3Rpb241OTQ5NjczMQ==","user":{"login":"lunny","id":81045,"node_id":"MDQ6VXNlcjgxMDQ1","avatar_url":"https://avatars.githubusercontent.com/u/81045?u=99b64f0ca6ef63643c7583ab87dd31c52d28e673&v=4","gravatar_id":"","url":"https://api.github.com/users/lunny","html_url":"https://github.com/lunny","followers_url":"https://api.github.com/users/lunny/followers","following_url":"https://api.github.com/users/lunny/following{/other_user}","gists_url":"https://api.github.com/users/lunny/gists{/gist_id}","starred_url":"https://api.github.com/users/lunny/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lunny/subscriptions","organizations_url":"https://api.github.com/users/lunny/orgs","repos_url":"https://api.github.com/users/lunny/repos","events_url":"https://api.github.com/users/lunny/events{/privacy}","received_events_url":"https://api.github.com/users/lunny/received_events","type":"User","user_view_type":"public","site_admin":false},"content":"+1","created_at":"2020-01-10T08:31:39Z"}]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F4%2Freactions%3Fpage=2&per_page=2 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F4%2Freactions%3Fpage=2&per_page=2
new file mode 100644
index 0000000000..79b506ea55
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2F4%2Freactions%3Fpage=2&per_page=2
@@ -0,0 +1,26 @@
+X-Oauth-Scopes: 
+X-Accepted-Oauth-Scopes: repo
+X-Ratelimit-Limit: 5000
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+Content-Length: 2
+Cache-Control: private, max-age=60, s-maxage=60
+Etag: "f87b0fd59e59458a9a808311324b873c6baf3fde861298a99de9986270dd4d79"
+X-Content-Type-Options: nosniff
+Content-Security-Policy: default-src 'none'
+X-Ratelimit-Remaining: 4910
+X-Ratelimit-Reset: 1730800941
+X-Frame-Options: deny
+Content-Type: application/json; charset=utf-8
+Link: ; rel="prev", ; rel="last", ; rel="first"
+X-Xss-Protection: 0
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+X-Github-Request-Id: C7CC:3118FC:3F60EE6:40377B6:6729E6BB
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Ratelimit-Used: 90
+X-Ratelimit-Resource: core
+X-Github-Media-Type: github.v3; param=squirrel-girl-preview
+X-Github-Api-Version-Selected: 2022-11-28
+Access-Control-Allow-Origin: *
+
+[]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2Fcomments%2F553111966%2Freactions%3Fpage=1&per_page=100 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2Fcomments%2F553111966%2Freactions%3Fpage=1&per_page=100
new file mode 100644
index 0000000000..b55068a718
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2Fcomments%2F553111966%2Freactions%3Fpage=1&per_page=100
@@ -0,0 +1,24 @@
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+X-Accepted-Oauth-Scopes: 
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Used: 84
+X-Ratelimit-Resource: core
+X-Content-Type-Options: nosniff
+Cache-Control: private, max-age=60, s-maxage=60
+Etag: W/"d2410fc0792a61666c06ed757aa53a273165d4f14f7d5259095b7a4f3a959121"
+X-Xss-Protection: 0
+Content-Security-Policy: default-src 'none'
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Oauth-Scopes: 
+X-Github-Media-Type: github.v3; param=squirrel-girl-preview
+X-Ratelimit-Remaining: 4916
+X-Frame-Options: deny
+X-Github-Request-Id: C7CC:3118FC:3F60583:4036E51:6729E6B9
+Content-Type: application/json; charset=utf-8
+X-Ratelimit-Reset: 1730800941
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+Access-Control-Allow-Origin: *
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+
+[{"id":55446208,"node_id":"MDIwOklzc3VlQ29tbWVudFJlYWN0aW9uNTU0NDYyMDg=","user":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"content":"+1","created_at":"2019-11-12T21:13:22Z"}]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2Fcomments%2F553111966%2Freactions%3Fpage=2&per_page=100 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2Fcomments%2F553111966%2Freactions%3Fpage=2&per_page=100
new file mode 100644
index 0000000000..1e46f438e5
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2Fcomments%2F553111966%2Freactions%3Fpage=2&per_page=100
@@ -0,0 +1,26 @@
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Github-Media-Type: github.v3; param=squirrel-girl-preview
+Cache-Control: private, max-age=60, s-maxage=60
+X-Ratelimit-Used: 85
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+X-Github-Request-Id: C7CC:3118FC:3F606F2:4036FB5:6729E6B9
+X-Xss-Protection: 0
+Content-Type: application/json; charset=utf-8
+Etag: "f87b0fd59e59458a9a808311324b873c6baf3fde861298a99de9986270dd4d79"
+X-Oauth-Scopes: 
+Link: ; rel="prev", ; rel="last", ; rel="first"
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Resource: core
+X-Frame-Options: deny
+Content-Length: 2
+X-Accepted-Oauth-Scopes: 
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Remaining: 4915
+X-Ratelimit-Reset: 1730800941
+Access-Control-Allow-Origin: *
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+X-Content-Type-Options: nosniff
+Content-Security-Policy: default-src 'none'
+
+[]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2Fcomments%2F553138856%2Freactions%3Fpage=1&per_page=100 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2Fcomments%2F553138856%2Freactions%3Fpage=1&per_page=100
new file mode 100644
index 0000000000..ac446b3586
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%2Fcomments%2F553138856%2Freactions%3Fpage=1&per_page=100
@@ -0,0 +1,25 @@
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+X-Github-Media-Type: github.v3; param=squirrel-girl-preview
+X-Ratelimit-Remaining: 4914
+X-Frame-Options: deny
+X-Xss-Protection: 0
+X-Ratelimit-Reset: 1730800941
+X-Ratelimit-Resource: core
+X-Content-Type-Options: nosniff
+Content-Type: application/json; charset=utf-8
+Etag: "f87b0fd59e59458a9a808311324b873c6baf3fde861298a99de9986270dd4d79"
+X-Accepted-Oauth-Scopes: 
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Limit: 5000
+Content-Length: 2
+Access-Control-Allow-Origin: *
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+Content-Security-Policy: default-src 'none'
+X-Github-Request-Id: C7CC:3118FC:3F60858:4037116:6729E6B9
+Cache-Control: private, max-age=60, s-maxage=60
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Oauth-Scopes: 
+X-Ratelimit-Used: 86
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+
+[]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%3Fdirection=asc&page=1&per_page=2&sort=created&state=all b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%3Fdirection=asc&page=1&per_page=2&sort=created&state=all
new file mode 100644
index 0000000000..80d2f90dbc
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fissues%3Fdirection=asc&page=1&per_page=2&sort=created&state=all
@@ -0,0 +1,25 @@
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+Content-Type: application/json; charset=utf-8
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Resource: core
+Access-Control-Allow-Origin: *
+X-Frame-Options: deny
+X-Xss-Protection: 0
+Cache-Control: private, max-age=60, s-maxage=60
+Etag: W/"40580a89c26a3f7793cea4e59315e52e1106be32ded27b3ab822b7d7f74a1ecf"
+X-Github-Media-Type: github.v3; param=squirrel-girl-preview
+Link: ; rel="next", ; rel="last"
+X-Ratelimit-Reset: 1730800941
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+X-Content-Type-Options: nosniff
+X-Oauth-Scopes: 
+X-Accepted-Oauth-Scopes: repo
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Remaining: 4924
+X-Ratelimit-Used: 76
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+Content-Security-Policy: default-src 'none'
+X-Github-Request-Id: C7CC:3118FC:3F5F5B9:4035E6C:6729E6B5
+
+[{"url":"https://api.github.com/repos/go-gitea/test_repo/issues/1","repository_url":"https://api.github.com/repos/go-gitea/test_repo","labels_url":"https://api.github.com/repos/go-gitea/test_repo/issues/1/labels{/name}","comments_url":"https://api.github.com/repos/go-gitea/test_repo/issues/1/comments","events_url":"https://api.github.com/repos/go-gitea/test_repo/issues/1/events","html_url":"https://github.com/go-gitea/test_repo/issues/1","id":520479843,"node_id":"MDU6SXNzdWU1MjA0Nzk4NDM=","number":1,"title":"Please add an animated gif icon to the merge button","user":{"login":"guillep2k","id":18600385,"node_id":"MDQ6VXNlcjE4NjAwMzg1","avatar_url":"https://avatars.githubusercontent.com/u/18600385?v=4","gravatar_id":"","url":"https://api.github.com/users/guillep2k","html_url":"https://github.com/guillep2k","followers_url":"https://api.github.com/users/guillep2k/followers","following_url":"https://api.github.com/users/guillep2k/following{/other_user}","gists_url":"https://api.github.com/users/guillep2k/gists{/gist_id}","starred_url":"https://api.github.com/users/guillep2k/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/guillep2k/subscriptions","organizations_url":"https://api.github.com/users/guillep2k/orgs","repos_url":"https://api.github.com/users/guillep2k/repos","events_url":"https://api.github.com/users/guillep2k/events{/privacy}","received_events_url":"https://api.github.com/users/guillep2k/received_events","type":"User","user_view_type":"public","site_admin":false},"labels":[{"id":1667254252,"node_id":"MDU6TGFiZWwxNjY3MjU0MjUy","url":"https://api.github.com/repos/go-gitea/test_repo/labels/bug","name":"bug","color":"d73a4a","default":true,"description":"Something isn't working"},{"id":1667254261,"node_id":"MDU6TGFiZWwxNjY3MjU0MjYx","url":"https://api.github.com/repos/go-gitea/test_repo/labels/good%20first%20issue","name":"good first issue","color":"7057ff","default":true,"description":"Good for newcomers"}],"state":"closed","locked":false,"assignee":null,"assignees":[],"milestone":{"url":"https://api.github.com/repos/go-gitea/test_repo/milestones/1","html_url":"https://github.com/go-gitea/test_repo/milestone/1","labels_url":"https://api.github.com/repos/go-gitea/test_repo/milestones/1/labels","id":4839941,"node_id":"MDk6TWlsZXN0b25lNDgzOTk0MQ==","number":1,"title":"1.0.0","description":"Milestone 1.0.0","creator":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"open_issues":1,"closed_issues":1,"state":"closed","created_at":"2019-11-12T19:37:08Z","updated_at":"2019-11-12T21:56:17Z","due_on":"2019-11-11T08:00:00Z","closed_at":"2019-11-12T19:45:49Z"},"comments":0,"created_at":"2019-11-09T17:00:29Z","updated_at":"2019-11-12T20:29:53Z","closed_at":"2019-11-12T20:22:22Z","author_association":"MEMBER","active_lock_reason":null,"body":"I just want the merge button to hurt my eyes a little. 😝 ","closed_by":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"reactions":{"url":"https://api.github.com/repos/go-gitea/test_repo/issues/1/reactions","total_count":1,"+1":1,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":0,"rocket":0,"eyes":0},"timeline_url":"https://api.github.com/repos/go-gitea/test_repo/issues/1/timeline","performed_via_github_app":null,"state_reason":"completed"},{"url":"https://api.github.com/repos/go-gitea/test_repo/issues/2","repository_url":"https://api.github.com/repos/go-gitea/test_repo","labels_url":"https://api.github.com/repos/go-gitea/test_repo/issues/2/labels{/name}","comments_url":"https://api.github.com/repos/go-gitea/test_repo/issues/2/comments","events_url":"https://api.github.com/repos/go-gitea/test_repo/issues/2/events","html_url":"https://github.com/go-gitea/test_repo/issues/2","id":521799485,"node_id":"MDU6SXNzdWU1MjE3OTk0ODU=","number":2,"title":"Test issue","user":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"labels":[{"id":1667254257,"node_id":"MDU6TGFiZWwxNjY3MjU0MjU3","url":"https://api.github.com/repos/go-gitea/test_repo/labels/duplicate","name":"duplicate","color":"cfd3d7","default":true,"description":"This issue or pull request already exists"}],"state":"closed","locked":false,"assignee":null,"assignees":[],"milestone":{"url":"https://api.github.com/repos/go-gitea/test_repo/milestones/2","html_url":"https://github.com/go-gitea/test_repo/milestone/2","labels_url":"https://api.github.com/repos/go-gitea/test_repo/milestones/2/labels","id":4839942,"node_id":"MDk6TWlsZXN0b25lNDgzOTk0Mg==","number":2,"title":"1.1.0","description":"Milestone 1.1.0","creator":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"open_issues":0,"closed_issues":2,"state":"closed","created_at":"2019-11-12T19:37:25Z","updated_at":"2019-11-12T21:39:27Z","due_on":"2019-11-12T08:00:00Z","closed_at":"2019-11-12T19:45:46Z"},"comments":2,"created_at":"2019-11-12T21:00:06Z","updated_at":"2019-11-12T22:07:14Z","closed_at":"2019-11-12T21:01:31Z","author_association":"MEMBER","active_lock_reason":null,"body":"This is test issue 2, do not touch!","closed_by":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"reactions":{"url":"https://api.github.com/repos/go-gitea/test_repo/issues/2/reactions","total_count":6,"+1":1,"-1":1,"laugh":1,"hooray":1,"confused":1,"heart":1,"rocket":0,"eyes":0},"timeline_url":"https://api.github.com/repos/go-gitea/test_repo/issues/2/timeline","performed_via_github_app":null,"state_reason":"completed"}]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Flabels%3Fpage=1&per_page=100 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Flabels%3Fpage=1&per_page=100
new file mode 100644
index 0000000000..f1d483aacb
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Flabels%3Fpage=1&per_page=100
@@ -0,0 +1,24 @@
+X-Ratelimit-Reset: 1730800941
+Access-Control-Allow-Origin: *
+Content-Security-Policy: default-src 'none'
+X-Github-Api-Version-Selected: 2022-11-28
+Etag: W/"01cc307b238564f2a086999fed53e0d5c880b8ec1d8d2256d99188ff47ff0ea0"
+X-Github-Media-Type: github.v3; format=json
+X-Ratelimit-Used: 74
+X-Ratelimit-Resource: core
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+X-Ratelimit-Limit: 5000
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+X-Xss-Protection: 0
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+Cache-Control: private, max-age=60, s-maxage=60
+X-Oauth-Scopes: 
+X-Accepted-Oauth-Scopes: repo
+X-Ratelimit-Remaining: 4926
+X-Frame-Options: deny
+X-Content-Type-Options: nosniff
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+Content-Type: application/json; charset=utf-8
+X-Github-Request-Id: C7CC:3118FC:3F5F29C:4035B65:6729E6B4
+
+[{"id":1667254252,"node_id":"MDU6TGFiZWwxNjY3MjU0MjUy","url":"https://api.github.com/repos/go-gitea/test_repo/labels/bug","name":"bug","color":"d73a4a","default":true,"description":"Something isn't working"},{"id":1667254254,"node_id":"MDU6TGFiZWwxNjY3MjU0MjU0","url":"https://api.github.com/repos/go-gitea/test_repo/labels/documentation","name":"documentation","color":"0075ca","default":true,"description":"Improvements or additions to documentation"},{"id":1667254257,"node_id":"MDU6TGFiZWwxNjY3MjU0MjU3","url":"https://api.github.com/repos/go-gitea/test_repo/labels/duplicate","name":"duplicate","color":"cfd3d7","default":true,"description":"This issue or pull request already exists"},{"id":1667254260,"node_id":"MDU6TGFiZWwxNjY3MjU0MjYw","url":"https://api.github.com/repos/go-gitea/test_repo/labels/enhancement","name":"enhancement","color":"a2eeef","default":true,"description":"New feature or request"},{"id":1667254261,"node_id":"MDU6TGFiZWwxNjY3MjU0MjYx","url":"https://api.github.com/repos/go-gitea/test_repo/labels/good%20first%20issue","name":"good first issue","color":"7057ff","default":true,"description":"Good for newcomers"},{"id":1667254265,"node_id":"MDU6TGFiZWwxNjY3MjU0MjY1","url":"https://api.github.com/repos/go-gitea/test_repo/labels/help%20wanted","name":"help wanted","color":"008672","default":true,"description":"Extra attention is needed"},{"id":1667254269,"node_id":"MDU6TGFiZWwxNjY3MjU0MjY5","url":"https://api.github.com/repos/go-gitea/test_repo/labels/invalid","name":"invalid","color":"e4e669","default":true,"description":"This doesn't seem right"},{"id":1667254273,"node_id":"MDU6TGFiZWwxNjY3MjU0Mjcz","url":"https://api.github.com/repos/go-gitea/test_repo/labels/question","name":"question","color":"d876e3","default":true,"description":"Further information is requested"},{"id":1667254276,"node_id":"MDU6TGFiZWwxNjY3MjU0Mjc2","url":"https://api.github.com/repos/go-gitea/test_repo/labels/wontfix","name":"wontfix","color":"ffffff","default":true,"description":"This will not be worked on"}]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fmilestones%3Fpage=1&per_page=100&state=all b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fmilestones%3Fpage=1&per_page=100&state=all
new file mode 100644
index 0000000000..50b90ad4ab
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fmilestones%3Fpage=1&per_page=100&state=all
@@ -0,0 +1,24 @@
+X-Ratelimit-Remaining: 4927
+X-Ratelimit-Used: 73
+X-Frame-Options: deny
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Oauth-Scopes: 
+X-Accepted-Oauth-Scopes: repo
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+Access-Control-Allow-Origin: *
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+X-Content-Type-Options: nosniff
+Content-Type: application/json; charset=utf-8
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Resource: core
+X-Github-Request-Id: C7CC:3118FC:3F5F16C:40359F7:6729E6B4
+X-Github-Media-Type: github.v3; format=json
+X-Ratelimit-Reset: 1730800941
+Content-Security-Policy: default-src 'none'
+X-Github-Api-Version-Selected: 2022-11-28
+X-Xss-Protection: 0
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+Cache-Control: private, max-age=60, s-maxage=60
+Etag: W/"d6d673f0622636217ee3df16cdabbfea8402d3e8d1abbabe007108267b01f3e9"
+
+[{"url":"https://api.github.com/repos/go-gitea/test_repo/milestones/1","html_url":"https://github.com/go-gitea/test_repo/milestone/1","labels_url":"https://api.github.com/repos/go-gitea/test_repo/milestones/1/labels","id":4839941,"node_id":"MDk6TWlsZXN0b25lNDgzOTk0MQ==","number":1,"title":"1.0.0","description":"Milestone 1.0.0","creator":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"open_issues":1,"closed_issues":1,"state":"closed","created_at":"2019-11-12T19:37:08Z","updated_at":"2019-11-12T21:56:17Z","due_on":"2019-11-11T08:00:00Z","closed_at":"2019-11-12T19:45:49Z"},{"url":"https://api.github.com/repos/go-gitea/test_repo/milestones/2","html_url":"https://github.com/go-gitea/test_repo/milestone/2","labels_url":"https://api.github.com/repos/go-gitea/test_repo/milestones/2/labels","id":4839942,"node_id":"MDk6TWlsZXN0b25lNDgzOTk0Mg==","number":2,"title":"1.1.0","description":"Milestone 1.1.0","creator":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"open_issues":0,"closed_issues":2,"state":"closed","created_at":"2019-11-12T19:37:25Z","updated_at":"2019-11-12T21:39:27Z","due_on":"2019-11-12T08:00:00Z","closed_at":"2019-11-12T19:45:46Z"}]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Frequested_reviewers%3Fper_page=100 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Frequested_reviewers%3Fper_page=100
new file mode 100644
index 0000000000..1b4481f890
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Frequested_reviewers%3Fper_page=100
@@ -0,0 +1,24 @@
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+Etag: W/"21730161122bd4f229e886dd4a85b45fa575182d6dcef7aa0016a5d21353c9ab"
+X-Oauth-Scopes: 
+X-Github-Media-Type: github.v3; format=json
+Access-Control-Allow-Origin: *
+X-Frame-Options: deny
+X-Content-Type-Options: nosniff
+X-Xss-Protection: 0
+X-Github-Request-Id: C7CC:3118FC:3F6187A:4038171:6729E6BD
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Resource: core
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+Content-Security-Policy: default-src 'none'
+Content-Type: application/json; charset=utf-8
+Cache-Control: private, max-age=60, s-maxage=60
+X-Accepted-Oauth-Scopes: 
+X-Ratelimit-Remaining: 4905
+X-Ratelimit-Reset: 1730800941
+X-Ratelimit-Used: 95
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+
+{"users":[],"teams":[]}
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Freviews%2F315859956%2Fcomments%3Fper_page=100 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Freviews%2F315859956%2Fcomments%3Fper_page=100
new file mode 100644
index 0000000000..435e1a0ee0
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Freviews%2F315859956%2Fcomments%3Fper_page=100
@@ -0,0 +1,25 @@
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Github-Media-Type: github.v3; format=json
+X-Ratelimit-Used: 92
+X-Frame-Options: deny
+X-Content-Type-Options: nosniff
+Content-Length: 2
+X-Oauth-Scopes: 
+X-Ratelimit-Remaining: 4908
+X-Ratelimit-Reset: 1730800941
+X-Github-Request-Id: C7CC:3118FC:3F612D6:4037BAC:6729E6BC
+Etag: "450a1c087fec81e5b86092ff5372c3db8ca834c1e23c03c6b06ecca33cefd665"
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Resource: core
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+Access-Control-Allow-Origin: *
+Cache-Control: private, max-age=60, s-maxage=60
+X-Accepted-Oauth-Scopes: 
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+X-Xss-Protection: 0
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+Content-Security-Policy: default-src 'none'
+Content-Type: application/json; charset=utf-8
+
+[]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Freviews%2F315860062%2Fcomments%3Fper_page=100 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Freviews%2F315860062%2Fcomments%3Fper_page=100
new file mode 100644
index 0000000000..389c1b7567
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Freviews%2F315860062%2Fcomments%3Fper_page=100
@@ -0,0 +1,25 @@
+Content-Length: 2
+X-Frame-Options: deny
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Used: 93
+X-Ratelimit-Resource: core
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+Content-Type: application/json; charset=utf-8
+X-Accepted-Oauth-Scopes: 
+X-Xss-Protection: 0
+X-Oauth-Scopes: 
+X-Ratelimit-Remaining: 4907
+X-Ratelimit-Reset: 1730800941
+Access-Control-Allow-Origin: *
+X-Content-Type-Options: nosniff
+Content-Security-Policy: default-src 'none'
+Cache-Control: private, max-age=60, s-maxage=60
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Github-Request-Id: C7CC:3118FC:3F614AA:4037DB7:6729E6BD
+X-Github-Media-Type: github.v3; format=json
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+Etag: "450a1c087fec81e5b86092ff5372c3db8ca834c1e23c03c6b06ecca33cefd665"
+
+[]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Freviews%2F315861440%2Fcomments%3Fper_page=100 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Freviews%2F315861440%2Fcomments%3Fper_page=100
new file mode 100644
index 0000000000..e52428a5af
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Freviews%2F315861440%2Fcomments%3Fper_page=100
@@ -0,0 +1,25 @@
+Content-Type: application/json; charset=utf-8
+Cache-Control: private, max-age=60, s-maxage=60
+X-Ratelimit-Reset: 1730800941
+X-Content-Type-Options: nosniff
+Content-Security-Policy: default-src 'none'
+X-Accepted-Oauth-Scopes: 
+X-Xss-Protection: 0
+X-Github-Request-Id: C7CC:3118FC:3F61690:4037F90:6729E6BD
+Content-Length: 2
+X-Oauth-Scopes: 
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Limit: 5000
+X-Frame-Options: deny
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+Access-Control-Allow-Origin: *
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+Etag: "450a1c087fec81e5b86092ff5372c3db8ca834c1e23c03c6b06ecca33cefd665"
+X-Github-Media-Type: github.v3; format=json
+X-Ratelimit-Remaining: 4906
+X-Ratelimit-Used: 94
+X-Ratelimit-Resource: core
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+
+[]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Freviews%3Fper_page=100 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Freviews%3Fper_page=100
new file mode 100644
index 0000000000..203c363ffa
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F3%2Freviews%3Fper_page=100
@@ -0,0 +1,24 @@
+Cache-Control: private, max-age=60, s-maxage=60
+Etag: W/"e38ac3d6f3e77a469f9836bfa52a0b756b9ac8fdc4347530e1cb1072bbb77b46"
+X-Github-Media-Type: github.v3; format=json
+X-Frame-Options: deny
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+Access-Control-Allow-Origin: *
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Accepted-Oauth-Scopes: 
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Remaining: 4909
+X-Ratelimit-Reset: 1730800941
+Content-Security-Policy: default-src 'none'
+X-Github-Request-Id: C7CC:3118FC:3F6108F:403797A:6729E6BC
+Content-Type: application/json; charset=utf-8
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Resource: core
+X-Content-Type-Options: nosniff
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+X-Oauth-Scopes: 
+X-Ratelimit-Used: 91
+X-Xss-Protection: 0
+
+[{"id":315859956,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3MzE1ODU5OTU2","user":{"login":"jolheiser","id":42128690,"node_id":"MDQ6VXNlcjQyMTI4Njkw","avatar_url":"https://avatars.githubusercontent.com/u/42128690?u=0ee1052506846129445fa12a76cd9ad9d305de71&v=4","gravatar_id":"","url":"https://api.github.com/users/jolheiser","html_url":"https://github.com/jolheiser","followers_url":"https://api.github.com/users/jolheiser/followers","following_url":"https://api.github.com/users/jolheiser/following{/other_user}","gists_url":"https://api.github.com/users/jolheiser/gists{/gist_id}","starred_url":"https://api.github.com/users/jolheiser/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jolheiser/subscriptions","organizations_url":"https://api.github.com/users/jolheiser/orgs","repos_url":"https://api.github.com/users/jolheiser/repos","events_url":"https://api.github.com/users/jolheiser/events{/privacy}","received_events_url":"https://api.github.com/users/jolheiser/received_events","type":"User","user_view_type":"public","site_admin":false},"body":"","state":"APPROVED","html_url":"https://github.com/go-gitea/test_repo/pull/3#pullrequestreview-315859956","pull_request_url":"https://api.github.com/repos/go-gitea/test_repo/pulls/3","author_association":"MEMBER","_links":{"html":{"href":"https://github.com/go-gitea/test_repo/pull/3#pullrequestreview-315859956"},"pull_request":{"href":"https://api.github.com/repos/go-gitea/test_repo/pulls/3"}},"submitted_at":"2019-11-12T21:35:24Z","commit_id":"076160cf0b039f13e5eff19619932d181269414b"},{"id":315860062,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3MzE1ODYwMDYy","user":{"login":"zeripath","id":1824502,"node_id":"MDQ6VXNlcjE4MjQ1MDI=","avatar_url":"https://avatars.githubusercontent.com/u/1824502?u=fcd8a9dba8714edf6ac3f87596eb72149911c720&v=4","gravatar_id":"","url":"https://api.github.com/users/zeripath","html_url":"https://github.com/zeripath","followers_url":"https://api.github.com/users/zeripath/followers","following_url":"https://api.github.com/users/zeripath/following{/other_user}","gists_url":"https://api.github.com/users/zeripath/gists{/gist_id}","starred_url":"https://api.github.com/users/zeripath/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zeripath/subscriptions","organizations_url":"https://api.github.com/users/zeripath/orgs","repos_url":"https://api.github.com/users/zeripath/repos","events_url":"https://api.github.com/users/zeripath/events{/privacy}","received_events_url":"https://api.github.com/users/zeripath/received_events","type":"User","user_view_type":"public","site_admin":false},"body":"","state":"APPROVED","html_url":"https://github.com/go-gitea/test_repo/pull/3#pullrequestreview-315860062","pull_request_url":"https://api.github.com/repos/go-gitea/test_repo/pulls/3","author_association":"NONE","_links":{"html":{"href":"https://github.com/go-gitea/test_repo/pull/3#pullrequestreview-315860062"},"pull_request":{"href":"https://api.github.com/repos/go-gitea/test_repo/pulls/3"}},"submitted_at":"2019-11-12T21:35:36Z","commit_id":"076160cf0b039f13e5eff19619932d181269414b"},{"id":315861440,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3MzE1ODYxNDQw","user":{"login":"lafriks","id":165205,"node_id":"MDQ6VXNlcjE2NTIwNQ==","avatar_url":"https://avatars.githubusercontent.com/u/165205?u=efe2335d2197f524c25caa7abdfcb90b77eb8d98&v=4","gravatar_id":"","url":"https://api.github.com/users/lafriks","html_url":"https://github.com/lafriks","followers_url":"https://api.github.com/users/lafriks/followers","following_url":"https://api.github.com/users/lafriks/following{/other_user}","gists_url":"https://api.github.com/users/lafriks/gists{/gist_id}","starred_url":"https://api.github.com/users/lafriks/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lafriks/subscriptions","organizations_url":"https://api.github.com/users/lafriks/orgs","repos_url":"https://api.github.com/users/lafriks/repos","events_url":"https://api.github.com/users/lafriks/events{/privacy}","received_events_url":"https://api.github.com/users/lafriks/received_events","type":"User","user_view_type":"public","site_admin":false},"body":"","state":"APPROVED","html_url":"https://github.com/go-gitea/test_repo/pull/3#pullrequestreview-315861440","pull_request_url":"https://api.github.com/repos/go-gitea/test_repo/pulls/3","author_association":"MEMBER","_links":{"html":{"href":"https://github.com/go-gitea/test_repo/pull/3#pullrequestreview-315861440"},"pull_request":{"href":"https://api.github.com/repos/go-gitea/test_repo/pulls/3"}},"submitted_at":"2019-11-12T21:38:00Z","commit_id":"076160cf0b039f13e5eff19619932d181269414b"}]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Frequested_reviewers%3Fper_page=100 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Frequested_reviewers%3Fper_page=100
new file mode 100644
index 0000000000..676e326094
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Frequested_reviewers%3Fper_page=100
@@ -0,0 +1,24 @@
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Oauth-Scopes: 
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Remaining: 4898
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+X-Xss-Protection: 0
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+Content-Security-Policy: default-src 'none'
+X-Github-Request-Id: C7CC:3118FC:3F623DF:4038CEB:6729E6C0
+Etag: W/"21730161122bd4f229e886dd4a85b45fa575182d6dcef7aa0016a5d21353c9ab"
+X-Accepted-Oauth-Scopes: 
+X-Github-Media-Type: github.v3; format=json
+X-Ratelimit-Resource: core
+Access-Control-Allow-Origin: *
+X-Frame-Options: deny
+Content-Type: application/json; charset=utf-8
+Cache-Control: private, max-age=60, s-maxage=60
+X-Ratelimit-Used: 102
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Reset: 1730800941
+X-Content-Type-Options: nosniff
+
+{"users":[],"teams":[]}
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Freviews%2F338338740%2Fcomments%3Fper_page=100 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Freviews%2F338338740%2Fcomments%3Fper_page=100
new file mode 100644
index 0000000000..48e5b2c3d9
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Freviews%2F338338740%2Fcomments%3Fper_page=100
@@ -0,0 +1,24 @@
+Access-Control-Allow-Origin: *
+X-Content-Type-Options: nosniff
+Content-Security-Policy: default-src 'none'
+X-Ratelimit-Resource: core
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Accepted-Oauth-Scopes: 
+X-Github-Media-Type: github.v3; format=json
+X-Ratelimit-Remaining: 4903
+X-Ratelimit-Reset: 1730800941
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+X-Frame-Options: deny
+X-Github-Request-Id: C7CC:3118FC:3F61BAA:40384A5:6729E6BE
+Cache-Control: private, max-age=60, s-maxage=60
+Etag: W/"ff77892df2ec7f6eb61416e0f384ce0a6e8fbbbc1287f5d09b1980ebe9856750"
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Used: 97
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+Content-Type: application/json; charset=utf-8
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+X-Xss-Protection: 0
+X-Oauth-Scopes: 
+
+[{"id":363017488,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDM2MzAxNzQ4OA==","url":"https://api.github.com/repos/go-gitea/test_repo/pulls/comments/363017488","pull_request_review_id":338338740,"diff_hunk":"@@ -1,2 +1,4 @@\n # test_repo\n Test repository for testing migration from github to gitea\n+","path":"README.md","position":3,"original_position":3,"commit_id":"2be9101c543658591222acbee3eb799edfc3853d","user":{"login":"lunny","id":81045,"node_id":"MDQ6VXNlcjgxMDQ1","avatar_url":"https://avatars.githubusercontent.com/u/81045?u=99b64f0ca6ef63643c7583ab87dd31c52d28e673&v=4","gravatar_id":"","url":"https://api.github.com/users/lunny","html_url":"https://github.com/lunny","followers_url":"https://api.github.com/users/lunny/followers","following_url":"https://api.github.com/users/lunny/following{/other_user}","gists_url":"https://api.github.com/users/lunny/gists{/gist_id}","starred_url":"https://api.github.com/users/lunny/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lunny/subscriptions","organizations_url":"https://api.github.com/users/lunny/orgs","repos_url":"https://api.github.com/users/lunny/repos","events_url":"https://api.github.com/users/lunny/events{/privacy}","received_events_url":"https://api.github.com/users/lunny/received_events","type":"User","user_view_type":"public","site_admin":false},"body":"This is a good pull request.","created_at":"2020-01-04T05:33:06Z","updated_at":"2020-01-04T05:33:18Z","html_url":"https://github.com/go-gitea/test_repo/pull/4#discussion_r363017488","pull_request_url":"https://api.github.com/repos/go-gitea/test_repo/pulls/4","author_association":"MEMBER","_links":{"self":{"href":"https://api.github.com/repos/go-gitea/test_repo/pulls/comments/363017488"},"html":{"href":"https://github.com/go-gitea/test_repo/pull/4#discussion_r363017488"},"pull_request":{"href":"https://api.github.com/repos/go-gitea/test_repo/pulls/4"}},"original_commit_id":"2be9101c543658591222acbee3eb799edfc3853d","reactions":{"url":"https://api.github.com/repos/go-gitea/test_repo/pulls/comments/363017488/reactions","total_count":0,"+1":0,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":0,"rocket":0,"eyes":0}}]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Freviews%2F338339651%2Fcomments%3Fper_page=100 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Freviews%2F338339651%2Fcomments%3Fper_page=100
new file mode 100644
index 0000000000..4cc66424f0
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Freviews%2F338339651%2Fcomments%3Fper_page=100
@@ -0,0 +1,25 @@
+X-Github-Api-Version-Selected: 2022-11-28
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+X-Frame-Options: deny
+X-Content-Type-Options: nosniff
+Cache-Control: private, max-age=60, s-maxage=60
+Etag: "450a1c087fec81e5b86092ff5372c3db8ca834c1e23c03c6b06ecca33cefd665"
+X-Github-Media-Type: github.v3; format=json
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+X-Ratelimit-Reset: 1730800941
+X-Xss-Protection: 0
+X-Oauth-Scopes: 
+X-Accepted-Oauth-Scopes: 
+X-Ratelimit-Limit: 5000
+Access-Control-Allow-Origin: *
+Content-Length: 2
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Ratelimit-Resource: core
+Content-Security-Policy: default-src 'none'
+X-Github-Request-Id: C7CC:3118FC:3F61EBA:40387A6:6729E6BF
+Content-Type: application/json; charset=utf-8
+X-Ratelimit-Remaining: 4901
+X-Ratelimit-Used: 99
+
+[]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Freviews%2F338349019%2Fcomments%3Fper_page=100 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Freviews%2F338349019%2Fcomments%3Fper_page=100
new file mode 100644
index 0000000000..f13d4addc7
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Freviews%2F338349019%2Fcomments%3Fper_page=100
@@ -0,0 +1,24 @@
+Etag: W/"f74a383d4c87ae26d218fc087bef2c41a12637dff81fd8642f59708adca1a14e"
+X-Ratelimit-Remaining: 4900
+X-Content-Type-Options: nosniff
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Reset: 1730800941
+X-Xss-Protection: 0
+Content-Type: application/json; charset=utf-8
+X-Oauth-Scopes: 
+X-Accepted-Oauth-Scopes: 
+X-Github-Api-Version-Selected: 2022-11-28
+Access-Control-Allow-Origin: *
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+X-Frame-Options: deny
+X-Github-Media-Type: github.v3; format=json
+X-Ratelimit-Used: 100
+X-Ratelimit-Resource: core
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+X-Github-Request-Id: C7CC:3118FC:3F62065:4038955:6729E6C0
+Content-Security-Policy: default-src 'none'
+Cache-Control: private, max-age=60, s-maxage=60
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+
+[{"id":363029944,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDM2MzAyOTk0NA==","url":"https://api.github.com/repos/go-gitea/test_repo/pulls/comments/363029944","pull_request_review_id":338349019,"diff_hunk":"@@ -19,3 +19,5 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE.\n+","path":"LICENSE","position":4,"original_position":4,"commit_id":"2be9101c543658591222acbee3eb799edfc3853d","user":{"login":"lunny","id":81045,"node_id":"MDQ6VXNlcjgxMDQ1","avatar_url":"https://avatars.githubusercontent.com/u/81045?u=99b64f0ca6ef63643c7583ab87dd31c52d28e673&v=4","gravatar_id":"","url":"https://api.github.com/users/lunny","html_url":"https://github.com/lunny","followers_url":"https://api.github.com/users/lunny/followers","following_url":"https://api.github.com/users/lunny/following{/other_user}","gists_url":"https://api.github.com/users/lunny/gists{/gist_id}","starred_url":"https://api.github.com/users/lunny/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lunny/subscriptions","organizations_url":"https://api.github.com/users/lunny/orgs","repos_url":"https://api.github.com/users/lunny/repos","events_url":"https://api.github.com/users/lunny/events{/privacy}","received_events_url":"https://api.github.com/users/lunny/received_events","type":"User","user_view_type":"public","site_admin":false},"body":"test a single comment.","created_at":"2020-01-04T11:21:41Z","updated_at":"2020-01-04T11:21:41Z","html_url":"https://github.com/go-gitea/test_repo/pull/4#discussion_r363029944","pull_request_url":"https://api.github.com/repos/go-gitea/test_repo/pulls/4","author_association":"MEMBER","_links":{"self":{"href":"https://api.github.com/repos/go-gitea/test_repo/pulls/comments/363029944"},"html":{"href":"https://github.com/go-gitea/test_repo/pull/4#discussion_r363029944"},"pull_request":{"href":"https://api.github.com/repos/go-gitea/test_repo/pulls/4"}},"original_commit_id":"2be9101c543658591222acbee3eb799edfc3853d","reactions":{"url":"https://api.github.com/repos/go-gitea/test_repo/pulls/comments/363029944/reactions","total_count":0,"+1":0,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":0,"rocket":0,"eyes":0}}]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Freviews%3Fper_page=100 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Freviews%3Fper_page=100
new file mode 100644
index 0000000000..c4484e078a
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2F4%2Freviews%3Fper_page=100
@@ -0,0 +1,24 @@
+Cache-Control: private, max-age=60, s-maxage=60
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+X-Xss-Protection: 0
+Content-Security-Policy: default-src 'none'
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Github-Media-Type: github.v3; format=json
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Reset: 1730800941
+X-Frame-Options: deny
+X-Github-Request-Id: C7CC:3118FC:3F619C6:40382C4:6729E6BE
+Access-Control-Allow-Origin: *
+X-Content-Type-Options: nosniff
+Content-Type: application/json; charset=utf-8
+X-Accepted-Oauth-Scopes: 
+X-Ratelimit-Used: 96
+X-Ratelimit-Resource: core
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+Etag: W/"a47623061be83c50d3932baf8c5961386d2d45c32c42b504122c9a1359efd515"
+X-Oauth-Scopes: 
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Remaining: 4904
+
+[{"id":338338740,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3MzM4MzM4NzQw","user":{"login":"lunny","id":81045,"node_id":"MDQ6VXNlcjgxMDQ1","avatar_url":"https://avatars.githubusercontent.com/u/81045?u=99b64f0ca6ef63643c7583ab87dd31c52d28e673&v=4","gravatar_id":"","url":"https://api.github.com/users/lunny","html_url":"https://github.com/lunny","followers_url":"https://api.github.com/users/lunny/followers","following_url":"https://api.github.com/users/lunny/following{/other_user}","gists_url":"https://api.github.com/users/lunny/gists{/gist_id}","starred_url":"https://api.github.com/users/lunny/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lunny/subscriptions","organizations_url":"https://api.github.com/users/lunny/orgs","repos_url":"https://api.github.com/users/lunny/repos","events_url":"https://api.github.com/users/lunny/events{/privacy}","received_events_url":"https://api.github.com/users/lunny/received_events","type":"User","user_view_type":"public","site_admin":false},"body":"","state":"APPROVED","html_url":"https://github.com/go-gitea/test_repo/pull/4#pullrequestreview-338338740","pull_request_url":"https://api.github.com/repos/go-gitea/test_repo/pulls/4","author_association":"MEMBER","_links":{"html":{"href":"https://github.com/go-gitea/test_repo/pull/4#pullrequestreview-338338740"},"pull_request":{"href":"https://api.github.com/repos/go-gitea/test_repo/pulls/4"}},"submitted_at":"2020-01-04T05:33:18Z","commit_id":"2be9101c543658591222acbee3eb799edfc3853d"},{"id":338339651,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3MzM4MzM5NjUx","user":{"login":"lunny","id":81045,"node_id":"MDQ6VXNlcjgxMDQ1","avatar_url":"https://avatars.githubusercontent.com/u/81045?u=99b64f0ca6ef63643c7583ab87dd31c52d28e673&v=4","gravatar_id":"","url":"https://api.github.com/users/lunny","html_url":"https://github.com/lunny","followers_url":"https://api.github.com/users/lunny/followers","following_url":"https://api.github.com/users/lunny/following{/other_user}","gists_url":"https://api.github.com/users/lunny/gists{/gist_id}","starred_url":"https://api.github.com/users/lunny/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lunny/subscriptions","organizations_url":"https://api.github.com/users/lunny/orgs","repos_url":"https://api.github.com/users/lunny/repos","events_url":"https://api.github.com/users/lunny/events{/privacy}","received_events_url":"https://api.github.com/users/lunny/received_events","type":"User","user_view_type":"public","site_admin":false},"body":"Don't add more reviews","state":"CHANGES_REQUESTED","html_url":"https://github.com/go-gitea/test_repo/pull/4#pullrequestreview-338339651","pull_request_url":"https://api.github.com/repos/go-gitea/test_repo/pulls/4","author_association":"MEMBER","_links":{"html":{"href":"https://github.com/go-gitea/test_repo/pull/4#pullrequestreview-338339651"},"pull_request":{"href":"https://api.github.com/repos/go-gitea/test_repo/pulls/4"}},"submitted_at":"2020-01-04T06:07:06Z","commit_id":"2be9101c543658591222acbee3eb799edfc3853d"},{"id":338349019,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3MzM4MzQ5MDE5","user":{"login":"lunny","id":81045,"node_id":"MDQ6VXNlcjgxMDQ1","avatar_url":"https://avatars.githubusercontent.com/u/81045?u=99b64f0ca6ef63643c7583ab87dd31c52d28e673&v=4","gravatar_id":"","url":"https://api.github.com/users/lunny","html_url":"https://github.com/lunny","followers_url":"https://api.github.com/users/lunny/followers","following_url":"https://api.github.com/users/lunny/following{/other_user}","gists_url":"https://api.github.com/users/lunny/gists{/gist_id}","starred_url":"https://api.github.com/users/lunny/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lunny/subscriptions","organizations_url":"https://api.github.com/users/lunny/orgs","repos_url":"https://api.github.com/users/lunny/repos","events_url":"https://api.github.com/users/lunny/events{/privacy}","received_events_url":"https://api.github.com/users/lunny/received_events","type":"User","user_view_type":"public","site_admin":false},"body":"","state":"COMMENTED","html_url":"https://github.com/go-gitea/test_repo/pull/4#pullrequestreview-338349019","pull_request_url":"https://api.github.com/repos/go-gitea/test_repo/pulls/4","author_association":"MEMBER","_links":{"html":{"href":"https://github.com/go-gitea/test_repo/pull/4#pullrequestreview-338349019"},"pull_request":{"href":"https://api.github.com/repos/go-gitea/test_repo/pulls/4"}},"submitted_at":"2020-01-04T11:21:41Z","commit_id":"2be9101c543658591222acbee3eb799edfc3853d"}]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2Fcomments%2F363017488%2Freactions%3Fpage=1&per_page=100 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2Fcomments%2F363017488%2Freactions%3Fpage=1&per_page=100
new file mode 100644
index 0000000000..748ae93381
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2Fcomments%2F363017488%2Freactions%3Fpage=1&per_page=100
@@ -0,0 +1,25 @@
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+Etag: "f87b0fd59e59458a9a808311324b873c6baf3fde861298a99de9986270dd4d79"
+X-Accepted-Oauth-Scopes: 
+X-Ratelimit-Remaining: 4902
+X-Ratelimit-Reset: 1730800941
+X-Ratelimit-Resource: core
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+X-Github-Media-Type: github.v3; param=squirrel-girl-preview
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+X-Github-Request-Id: C7CC:3118FC:3F61D73:4038667:6729E6BF
+Content-Type: application/json; charset=utf-8
+X-Ratelimit-Limit: 5000
+Content-Length: 2
+Cache-Control: private, max-age=60, s-maxage=60
+X-Oauth-Scopes: 
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Used: 98
+X-Frame-Options: deny
+X-Content-Type-Options: nosniff
+X-Xss-Protection: 0
+Content-Security-Policy: default-src 'none'
+
+[]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2Fcomments%2F363029944%2Freactions%3Fpage=1&per_page=100 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2Fcomments%2F363029944%2Freactions%3Fpage=1&per_page=100
new file mode 100644
index 0000000000..0b0ae88deb
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%2Fcomments%2F363029944%2Freactions%3Fpage=1&per_page=100
@@ -0,0 +1,25 @@
+X-Accepted-Oauth-Scopes: 
+X-Ratelimit-Remaining: 4899
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+Content-Length: 2
+X-Ratelimit-Used: 101
+Access-Control-Allow-Origin: *
+X-Frame-Options: deny
+X-Content-Type-Options: nosniff
+X-Xss-Protection: 0
+Content-Security-Policy: default-src 'none'
+Cache-Control: private, max-age=60, s-maxage=60
+Etag: "f87b0fd59e59458a9a808311324b873c6baf3fde861298a99de9986270dd4d79"
+X-Oauth-Scopes: 
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Reset: 1730800941
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+Content-Type: application/json; charset=utf-8
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Github-Media-Type: github.v3; param=squirrel-girl-preview
+X-Ratelimit-Resource: core
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+X-Github-Request-Id: C7CC:3118FC:3F622AC:4038BA5:6729E6C0
+
+[]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%3Fdirection=asc&page=1&per_page=2&sort=created&state=all b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%3Fdirection=asc&page=1&per_page=2&sort=created&state=all
new file mode 100644
index 0000000000..ff05f4da0f
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Fpulls%3Fdirection=asc&page=1&per_page=2&sort=created&state=all
@@ -0,0 +1,24 @@
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Used: 87
+X-Frame-Options: deny
+X-Github-Media-Type: github.v3; format=json
+X-Ratelimit-Remaining: 4913
+X-Ratelimit-Reset: 1730800941
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+Content-Security-Policy: default-src 'none'
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Oauth-Scopes: 
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Resource: core
+Access-Control-Allow-Origin: *
+X-Github-Request-Id: C7CC:3118FC:3F6099B:403726B:6729E6BA
+X-Xss-Protection: 0
+Content-Type: application/json; charset=utf-8
+Cache-Control: private, max-age=60, s-maxage=60
+Etag: W/"fed37ab8ce0b78e713030ff3e601f540b7f71243ab788b477f6885119bd691c5"
+X-Accepted-Oauth-Scopes: 
+X-Content-Type-Options: nosniff
+
+[{"url":"https://api.github.com/repos/go-gitea/test_repo/pulls/3","id":340118745,"node_id":"MDExOlB1bGxSZXF1ZXN0MzQwMTE4NzQ1","html_url":"https://github.com/go-gitea/test_repo/pull/3","diff_url":"https://github.com/go-gitea/test_repo/pull/3.diff","patch_url":"https://github.com/go-gitea/test_repo/pull/3.patch","issue_url":"https://api.github.com/repos/go-gitea/test_repo/issues/3","number":3,"state":"closed","locked":false,"title":"Update README.md","user":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"body":"add warning to readme","created_at":"2019-11-12T21:21:43Z","updated_at":"2019-11-12T21:39:28Z","closed_at":"2019-11-12T21:39:27Z","merged_at":"2019-11-12T21:39:27Z","merge_commit_sha":"f32b0a9dfd09a60f616f29158f772cedd89942d2","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":1667254254,"node_id":"MDU6TGFiZWwxNjY3MjU0MjU0","url":"https://api.github.com/repos/go-gitea/test_repo/labels/documentation","name":"documentation","color":"0075ca","default":true,"description":"Improvements or additions to documentation"}],"milestone":{"url":"https://api.github.com/repos/go-gitea/test_repo/milestones/2","html_url":"https://github.com/go-gitea/test_repo/milestone/2","labels_url":"https://api.github.com/repos/go-gitea/test_repo/milestones/2/labels","id":4839942,"node_id":"MDk6TWlsZXN0b25lNDgzOTk0Mg==","number":2,"title":"1.1.0","description":"Milestone 1.1.0","creator":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"open_issues":0,"closed_issues":2,"state":"closed","created_at":"2019-11-12T19:37:25Z","updated_at":"2019-11-12T21:39:27Z","due_on":"2019-11-12T08:00:00Z","closed_at":"2019-11-12T19:45:46Z"},"draft":false,"commits_url":"https://api.github.com/repos/go-gitea/test_repo/pulls/3/commits","review_comments_url":"https://api.github.com/repos/go-gitea/test_repo/pulls/3/comments","review_comment_url":"https://api.github.com/repos/go-gitea/test_repo/pulls/comments{/number}","comments_url":"https://api.github.com/repos/go-gitea/test_repo/issues/3/comments","statuses_url":"https://api.github.com/repos/go-gitea/test_repo/statuses/076160cf0b039f13e5eff19619932d181269414b","head":{"label":"mrsdizzie:master","ref":"master","sha":"076160cf0b039f13e5eff19619932d181269414b","user":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"repo":{"id":221313794,"node_id":"MDEwOlJlcG9zaXRvcnkyMjEzMTM3OTQ=","name":"test_repo","full_name":"mrsdizzie/test_repo","private":false,"owner":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"html_url":"https://github.com/mrsdizzie/test_repo","description":"Test repository for testing migration from github to gitea","fork":true,"url":"https://api.github.com/repos/mrsdizzie/test_repo","forks_url":"https://api.github.com/repos/mrsdizzie/test_repo/forks","keys_url":"https://api.github.com/repos/mrsdizzie/test_repo/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mrsdizzie/test_repo/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mrsdizzie/test_repo/teams","hooks_url":"https://api.github.com/repos/mrsdizzie/test_repo/hooks","issue_events_url":"https://api.github.com/repos/mrsdizzie/test_repo/issues/events{/number}","events_url":"https://api.github.com/repos/mrsdizzie/test_repo/events","assignees_url":"https://api.github.com/repos/mrsdizzie/test_repo/assignees{/user}","branches_url":"https://api.github.com/repos/mrsdizzie/test_repo/branches{/branch}","tags_url":"https://api.github.com/repos/mrsdizzie/test_repo/tags","blobs_url":"https://api.github.com/repos/mrsdizzie/test_repo/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mrsdizzie/test_repo/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mrsdizzie/test_repo/git/refs{/sha}","trees_url":"https://api.github.com/repos/mrsdizzie/test_repo/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mrsdizzie/test_repo/statuses/{sha}","languages_url":"https://api.github.com/repos/mrsdizzie/test_repo/languages","stargazers_url":"https://api.github.com/repos/mrsdizzie/test_repo/stargazers","contributors_url":"https://api.github.com/repos/mrsdizzie/test_repo/contributors","subscribers_url":"https://api.github.com/repos/mrsdizzie/test_repo/subscribers","subscription_url":"https://api.github.com/repos/mrsdizzie/test_repo/subscription","commits_url":"https://api.github.com/repos/mrsdizzie/test_repo/commits{/sha}","git_commits_url":"https://api.github.com/repos/mrsdizzie/test_repo/git/commits{/sha}","comments_url":"https://api.github.com/repos/mrsdizzie/test_repo/comments{/number}","issue_comment_url":"https://api.github.com/repos/mrsdizzie/test_repo/issues/comments{/number}","contents_url":"https://api.github.com/repos/mrsdizzie/test_repo/contents/{+path}","compare_url":"https://api.github.com/repos/mrsdizzie/test_repo/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mrsdizzie/test_repo/merges","archive_url":"https://api.github.com/repos/mrsdizzie/test_repo/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mrsdizzie/test_repo/downloads","issues_url":"https://api.github.com/repos/mrsdizzie/test_repo/issues{/number}","pulls_url":"https://api.github.com/repos/mrsdizzie/test_repo/pulls{/number}","milestones_url":"https://api.github.com/repos/mrsdizzie/test_repo/milestones{/number}","notifications_url":"https://api.github.com/repos/mrsdizzie/test_repo/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mrsdizzie/test_repo/labels{/name}","releases_url":"https://api.github.com/repos/mrsdizzie/test_repo/releases{/id}","deployments_url":"https://api.github.com/repos/mrsdizzie/test_repo/deployments","created_at":"2019-11-12T21:17:42Z","updated_at":"2019-11-12T21:18:46Z","pushed_at":"2019-11-12T21:53:39Z","git_url":"git://github.com/mrsdizzie/test_repo.git","ssh_url":"git@github.com:mrsdizzie/test_repo.git","clone_url":"https://github.com/mrsdizzie/test_repo.git","svn_url":"https://github.com/mrsdizzie/test_repo","homepage":null,"size":3,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"has_discussions":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"allow_forking":true,"is_template":false,"web_commit_signoff_required":false,"topics":[],"visibility":"public","forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"go-gitea:master","ref":"master","sha":"72866af952e98d02a73003501836074b286a78f6","user":{"login":"go-gitea","id":12724356,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEyNzI0MzU2","avatar_url":"https://avatars.githubusercontent.com/u/12724356?v=4","gravatar_id":"","url":"https://api.github.com/users/go-gitea","html_url":"https://github.com/go-gitea","followers_url":"https://api.github.com/users/go-gitea/followers","following_url":"https://api.github.com/users/go-gitea/following{/other_user}","gists_url":"https://api.github.com/users/go-gitea/gists{/gist_id}","starred_url":"https://api.github.com/users/go-gitea/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/go-gitea/subscriptions","organizations_url":"https://api.github.com/users/go-gitea/orgs","repos_url":"https://api.github.com/users/go-gitea/repos","events_url":"https://api.github.com/users/go-gitea/events{/privacy}","received_events_url":"https://api.github.com/users/go-gitea/received_events","type":"Organization","user_view_type":"public","site_admin":false},"repo":{"id":220672974,"node_id":"MDEwOlJlcG9zaXRvcnkyMjA2NzI5NzQ=","name":"test_repo","full_name":"go-gitea/test_repo","private":false,"owner":{"login":"go-gitea","id":12724356,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEyNzI0MzU2","avatar_url":"https://avatars.githubusercontent.com/u/12724356?v=4","gravatar_id":"","url":"https://api.github.com/users/go-gitea","html_url":"https://github.com/go-gitea","followers_url":"https://api.github.com/users/go-gitea/followers","following_url":"https://api.github.com/users/go-gitea/following{/other_user}","gists_url":"https://api.github.com/users/go-gitea/gists{/gist_id}","starred_url":"https://api.github.com/users/go-gitea/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/go-gitea/subscriptions","organizations_url":"https://api.github.com/users/go-gitea/orgs","repos_url":"https://api.github.com/users/go-gitea/repos","events_url":"https://api.github.com/users/go-gitea/events{/privacy}","received_events_url":"https://api.github.com/users/go-gitea/received_events","type":"Organization","user_view_type":"public","site_admin":false},"html_url":"https://github.com/go-gitea/test_repo","description":"Test repository for testing migration from github to gitea","fork":false,"url":"https://api.github.com/repos/go-gitea/test_repo","forks_url":"https://api.github.com/repos/go-gitea/test_repo/forks","keys_url":"https://api.github.com/repos/go-gitea/test_repo/keys{/key_id}","collaborators_url":"https://api.github.com/repos/go-gitea/test_repo/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/go-gitea/test_repo/teams","hooks_url":"https://api.github.com/repos/go-gitea/test_repo/hooks","issue_events_url":"https://api.github.com/repos/go-gitea/test_repo/issues/events{/number}","events_url":"https://api.github.com/repos/go-gitea/test_repo/events","assignees_url":"https://api.github.com/repos/go-gitea/test_repo/assignees{/user}","branches_url":"https://api.github.com/repos/go-gitea/test_repo/branches{/branch}","tags_url":"https://api.github.com/repos/go-gitea/test_repo/tags","blobs_url":"https://api.github.com/repos/go-gitea/test_repo/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/go-gitea/test_repo/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/go-gitea/test_repo/git/refs{/sha}","trees_url":"https://api.github.com/repos/go-gitea/test_repo/git/trees{/sha}","statuses_url":"https://api.github.com/repos/go-gitea/test_repo/statuses/{sha}","languages_url":"https://api.github.com/repos/go-gitea/test_repo/languages","stargazers_url":"https://api.github.com/repos/go-gitea/test_repo/stargazers","contributors_url":"https://api.github.com/repos/go-gitea/test_repo/contributors","subscribers_url":"https://api.github.com/repos/go-gitea/test_repo/subscribers","subscription_url":"https://api.github.com/repos/go-gitea/test_repo/subscription","commits_url":"https://api.github.com/repos/go-gitea/test_repo/commits{/sha}","git_commits_url":"https://api.github.com/repos/go-gitea/test_repo/git/commits{/sha}","comments_url":"https://api.github.com/repos/go-gitea/test_repo/comments{/number}","issue_comment_url":"https://api.github.com/repos/go-gitea/test_repo/issues/comments{/number}","contents_url":"https://api.github.com/repos/go-gitea/test_repo/contents/{+path}","compare_url":"https://api.github.com/repos/go-gitea/test_repo/compare/{base}...{head}","merges_url":"https://api.github.com/repos/go-gitea/test_repo/merges","archive_url":"https://api.github.com/repos/go-gitea/test_repo/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/go-gitea/test_repo/downloads","issues_url":"https://api.github.com/repos/go-gitea/test_repo/issues{/number}","pulls_url":"https://api.github.com/repos/go-gitea/test_repo/pulls{/number}","milestones_url":"https://api.github.com/repos/go-gitea/test_repo/milestones{/number}","notifications_url":"https://api.github.com/repos/go-gitea/test_repo/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/go-gitea/test_repo/labels{/name}","releases_url":"https://api.github.com/repos/go-gitea/test_repo/releases{/id}","deployments_url":"https://api.github.com/repos/go-gitea/test_repo/deployments","created_at":"2019-11-09T16:49:20Z","updated_at":"2023-03-02T14:02:26Z","pushed_at":"2019-11-12T21:54:19Z","git_url":"git://github.com/go-gitea/test_repo.git","ssh_url":"git@github.com:go-gitea/test_repo.git","clone_url":"https://github.com/go-gitea/test_repo.git","svn_url":"https://github.com/go-gitea/test_repo","homepage":null,"size":1,"stargazers_count":3,"watchers_count":3,"language":null,"has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"has_discussions":false,"forks_count":6,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":2,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"allow_forking":true,"is_template":false,"web_commit_signoff_required":false,"topics":["gitea"],"visibility":"public","forks":6,"open_issues":2,"watchers":3,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/go-gitea/test_repo/pulls/3"},"html":{"href":"https://github.com/go-gitea/test_repo/pull/3"},"issue":{"href":"https://api.github.com/repos/go-gitea/test_repo/issues/3"},"comments":{"href":"https://api.github.com/repos/go-gitea/test_repo/issues/3/comments"},"review_comments":{"href":"https://api.github.com/repos/go-gitea/test_repo/pulls/3/comments"},"review_comment":{"href":"https://api.github.com/repos/go-gitea/test_repo/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/go-gitea/test_repo/pulls/3/commits"},"statuses":{"href":"https://api.github.com/repos/go-gitea/test_repo/statuses/076160cf0b039f13e5eff19619932d181269414b"}},"author_association":"MEMBER","auto_merge":null,"active_lock_reason":null},{"url":"https://api.github.com/repos/go-gitea/test_repo/pulls/4","id":340131577,"node_id":"MDExOlB1bGxSZXF1ZXN0MzQwMTMxNTc3","html_url":"https://github.com/go-gitea/test_repo/pull/4","diff_url":"https://github.com/go-gitea/test_repo/pull/4.diff","patch_url":"https://github.com/go-gitea/test_repo/pull/4.patch","issue_url":"https://api.github.com/repos/go-gitea/test_repo/issues/4","number":4,"state":"open","locked":false,"title":"Test branch","user":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"body":"do not merge this PR","created_at":"2019-11-12T21:54:18Z","updated_at":"2020-01-04T11:30:01Z","closed_at":null,"merged_at":null,"merge_commit_sha":"565d1208f5fffdc1c5ae1a2436491eb9a5e4ebae","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":1667254252,"node_id":"MDU6TGFiZWwxNjY3MjU0MjUy","url":"https://api.github.com/repos/go-gitea/test_repo/labels/bug","name":"bug","color":"d73a4a","default":true,"description":"Something isn't working"}],"milestone":{"url":"https://api.github.com/repos/go-gitea/test_repo/milestones/1","html_url":"https://github.com/go-gitea/test_repo/milestone/1","labels_url":"https://api.github.com/repos/go-gitea/test_repo/milestones/1/labels","id":4839941,"node_id":"MDk6TWlsZXN0b25lNDgzOTk0MQ==","number":1,"title":"1.0.0","description":"Milestone 1.0.0","creator":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"open_issues":1,"closed_issues":1,"state":"closed","created_at":"2019-11-12T19:37:08Z","updated_at":"2019-11-12T21:56:17Z","due_on":"2019-11-11T08:00:00Z","closed_at":"2019-11-12T19:45:49Z"},"draft":false,"commits_url":"https://api.github.com/repos/go-gitea/test_repo/pulls/4/commits","review_comments_url":"https://api.github.com/repos/go-gitea/test_repo/pulls/4/comments","review_comment_url":"https://api.github.com/repos/go-gitea/test_repo/pulls/comments{/number}","comments_url":"https://api.github.com/repos/go-gitea/test_repo/issues/4/comments","statuses_url":"https://api.github.com/repos/go-gitea/test_repo/statuses/2be9101c543658591222acbee3eb799edfc3853d","head":{"label":"mrsdizzie:test-branch","ref":"test-branch","sha":"2be9101c543658591222acbee3eb799edfc3853d","user":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"repo":{"id":221313794,"node_id":"MDEwOlJlcG9zaXRvcnkyMjEzMTM3OTQ=","name":"test_repo","full_name":"mrsdizzie/test_repo","private":false,"owner":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"html_url":"https://github.com/mrsdizzie/test_repo","description":"Test repository for testing migration from github to gitea","fork":true,"url":"https://api.github.com/repos/mrsdizzie/test_repo","forks_url":"https://api.github.com/repos/mrsdizzie/test_repo/forks","keys_url":"https://api.github.com/repos/mrsdizzie/test_repo/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mrsdizzie/test_repo/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mrsdizzie/test_repo/teams","hooks_url":"https://api.github.com/repos/mrsdizzie/test_repo/hooks","issue_events_url":"https://api.github.com/repos/mrsdizzie/test_repo/issues/events{/number}","events_url":"https://api.github.com/repos/mrsdizzie/test_repo/events","assignees_url":"https://api.github.com/repos/mrsdizzie/test_repo/assignees{/user}","branches_url":"https://api.github.com/repos/mrsdizzie/test_repo/branches{/branch}","tags_url":"https://api.github.com/repos/mrsdizzie/test_repo/tags","blobs_url":"https://api.github.com/repos/mrsdizzie/test_repo/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mrsdizzie/test_repo/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mrsdizzie/test_repo/git/refs{/sha}","trees_url":"https://api.github.com/repos/mrsdizzie/test_repo/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mrsdizzie/test_repo/statuses/{sha}","languages_url":"https://api.github.com/repos/mrsdizzie/test_repo/languages","stargazers_url":"https://api.github.com/repos/mrsdizzie/test_repo/stargazers","contributors_url":"https://api.github.com/repos/mrsdizzie/test_repo/contributors","subscribers_url":"https://api.github.com/repos/mrsdizzie/test_repo/subscribers","subscription_url":"https://api.github.com/repos/mrsdizzie/test_repo/subscription","commits_url":"https://api.github.com/repos/mrsdizzie/test_repo/commits{/sha}","git_commits_url":"https://api.github.com/repos/mrsdizzie/test_repo/git/commits{/sha}","comments_url":"https://api.github.com/repos/mrsdizzie/test_repo/comments{/number}","issue_comment_url":"https://api.github.com/repos/mrsdizzie/test_repo/issues/comments{/number}","contents_url":"https://api.github.com/repos/mrsdizzie/test_repo/contents/{+path}","compare_url":"https://api.github.com/repos/mrsdizzie/test_repo/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mrsdizzie/test_repo/merges","archive_url":"https://api.github.com/repos/mrsdizzie/test_repo/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mrsdizzie/test_repo/downloads","issues_url":"https://api.github.com/repos/mrsdizzie/test_repo/issues{/number}","pulls_url":"https://api.github.com/repos/mrsdizzie/test_repo/pulls{/number}","milestones_url":"https://api.github.com/repos/mrsdizzie/test_repo/milestones{/number}","notifications_url":"https://api.github.com/repos/mrsdizzie/test_repo/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mrsdizzie/test_repo/labels{/name}","releases_url":"https://api.github.com/repos/mrsdizzie/test_repo/releases{/id}","deployments_url":"https://api.github.com/repos/mrsdizzie/test_repo/deployments","created_at":"2019-11-12T21:17:42Z","updated_at":"2019-11-12T21:18:46Z","pushed_at":"2019-11-12T21:53:39Z","git_url":"git://github.com/mrsdizzie/test_repo.git","ssh_url":"git@github.com:mrsdizzie/test_repo.git","clone_url":"https://github.com/mrsdizzie/test_repo.git","svn_url":"https://github.com/mrsdizzie/test_repo","homepage":null,"size":3,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"has_discussions":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"allow_forking":true,"is_template":false,"web_commit_signoff_required":false,"topics":[],"visibility":"public","forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"go-gitea:master","ref":"master","sha":"f32b0a9dfd09a60f616f29158f772cedd89942d2","user":{"login":"go-gitea","id":12724356,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEyNzI0MzU2","avatar_url":"https://avatars.githubusercontent.com/u/12724356?v=4","gravatar_id":"","url":"https://api.github.com/users/go-gitea","html_url":"https://github.com/go-gitea","followers_url":"https://api.github.com/users/go-gitea/followers","following_url":"https://api.github.com/users/go-gitea/following{/other_user}","gists_url":"https://api.github.com/users/go-gitea/gists{/gist_id}","starred_url":"https://api.github.com/users/go-gitea/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/go-gitea/subscriptions","organizations_url":"https://api.github.com/users/go-gitea/orgs","repos_url":"https://api.github.com/users/go-gitea/repos","events_url":"https://api.github.com/users/go-gitea/events{/privacy}","received_events_url":"https://api.github.com/users/go-gitea/received_events","type":"Organization","user_view_type":"public","site_admin":false},"repo":{"id":220672974,"node_id":"MDEwOlJlcG9zaXRvcnkyMjA2NzI5NzQ=","name":"test_repo","full_name":"go-gitea/test_repo","private":false,"owner":{"login":"go-gitea","id":12724356,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEyNzI0MzU2","avatar_url":"https://avatars.githubusercontent.com/u/12724356?v=4","gravatar_id":"","url":"https://api.github.com/users/go-gitea","html_url":"https://github.com/go-gitea","followers_url":"https://api.github.com/users/go-gitea/followers","following_url":"https://api.github.com/users/go-gitea/following{/other_user}","gists_url":"https://api.github.com/users/go-gitea/gists{/gist_id}","starred_url":"https://api.github.com/users/go-gitea/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/go-gitea/subscriptions","organizations_url":"https://api.github.com/users/go-gitea/orgs","repos_url":"https://api.github.com/users/go-gitea/repos","events_url":"https://api.github.com/users/go-gitea/events{/privacy}","received_events_url":"https://api.github.com/users/go-gitea/received_events","type":"Organization","user_view_type":"public","site_admin":false},"html_url":"https://github.com/go-gitea/test_repo","description":"Test repository for testing migration from github to gitea","fork":false,"url":"https://api.github.com/repos/go-gitea/test_repo","forks_url":"https://api.github.com/repos/go-gitea/test_repo/forks","keys_url":"https://api.github.com/repos/go-gitea/test_repo/keys{/key_id}","collaborators_url":"https://api.github.com/repos/go-gitea/test_repo/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/go-gitea/test_repo/teams","hooks_url":"https://api.github.com/repos/go-gitea/test_repo/hooks","issue_events_url":"https://api.github.com/repos/go-gitea/test_repo/issues/events{/number}","events_url":"https://api.github.com/repos/go-gitea/test_repo/events","assignees_url":"https://api.github.com/repos/go-gitea/test_repo/assignees{/user}","branches_url":"https://api.github.com/repos/go-gitea/test_repo/branches{/branch}","tags_url":"https://api.github.com/repos/go-gitea/test_repo/tags","blobs_url":"https://api.github.com/repos/go-gitea/test_repo/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/go-gitea/test_repo/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/go-gitea/test_repo/git/refs{/sha}","trees_url":"https://api.github.com/repos/go-gitea/test_repo/git/trees{/sha}","statuses_url":"https://api.github.com/repos/go-gitea/test_repo/statuses/{sha}","languages_url":"https://api.github.com/repos/go-gitea/test_repo/languages","stargazers_url":"https://api.github.com/repos/go-gitea/test_repo/stargazers","contributors_url":"https://api.github.com/repos/go-gitea/test_repo/contributors","subscribers_url":"https://api.github.com/repos/go-gitea/test_repo/subscribers","subscription_url":"https://api.github.com/repos/go-gitea/test_repo/subscription","commits_url":"https://api.github.com/repos/go-gitea/test_repo/commits{/sha}","git_commits_url":"https://api.github.com/repos/go-gitea/test_repo/git/commits{/sha}","comments_url":"https://api.github.com/repos/go-gitea/test_repo/comments{/number}","issue_comment_url":"https://api.github.com/repos/go-gitea/test_repo/issues/comments{/number}","contents_url":"https://api.github.com/repos/go-gitea/test_repo/contents/{+path}","compare_url":"https://api.github.com/repos/go-gitea/test_repo/compare/{base}...{head}","merges_url":"https://api.github.com/repos/go-gitea/test_repo/merges","archive_url":"https://api.github.com/repos/go-gitea/test_repo/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/go-gitea/test_repo/downloads","issues_url":"https://api.github.com/repos/go-gitea/test_repo/issues{/number}","pulls_url":"https://api.github.com/repos/go-gitea/test_repo/pulls{/number}","milestones_url":"https://api.github.com/repos/go-gitea/test_repo/milestones{/number}","notifications_url":"https://api.github.com/repos/go-gitea/test_repo/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/go-gitea/test_repo/labels{/name}","releases_url":"https://api.github.com/repos/go-gitea/test_repo/releases{/id}","deployments_url":"https://api.github.com/repos/go-gitea/test_repo/deployments","created_at":"2019-11-09T16:49:20Z","updated_at":"2023-03-02T14:02:26Z","pushed_at":"2019-11-12T21:54:19Z","git_url":"git://github.com/go-gitea/test_repo.git","ssh_url":"git@github.com:go-gitea/test_repo.git","clone_url":"https://github.com/go-gitea/test_repo.git","svn_url":"https://github.com/go-gitea/test_repo","homepage":null,"size":1,"stargazers_count":3,"watchers_count":3,"language":null,"has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"has_discussions":false,"forks_count":6,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":2,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"allow_forking":true,"is_template":false,"web_commit_signoff_required":false,"topics":["gitea"],"visibility":"public","forks":6,"open_issues":2,"watchers":3,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/go-gitea/test_repo/pulls/4"},"html":{"href":"https://github.com/go-gitea/test_repo/pull/4"},"issue":{"href":"https://api.github.com/repos/go-gitea/test_repo/issues/4"},"comments":{"href":"https://api.github.com/repos/go-gitea/test_repo/issues/4/comments"},"review_comments":{"href":"https://api.github.com/repos/go-gitea/test_repo/pulls/4/comments"},"review_comment":{"href":"https://api.github.com/repos/go-gitea/test_repo/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/go-gitea/test_repo/pulls/4/commits"},"statuses":{"href":"https://api.github.com/repos/go-gitea/test_repo/statuses/2be9101c543658591222acbee3eb799edfc3853d"}},"author_association":"MEMBER","auto_merge":null,"active_lock_reason":null}]
\ No newline at end of file
diff --git a/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Freleases%3Fpage=1&per_page=100 b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Freleases%3Fpage=1&per_page=100
new file mode 100644
index 0000000000..470f5c5769
--- /dev/null
+++ b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo%2Freleases%3Fpage=1&per_page=100
@@ -0,0 +1,24 @@
+Access-Control-Allow-Origin: *
+X-Frame-Options: deny
+Etag: W/"2986c85fcc06cc478457abb86a88ac7f065b6861e873ae0eeb9ac16a22efca45"
+X-Github-Api-Version-Selected: 2022-11-28
+X-Ratelimit-Used: 75
+X-Ratelimit-Resource: core
+Content-Type: application/json; charset=utf-8
+Cache-Control: private, max-age=60, s-maxage=60
+Vary: Accept, Authorization, Cookie, X-GitHub-OTP,Accept-Encoding, Accept, X-Requested-With
+X-Accepted-Oauth-Scopes: repo
+X-Ratelimit-Limit: 5000
+X-Ratelimit-Reset: 1730800941
+Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+X-Xss-Protection: 0
+Referrer-Policy: origin-when-cross-origin, strict-origin-when-cross-origin
+Content-Security-Policy: default-src 'none'
+X-Oauth-Scopes: 
+X-Github-Media-Type: github.v3; format=json
+X-Ratelimit-Remaining: 4925
+Access-Control-Expose-Headers: ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset
+X-Content-Type-Options: nosniff
+X-Github-Request-Id: C7CC:3118FC:3F5F41A:4035CB2:6729E6B4
+
+[{"url":"https://api.github.com/repos/go-gitea/test_repo/releases/21419432","assets_url":"https://api.github.com/repos/go-gitea/test_repo/releases/21419432/assets","upload_url":"https://uploads.github.com/repos/go-gitea/test_repo/releases/21419432/assets{?name,label}","html_url":"https://github.com/go-gitea/test_repo/releases/tag/v0.9.99","id":21419432,"author":{"login":"mrsdizzie","id":1669571,"node_id":"MDQ6VXNlcjE2Njk1NzE=","avatar_url":"https://avatars.githubusercontent.com/u/1669571?v=4","gravatar_id":"","url":"https://api.github.com/users/mrsdizzie","html_url":"https://github.com/mrsdizzie","followers_url":"https://api.github.com/users/mrsdizzie/followers","following_url":"https://api.github.com/users/mrsdizzie/following{/other_user}","gists_url":"https://api.github.com/users/mrsdizzie/gists{/gist_id}","starred_url":"https://api.github.com/users/mrsdizzie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrsdizzie/subscriptions","organizations_url":"https://api.github.com/users/mrsdizzie/orgs","repos_url":"https://api.github.com/users/mrsdizzie/repos","events_url":"https://api.github.com/users/mrsdizzie/events{/privacy}","received_events_url":"https://api.github.com/users/mrsdizzie/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"MDc6UmVsZWFzZTIxNDE5NDMy","tag_name":"v0.9.99","target_commitish":"master","name":"First Release","draft":false,"prerelease":false,"created_at":"2019-11-09T16:49:21Z","published_at":"2019-11-12T20:12:10Z","assets":[],"tarball_url":"https://api.github.com/repos/go-gitea/test_repo/tarball/v0.9.99","zipball_url":"https://api.github.com/repos/go-gitea/test_repo/zipball/v0.9.99","body":"A test release"}]
\ No newline at end of file

From 42eed7dbeaa39184a4e15285b72ca289ea9f1f48 Mon Sep 17 00:00:00 2001
From: xtex 
Date: Sun, 3 Nov 2024 09:36:09 +0800
Subject: [PATCH 312/443] i18n: Add dummy language for checking translation
 keys (#5785)

---
 modules/translation/i18n/dummy.go      | 66 ++++++++++++++++++++++++++
 modules/translation/i18n/dummy_test.go | 19 ++++++++
 modules/translation/translation.go     | 10 ++++
 modules/web/middleware/locale.go       |  6 ++-
 tests/integration/dummy_lang_test.go   | 24 ++++++++++
 5 files changed, 123 insertions(+), 2 deletions(-)
 create mode 100644 modules/translation/i18n/dummy.go
 create mode 100644 modules/translation/i18n/dummy_test.go
 create mode 100644 tests/integration/dummy_lang_test.go

diff --git a/modules/translation/i18n/dummy.go b/modules/translation/i18n/dummy.go
new file mode 100644
index 0000000000..fe15c250f4
--- /dev/null
+++ b/modules/translation/i18n/dummy.go
@@ -0,0 +1,66 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package i18n
+
+import (
+	"fmt"
+	"html/template"
+	"reflect"
+	"slices"
+	"strings"
+)
+
+type KeyLocale struct{}
+
+var _ Locale = (*KeyLocale)(nil)
+
+// HasKey implements Locale.
+func (k *KeyLocale) HasKey(trKey string) bool {
+	return true
+}
+
+// TrHTML implements Locale.
+func (k *KeyLocale) TrHTML(trKey string, trArgs ...any) template.HTML {
+	args := slices.Clone(trArgs)
+	for i, v := range args {
+		switch v := v.(type) {
+		case nil, bool, int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64, float32, float64, template.HTML:
+			// for most basic types (including template.HTML which is safe), just do nothing and use it
+		case string:
+			args[i] = template.HTMLEscapeString(v)
+		case fmt.Stringer:
+			args[i] = template.HTMLEscapeString(v.String())
+		default:
+			args[i] = template.HTMLEscapeString(fmt.Sprint(v))
+		}
+	}
+	return template.HTML(k.TrString(trKey, args...))
+}
+
+// TrString implements Locale.
+func (k *KeyLocale) TrString(trKey string, trArgs ...any) string {
+	return FormatDummy(trKey, trArgs...)
+}
+
+func FormatDummy(trKey string, args ...any) string {
+	if len(args) == 0 {
+		return fmt.Sprintf("(%s)", trKey)
+	}
+
+	fmtArgs := make([]any, 0, len(args)+1)
+	fmtArgs = append(fmtArgs, trKey)
+	for _, arg := range args {
+		val := reflect.ValueOf(arg)
+		if val.Kind() == reflect.Slice {
+			for i := 0; i < val.Len(); i++ {
+				fmtArgs = append(fmtArgs, val.Index(i).Interface())
+			}
+		} else {
+			fmtArgs = append(fmtArgs, arg)
+		}
+	}
+
+	template := fmt.Sprintf("(%%s: %s)", strings.Join(slices.Repeat([]string{"%v"}, len(fmtArgs)-1), ", "))
+	return fmt.Sprintf(template, fmtArgs...)
+}
diff --git a/modules/translation/i18n/dummy_test.go b/modules/translation/i18n/dummy_test.go
new file mode 100644
index 0000000000..7bc29ef839
--- /dev/null
+++ b/modules/translation/i18n/dummy_test.go
@@ -0,0 +1,19 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package i18n_test
+
+import (
+	"testing"
+
+	"code.gitea.io/gitea/modules/translation/i18n"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestFormatDummy(t *testing.T) {
+	assert.Equal(t, "(admin.config.git_max_diff_lines)", i18n.FormatDummy("admin.config.git_max_diff_lines"))
+	assert.Equal(t, "(dashboard)", i18n.FormatDummy("dashboard"))
+	assert.Equal(t, "(branch.create_branch: main)", i18n.FormatDummy("branch.create_branch", "main"))
+	assert.Equal(t, "(test.test: a, 1, true)", i18n.FormatDummy("test.test", "a", 1, true))
+}
diff --git a/modules/translation/translation.go b/modules/translation/translation.go
index 16eb55e28e..6687d3d817 100644
--- a/modules/translation/translation.go
+++ b/modules/translation/translation.go
@@ -160,6 +160,16 @@ func NewLocale(lang string) Locale {
 		defer lock.RUnlock()
 	}
 
+	if lang == "dummy" {
+		l := &locale{
+			Locale:     &i18n.KeyLocale{},
+			Lang:       lang,
+			LangName:   lang,
+			msgPrinter: message.NewPrinter(language.English),
+		}
+		return l
+	}
+
 	langName := "unknown"
 	if l, ok := allLangMap[lang]; ok {
 		langName = l.Name
diff --git a/modules/web/middleware/locale.go b/modules/web/middleware/locale.go
index 34a16f04e7..1f37407201 100644
--- a/modules/web/middleware/locale.go
+++ b/modules/web/middleware/locale.go
@@ -26,8 +26,10 @@ func Locale(resp http.ResponseWriter, req *http.Request) translation.Locale {
 		}
 	}
 
-	// Check again in case someone changes the supported language list.
-	if lang != "" && !i18n.DefaultLocales.HasLang(lang) {
+	if lang == "dummy" {
+		changeLang = false
+	} else if lang != "" && !i18n.DefaultLocales.HasLang(lang) {
+		// Check again in case someone changes the supported language list.
 		lang = ""
 		changeLang = false
 	}
diff --git a/tests/integration/dummy_lang_test.go b/tests/integration/dummy_lang_test.go
new file mode 100644
index 0000000000..d26ea6edc4
--- /dev/null
+++ b/tests/integration/dummy_lang_test.go
@@ -0,0 +1,24 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+	"net/http"
+	"testing"
+
+	"code.gitea.io/gitea/tests"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestKeyLocale(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	req := NewRequest(t, "GET", "/user2/repo1/issues?lang=dummy")
+	resp := MakeRequest(t, req, http.StatusOK)
+
+	htmlDoc := NewHTMLParser(t, resp.Body)
+	newButton := htmlDoc.doc.Find(".list-header-issues > .issue-list-new")
+	assert.Equal(t, "(repo.issues.new)", newButton.Text())
+}

From 64bf7f3696d2d0082031944d0a3d343df1cab702 Mon Sep 17 00:00:00 2001
From: Michael Kriese 
Date: Tue, 5 Nov 2024 11:16:19 +0100
Subject: [PATCH 313/443] test: enable gitea migration tests

---
 services/migrations/gitea_downloader_test.go  | 37 ++++++++-----------
 ...ET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo |  7 ++++
 ...gitea%2Ftest_repo%2Fissues%2F1%2Freactions | 10 +++++
 ...itea%2Ftest_repo%2Fissues%2F10%2Freactions | 10 +++++
 ...itea%2Ftest_repo%2Fissues%2F11%2Freactions | 10 +++++
 ...itea%2Ftest_repo%2Fissues%2F12%2Freactions | 10 +++++
 ...itea%2Ftest_repo%2Fissues%2F13%2Freactions | 10 +++++
 ...gitea%2Ftest_repo%2Fissues%2F2%2Freactions | 10 +++++
 ...gitea%2Ftest_repo%2Fissues%2F3%2Freactions | 10 +++++
 ...%2Fissues%2F4%2Fcomments%3Flimit=50&page=1 | 10 +++++
 ...gitea%2Ftest_repo%2Fissues%2F4%2Freactions | 10 +++++
 ...gitea%2Ftest_repo%2Fissues%2F5%2Freactions | 10 +++++
 ...gitea%2Ftest_repo%2Fissues%2F6%2Freactions | 10 +++++
 ...gitea%2Ftest_repo%2Fissues%2F7%2Freactions | 10 +++++
 ...gitea%2Ftest_repo%2Fissues%2F8%2Freactions | 10 +++++
 ...gitea%2Ftest_repo%2Fissues%2F9%2Freactions | 10 +++++
 ...o%2Fissues%2Fcomments%2F116550%2Freactions |  8 ++++
 ...o%2Fissues%2Fcomments%2F116552%2Freactions |  8 ++++
 ...ues%3Flimit=2&page=3&state=all&type=issues | 10 +++++
 ...es%3Flimit=50&page=1&state=all&type=issues |  9 +++++
 ...tea%2Ftest_repo%2Flabels%3Flimit=50&page=1 | 10 +++++
 ...o%2Fmilestones%3Flimit=50&page=1&state=all | 10 +++++
 ...po%2Fpulls%2F7%2Freviews%2F1770%2Fcomments |  8 ++++
 ...po%2Fpulls%2F7%2Freviews%2F1771%2Fcomments |  8 ++++
 ...po%2Fpulls%2F7%2Freviews%2F1772%2Fcomments |  8 ++++
 ...po%2Fpulls%2F7%2Freviews%3Flimit=50&page=1 |  9 +++++
 ...st_repo%2Fpulls%3Flimit=3&page=1&state=all | 10 +++++
 ...t_repo%2Fpulls%3Flimit=50&page=1&state=all |  9 +++++
 ...a%2Ftest_repo%2Freleases%3Flimit=50&page=1 |  9 +++++
 ...itea%2Ftest_repo%2Ftopics%3Flimit=0&page=1 | 10 +++++
 .../GET_%2Fapi%2Fv1%2Fsettings%2Fapi          |  8 ++++
 .../full_download/GET_%2Fapi%2Fv1%2Fversion   |  8 ++++
 32 files changed, 305 insertions(+), 21 deletions(-)
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F1%2Freactions
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F10%2Freactions
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F11%2Freactions
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F12%2Freactions
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F13%2Freactions
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F2%2Freactions
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F3%2Freactions
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F4%2Fcomments%3Flimit=50&page=1
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F4%2Freactions
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F5%2Freactions
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F6%2Freactions
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F7%2Freactions
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F8%2Freactions
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F9%2Freactions
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2Fcomments%2F116550%2Freactions
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2Fcomments%2F116552%2Freactions
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%3Flimit=2&page=3&state=all&type=issues
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%3Flimit=50&page=1&state=all&type=issues
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Flabels%3Flimit=50&page=1
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fmilestones%3Flimit=50&page=1&state=all
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%2F7%2Freviews%2F1770%2Fcomments
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%2F7%2Freviews%2F1771%2Fcomments
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%2F7%2Freviews%2F1772%2Fcomments
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%2F7%2Freviews%3Flimit=50&page=1
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%3Flimit=3&page=1&state=all
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%3Flimit=50&page=1&state=all
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Freleases%3Flimit=50&page=1
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Ftopics%3Flimit=0&page=1
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Fsettings%2Fapi
 create mode 100644 services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Fversion

diff --git a/services/migrations/gitea_downloader_test.go b/services/migrations/gitea_downloader_test.go
index 28a52c202d..8429682613 100644
--- a/services/migrations/gitea_downloader_test.go
+++ b/services/migrations/gitea_downloader_test.go
@@ -5,12 +5,12 @@ package migrations
 
 import (
 	"context"
-	"net/http"
 	"os"
 	"sort"
 	"testing"
 	"time"
 
+	"code.gitea.io/gitea/models/unittest"
 	base "code.gitea.io/gitea/modules/migration"
 
 	"github.com/stretchr/testify/assert"
@@ -18,18 +18,13 @@ import (
 )
 
 func TestGiteaDownloadRepo(t *testing.T) {
-	// Skip tests if Gitea token is not found
 	giteaToken := os.Getenv("GITEA_TOKEN")
-	if giteaToken == "" {
-		t.Skip("skipped test because GITEA_TOKEN was not in the environment")
-	}
 
-	resp, err := http.Get("https://gitea.com/gitea")
-	if err != nil || resp.StatusCode != http.StatusOK {
-		t.Skipf("Can't reach https://gitea.com, skipping %s", t.Name())
-	}
+	fixturePath := "./testdata/gitea/full_download"
+	server := unittest.NewMockWebServer(t, "https://gitea.com", fixturePath, giteaToken != "")
+	defer server.Close()
 
-	downloader, err := NewGiteaDownloader(context.Background(), "https://gitea.com", "gitea/test_repo", "", "", giteaToken)
+	downloader, err := NewGiteaDownloader(context.Background(), server.URL, "gitea/test_repo", "", "", giteaToken)
 	if downloader == nil {
 		t.Fatal("NewGitlabDownloader is nil")
 	}
@@ -42,8 +37,8 @@ func TestGiteaDownloadRepo(t *testing.T) {
 		Owner:         "gitea",
 		IsPrivate:     false,
 		Description:   "Test repository for testing migration from gitea to gitea",
-		CloneURL:      "https://gitea.com/gitea/test_repo.git",
-		OriginalURL:   "https://gitea.com/gitea/test_repo",
+		CloneURL:      server.URL + "/gitea/test_repo.git",
+		OriginalURL:   server.URL + "/gitea/test_repo",
 		DefaultBranch: "master",
 	}, repo)
 
@@ -89,7 +84,7 @@ func TestGiteaDownloadRepo(t *testing.T) {
 			Title:    "V2 Finalize",
 			Created:  time.Unix(0, 0),
 			Deadline: timePtr(time.Unix(1599263999, 0)),
-			Updated:  timePtr(time.Unix(0, 0)),
+			Updated:  timePtr(time.Date(2022, 11, 13, 5, 29, 15, 0, time.UTC)),
 			State:    "open",
 		},
 		{
@@ -116,7 +111,7 @@ func TestGiteaDownloadRepo(t *testing.T) {
 			Published:       time.Date(2020, 9, 1, 18, 2, 43, 0, time.UTC),
 			PublisherID:     689,
 			PublisherName:   "6543",
-			PublisherEmail:  "6543@obermui.de",
+			PublisherEmail:  "6543@noreply.gitea.com",
 		},
 		{
 			Name:            "First Release",
@@ -129,7 +124,7 @@ func TestGiteaDownloadRepo(t *testing.T) {
 			Published:       time.Date(2020, 9, 1, 17, 30, 32, 0, time.UTC),
 			PublisherID:     689,
 			PublisherName:   "6543",
-			PublisherEmail:  "6543@obermui.de",
+			PublisherEmail:  "6543@noreply.gitea.com",
 		},
 	}, releases)
 
@@ -203,7 +198,7 @@ func TestGiteaDownloadRepo(t *testing.T) {
 			IssueIndex:  4,
 			PosterID:    689,
 			PosterName:  "6543",
-			PosterEmail: "6543@obermui.de",
+			PosterEmail: "6543@noreply.gitea.com",
 			Created:     time.Unix(1598975370, 0),
 			Updated:     time.Unix(1599070865, 0),
 			Content:     "a really good question!\n\nIt is the used as TESTSET for gitea2gitea repo migration function",
@@ -212,7 +207,7 @@ func TestGiteaDownloadRepo(t *testing.T) {
 			IssueIndex:  4,
 			PosterID:    -1,
 			PosterName:  "Ghost",
-			PosterEmail: "",
+			PosterEmail: "ghost@noreply.gitea.com",
 			Created:     time.Unix(1598975393, 0),
 			Updated:     time.Unix(1598975393, 0),
 			Content:     "Oh!",
@@ -239,7 +234,7 @@ func TestGiteaDownloadRepo(t *testing.T) {
 		IsLocked:    false,
 		Created:     time.Unix(1598982759, 0),
 		Updated:     time.Unix(1599023425, 0),
-		Closed:      timePtr(time.Unix(1598982934, 0)),
+		Closed:      timePtr(time.Date(2020, 9, 1, 17, 55, 33, 0, time.UTC)),
 		Assignees:   []string{"techknowlogick"},
 		Base: base.PullRequestBranch{
 			CloneURL:  "",
@@ -249,7 +244,7 @@ func TestGiteaDownloadRepo(t *testing.T) {
 			OwnerName: "gitea",
 		},
 		Head: base.PullRequestBranch{
-			CloneURL:  "https://gitea.com/6543-forks/test_repo.git",
+			CloneURL:  server.URL + "/6543-forks/test_repo.git",
 			Ref:       "refs/pull/12/head",
 			SHA:       "b6ab5d9ae000b579a5fff03f92c486da4ddf48b6",
 			RepoName:  "test_repo",
@@ -258,7 +253,7 @@ func TestGiteaDownloadRepo(t *testing.T) {
 		Merged:         true,
 		MergedTime:     timePtr(time.Unix(1598982934, 0)),
 		MergeCommitSHA: "827aa28a907853e5ddfa40c8f9bc52471a2685fd",
-		PatchURL:       "https://gitea.com/gitea/test_repo/pulls/12.patch",
+		PatchURL:       server.URL + "/gitea/test_repo/pulls/12.patch",
 	}, prs[1])
 
 	reviews, err := downloader.GetReviews(&base.Issue{Number: 7, ForeignIndex: 7})
@@ -285,7 +280,7 @@ func TestGiteaDownloadRepo(t *testing.T) {
 					PosterID:  689,
 					Reactions: nil,
 					CreatedAt: time.Date(2020, 9, 1, 16, 12, 58, 0, time.UTC),
-					UpdatedAt: time.Date(2020, 9, 1, 16, 12, 58, 0, time.UTC),
+					UpdatedAt: time.Date(2024, 6, 3, 1, 18, 36, 0, time.UTC),
 				},
 			},
 		},
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo
new file mode 100644
index 0000000000..df201d9072
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo
@@ -0,0 +1,7 @@
+X-Frame-Options: SAMEORIGIN
+Content-Type: application/json;charset=utf-8
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Vary: Origin
+X-Content-Type-Options: nosniff
+
+{"id":16268,"owner":{"id":3,"login":"gitea","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/35dea380390772b3130aafbac7ca49e6","html_url":"https://gitea.com/gitea","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2018-11-29T03:16:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"Git Universe","website":"https://about.gitea.com","description":"Git with a cup of tea","visibility":"public","followers_count":53,"following_count":0,"starred_repos_count":0,"username":"gitea"},"name":"test_repo","full_name":"gitea/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":false,"template":false,"parent":null,"mirror":false,"size":68,"language":"","languages_url":"https://gitea.com/api/v1/repos/gitea/test_repo/languages","html_url":"https://gitea.com/gitea/test_repo","url":"https://gitea.com/api/v1/repos/gitea/test_repo","link":"","ssh_url":"git@gitea.com:gitea/test_repo.git","clone_url":"https://gitea.com/gitea/test_repo.git","original_url":"","website":"","stars_count":1,"forks_count":2,"watchers_count":9,"open_issues_count":2,"open_pr_counter":2,"release_counter":2,"default_branch":"master","archived":false,"created_at":"2020-09-01T00:12:27Z","updated_at":"2020-09-01T18:03:41Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":true,"internal_tracker":{"enable_time_tracker":true,"allow_only_contributors_to_track_time":true,"enable_issue_dependencies":true},"has_wiki":true,"has_pull_requests":true,"has_projects":true,"projects_mode":"","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":true,"allow_rebase":true,"allow_rebase_explicit":true,"allow_squash_merge":true,"allow_fast_forward_only_merge":false,"allow_rebase_update":true,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":["gitea","test","migration","ci"],"licenses":null}
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F1%2Freactions b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F1%2Freactions
new file mode 100644
index 0000000000..5a0d95e0c7
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F1%2Freactions
@@ -0,0 +1,10 @@
+Access-Control-Expose-Headers: X-Total-Count
+X-Total-Count: 2
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Vary: Origin
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+Content-Type: application/json;charset=utf-8
+Content-Length: 1293
+
+[{"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"content":"gitea","created_at":"2020-09-01T00:15:14Z"},{"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"content":"confused","created_at":"2020-09-01T00:15:19Z"}]
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F10%2Freactions b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F10%2Freactions
new file mode 100644
index 0000000000..a6b09b769c
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F10%2Freactions
@@ -0,0 +1,10 @@
+Content-Length: 5
+Vary: Origin
+X-Content-Type-Options: nosniff
+X-Total-Count: 0
+Content-Type: application/json;charset=utf-8
+Access-Control-Expose-Headers: X-Total-Count
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+X-Frame-Options: SAMEORIGIN
+
+null
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F11%2Freactions b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F11%2Freactions
new file mode 100644
index 0000000000..139c547d0a
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F11%2Freactions
@@ -0,0 +1,10 @@
+Access-Control-Expose-Headers: X-Total-Count
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+X-Total-Count: 0
+Content-Type: application/json;charset=utf-8
+Content-Length: 5
+Vary: Origin
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+
+null
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F12%2Freactions b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F12%2Freactions
new file mode 100644
index 0000000000..94b815b3a1
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F12%2Freactions
@@ -0,0 +1,10 @@
+X-Frame-Options: SAMEORIGIN
+Access-Control-Expose-Headers: X-Total-Count
+X-Content-Type-Options: nosniff
+Vary: Origin
+X-Total-Count: 0
+Content-Type: application/json;charset=utf-8
+Content-Length: 5
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+
+null
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F13%2Freactions b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F13%2Freactions
new file mode 100644
index 0000000000..95b1b871d6
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F13%2Freactions
@@ -0,0 +1,10 @@
+Content-Length: 5
+Access-Control-Expose-Headers: X-Total-Count
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Vary: Origin
+X-Frame-Options: SAMEORIGIN
+Content-Type: application/json;charset=utf-8
+X-Content-Type-Options: nosniff
+X-Total-Count: 0
+
+null
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F2%2Freactions b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F2%2Freactions
new file mode 100644
index 0000000000..5d94bfa369
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F2%2Freactions
@@ -0,0 +1,10 @@
+Access-Control-Expose-Headers: X-Total-Count
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+X-Frame-Options: SAMEORIGIN
+X-Total-Count: 0
+Content-Type: application/json;charset=utf-8
+Content-Length: 5
+Vary: Origin
+X-Content-Type-Options: nosniff
+
+null
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F3%2Freactions b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F3%2Freactions
new file mode 100644
index 0000000000..1f244a25f5
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F3%2Freactions
@@ -0,0 +1,10 @@
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+Content-Type: application/json;charset=utf-8
+Content-Length: 5
+Access-Control-Expose-Headers: X-Total-Count
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Vary: Origin
+X-Total-Count: 0
+
+null
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F4%2Fcomments%3Flimit=50&page=1 b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F4%2Fcomments%3Flimit=50&page=1
new file mode 100644
index 0000000000..bf66eb26e3
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F4%2Fcomments%3Flimit=50&page=1
@@ -0,0 +1,10 @@
+X-Frame-Options: SAMEORIGIN
+X-Total-Count: 2
+Content-Type: application/json;charset=utf-8
+Access-Control-Expose-Headers: X-Total-Count
+X-Content-Type-Options: nosniff
+Content-Length: 1824
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Vary: Origin
+
+[{"id":116550,"html_url":"https://gitea.com/gitea/test_repo/issues/4#issuecomment-116550","pull_request_url":"","issue_url":"https://gitea.com/gitea/test_repo/issues/4","user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@noreply.gitea.com","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"original_author":"","original_author_id":0,"body":"a really good question!\n\nIt is the used as TESTSET for gitea2gitea repo migration function","assets":[],"created_at":"2020-09-01T15:49:30Z","updated_at":"2020-09-02T18:21:05Z"},{"id":116552,"html_url":"https://gitea.com/gitea/test_repo/issues/4#issuecomment-116552","pull_request_url":"","issue_url":"https://gitea.com/gitea/test_repo/issues/4","user":{"id":-1,"login":"Ghost","login_name":"","source_id":0,"full_name":"","email":"ghost@noreply.gitea.com","avatar_url":"https://gitea.com/assets/img/avatar_default.png","html_url":"https://gitea.com/Ghost","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"1970-01-01T00:00:00Z","restricted":false,"active":false,"prohibit_login":false,"location":"","website":"","description":"","visibility":"public","followers_count":0,"following_count":0,"starred_repos_count":0,"username":"Ghost"},"original_author":"","original_author_id":0,"body":"Oh!","assets":[],"created_at":"2020-09-01T15:49:53Z","updated_at":"2020-09-01T15:49:53Z"}]
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F4%2Freactions b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F4%2Freactions
new file mode 100644
index 0000000000..25cefa8da8
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F4%2Freactions
@@ -0,0 +1,10 @@
+X-Frame-Options: SAMEORIGIN
+X-Total-Count: 2
+Access-Control-Expose-Headers: X-Total-Count
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Vary: Origin
+X-Content-Type-Options: nosniff
+Content-Type: application/json;charset=utf-8
+Content-Length: 1290
+
+[{"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"content":"gitea","created_at":"2020-09-01T19:36:40Z"},{"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"content":"laugh","created_at":"2020-09-01T19:36:45Z"}]
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F5%2Freactions b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F5%2Freactions
new file mode 100644
index 0000000000..7d62b318a9
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F5%2Freactions
@@ -0,0 +1,10 @@
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+Content-Length: 1288
+Access-Control-Expose-Headers: X-Total-Count
+Vary: Origin
+Content-Type: application/json;charset=utf-8
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+X-Total-Count: 2
+
+[{"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"content":"+1","created_at":"2020-09-01T16:07:06Z"},{"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"content":"hooray","created_at":"2020-09-01T16:07:11Z"}]
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F6%2Freactions b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F6%2Freactions
new file mode 100644
index 0000000000..f25996bc6b
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F6%2Freactions
@@ -0,0 +1,10 @@
+Access-Control-Expose-Headers: X-Total-Count
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+Content-Type: application/json;charset=utf-8
+Content-Length: 5
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Vary: Origin
+X-Total-Count: 0
+
+null
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F7%2Freactions b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F7%2Freactions
new file mode 100644
index 0000000000..926a987090
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F7%2Freactions
@@ -0,0 +1,10 @@
+Content-Type: application/json;charset=utf-8
+Access-Control-Expose-Headers: X-Total-Count
+X-Content-Type-Options: nosniff
+X-Total-Count: 0
+Content-Length: 5
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Vary: Origin
+X-Frame-Options: SAMEORIGIN
+
+null
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F8%2Freactions b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F8%2Freactions
new file mode 100644
index 0000000000..abaff9c6fd
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F8%2Freactions
@@ -0,0 +1,10 @@
+Vary: Origin
+X-Frame-Options: SAMEORIGIN
+X-Total-Count: 0
+Content-Type: application/json;charset=utf-8
+Content-Length: 5
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Access-Control-Expose-Headers: X-Total-Count
+X-Content-Type-Options: nosniff
+
+null
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F9%2Freactions b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F9%2Freactions
new file mode 100644
index 0000000000..75de9623c7
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2F9%2Freactions
@@ -0,0 +1,10 @@
+X-Total-Count: 0
+Content-Type: application/json;charset=utf-8
+Content-Length: 5
+Access-Control-Expose-Headers: X-Total-Count
+X-Frame-Options: SAMEORIGIN
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Vary: Origin
+X-Content-Type-Options: nosniff
+
+null
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2Fcomments%2F116550%2Freactions b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2Fcomments%2F116550%2Freactions
new file mode 100644
index 0000000000..86ac9f784f
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2Fcomments%2F116550%2Freactions
@@ -0,0 +1,8 @@
+Vary: Origin
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+Content-Type: application/json;charset=utf-8
+Content-Length: 5
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+
+null
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2Fcomments%2F116552%2Freactions b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2Fcomments%2F116552%2Freactions
new file mode 100644
index 0000000000..94133432e8
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%2Fcomments%2F116552%2Freactions
@@ -0,0 +1,8 @@
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+Content-Type: application/json;charset=utf-8
+Content-Length: 5
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Vary: Origin
+
+null
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%3Flimit=2&page=3&state=all&type=issues b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%3Flimit=2&page=3&state=all&type=issues
new file mode 100644
index 0000000000..9133152709
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%3Flimit=2&page=3&state=all&type=issues
@@ -0,0 +1,10 @@
+Link: ; rel="next",; rel="last",; rel="first",; rel="prev"
+Access-Control-Expose-Headers: Link, X-Total-Count
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+X-Total-Count: 7
+Content-Type: application/json;charset=utf-8
+Vary: Origin
+
+[{"id":30475,"url":"https://gitea.com/api/v1/repos/gitea/test_repo/issues/4","html_url":"https://gitea.com/gitea/test_repo/issues/4","number":4,"user":{"id":-1,"login":"Ghost","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/assets/img/avatar_default.png","html_url":"https://gitea.com/Ghost","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"1970-01-01T00:00:00Z","restricted":false,"active":false,"prohibit_login":false,"location":"","website":"","description":"","visibility":"public","followers_count":0,"following_count":0,"starred_repos_count":0,"username":"Ghost"},"original_author":"","original_author_id":0,"title":"what is this repo about?","body":"","ref":"","assets":[],"labels":[{"id":3733,"name":"Question","exclusive":false,"is_archived":false,"color":"fbca04","description":"","url":"https://gitea.com/api/v1/repos/gitea/test_repo/labels/3733"}],"milestone":{"id":1300,"title":"V1","description":"Generate Content","state":"closed","open_issues":0,"closed_issues":4,"created_at":"1970-01-01T00:00:00Z","updated_at":"1970-01-01T00:00:00Z","closed_at":"2020-09-01T18:36:46Z","due_on":null},"assignee":null,"assignees":null,"state":"closed","is_locked":true,"comments":2,"created_at":"2020-09-01T15:48:41Z","updated_at":"2020-09-01T15:50:00Z","closed_at":"2020-09-01T15:49:34Z","due_date":null,"pull_request":null,"repository":{"id":16268,"name":"test_repo","owner":"gitea","full_name":"gitea/test_repo"},"pin_order":0},{"id":30471,"url":"https://gitea.com/api/v1/repos/gitea/test_repo/issues/2","html_url":"https://gitea.com/gitea/test_repo/issues/2","number":2,"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"original_author":"","original_author_id":0,"title":"Spam","body":":(","ref":"","assets":[],"labels":[{"id":3732,"name":"Invalid","exclusive":false,"is_archived":false,"color":"d4c5f9","description":"","url":"https://gitea.com/api/v1/repos/gitea/test_repo/labels/3732"}],"milestone":null,"assignee":null,"assignees":null,"state":"closed","is_locked":false,"comments":2,"created_at":"2020-09-01T00:23:00Z","updated_at":"2020-09-01T14:11:37Z","closed_at":"2020-09-01T14:11:37Z","due_date":null,"pull_request":null,"repository":{"id":16268,"name":"test_repo","owner":"gitea","full_name":"gitea/test_repo"},"pin_order":0}]
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%3Flimit=50&page=1&state=all&type=issues b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%3Flimit=50&page=1&state=all&type=issues
new file mode 100644
index 0000000000..47ff443ac1
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fissues%3Flimit=50&page=1&state=all&type=issues
@@ -0,0 +1,9 @@
+Content-Type: application/json;charset=utf-8
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+X-Total-Count: 7
+Access-Control-Expose-Headers: X-Total-Count
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Vary: Origin
+
+[{"id":30481,"url":"https://gitea.com/api/v1/repos/gitea/test_repo/issues/10","html_url":"https://gitea.com/gitea/test_repo/issues/10","number":10,"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"original_author":"","original_author_id":0,"title":"A'm I allowed to fork it?","body":"yes but do not create pull requests anymore","ref":"","assets":[],"labels":[{"id":3733,"name":"Question","exclusive":false,"is_archived":false,"color":"fbca04","description":"","url":"https://gitea.com/api/v1/repos/gitea/test_repo/labels/3733"}],"milestone":null,"assignee":null,"assignees":null,"state":"open","is_locked":false,"comments":0,"created_at":"2020-09-01T17:48:14Z","updated_at":"2020-09-01T17:48:14Z","closed_at":null,"due_date":null,"pull_request":null,"repository":{"id":16268,"name":"test_repo","owner":"gitea","full_name":"gitea/test_repo"},"pin_order":0},{"id":30480,"url":"https://gitea.com/api/v1/repos/gitea/test_repo/issues/9","html_url":"https://gitea.com/gitea/test_repo/issues/9","number":9,"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"original_author":"","original_author_id":0,"title":"Idears","body":"this is an example for an open issue - they just cant be all closed ;)","ref":"","assets":[],"labels":[{"id":3735,"name":"Enhancement","exclusive":false,"is_archived":false,"color":"207de5","description":"","url":"https://gitea.com/api/v1/repos/gitea/test_repo/labels/3735"}],"milestone":{"id":1301,"title":"V2 Finalize","description":"","state":"open","open_issues":1,"closed_issues":2,"created_at":"1970-01-01T00:00:00Z","updated_at":"2022-11-13T05:29:15Z","closed_at":null,"due_on":"2020-09-04T23:59:59Z"},"assignee":null,"assignees":null,"state":"open","is_locked":false,"comments":0,"created_at":"2020-09-01T17:47:11Z","updated_at":"2020-09-01T17:47:17Z","closed_at":null,"due_date":null,"pull_request":null,"repository":{"id":16268,"name":"test_repo","owner":"gitea","full_name":"gitea/test_repo"},"pin_order":0},{"id":30477,"url":"https://gitea.com/api/v1/repos/gitea/test_repo/issues/6","html_url":"https://gitea.com/gitea/test_repo/issues/6","number":6,"user":{"id":9,"login":"techknowlogick","login_name":"","source_id":0,"full_name":"","email":"techknowlogick@noreply.gitea.com","avatar_url":"https://gitea.com/avatars/9b588dd0b384d6f6ae841c5d62302033","html_url":"https://gitea.com/techknowlogick","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-01-14T06:48:35Z","restricted":false,"active":false,"prohibit_login":false,"location":"","website":"https://techknowlogick.com","description":"","visibility":"public","followers_count":11,"following_count":1,"starred_repos_count":4,"username":"techknowlogick"},"original_author":"","original_author_id":0,"title":"Please add a tag (or a release)","body":"","ref":"","assets":[],"labels":[],"milestone":null,"assignee":null,"assignees":null,"state":"closed","is_locked":false,"comments":1,"created_at":"2020-09-01T16:07:01Z","updated_at":"2020-09-01T17:26:02Z","closed_at":"2020-09-01T17:26:02Z","due_date":null,"pull_request":null,"repository":{"id":16268,"name":"test_repo","owner":"gitea","full_name":"gitea/test_repo"},"pin_order":0},{"id":30476,"url":"https://gitea.com/api/v1/repos/gitea/test_repo/issues/5","html_url":"https://gitea.com/gitea/test_repo/issues/5","number":5,"user":{"id":9,"login":"techknowlogick","login_name":"","source_id":0,"full_name":"","email":"techknowlogick@noreply.gitea.com","avatar_url":"https://gitea.com/avatars/9b588dd0b384d6f6ae841c5d62302033","html_url":"https://gitea.com/techknowlogick","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-01-14T06:48:35Z","restricted":false,"active":false,"prohibit_login":false,"location":"","website":"https://techknowlogick.com","description":"","visibility":"public","followers_count":11,"following_count":1,"starred_repos_count":4,"username":"techknowlogick"},"original_author":"","original_author_id":0,"title":"Need more contributors to this repo","body":"I volunteer as one","ref":"","assets":[],"labels":[],"milestone":{"id":1301,"title":"V2 Finalize","description":"","state":"open","open_issues":1,"closed_issues":2,"created_at":"1970-01-01T00:00:00Z","updated_at":"2022-11-13T05:29:15Z","closed_at":null,"due_on":"2020-09-04T23:59:59Z"},"assignee":null,"assignees":null,"state":"closed","is_locked":false,"comments":1,"created_at":"2020-09-01T16:06:30Z","updated_at":"2020-09-01T17:46:09Z","closed_at":"2020-09-01T17:46:09Z","due_date":null,"pull_request":null,"repository":{"id":16268,"name":"test_repo","owner":"gitea","full_name":"gitea/test_repo"},"pin_order":0},{"id":30475,"url":"https://gitea.com/api/v1/repos/gitea/test_repo/issues/4","html_url":"https://gitea.com/gitea/test_repo/issues/4","number":4,"user":{"id":-1,"login":"Ghost","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/assets/img/avatar_default.png","html_url":"https://gitea.com/Ghost","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"1970-01-01T00:00:00Z","restricted":false,"active":false,"prohibit_login":false,"location":"","website":"","description":"","visibility":"public","followers_count":0,"following_count":0,"starred_repos_count":0,"username":"Ghost"},"original_author":"","original_author_id":0,"title":"what is this repo about?","body":"","ref":"","assets":[],"labels":[{"id":3733,"name":"Question","exclusive":false,"is_archived":false,"color":"fbca04","description":"","url":"https://gitea.com/api/v1/repos/gitea/test_repo/labels/3733"}],"milestone":{"id":1300,"title":"V1","description":"Generate Content","state":"closed","open_issues":0,"closed_issues":4,"created_at":"1970-01-01T00:00:00Z","updated_at":"1970-01-01T00:00:00Z","closed_at":"2020-09-01T18:36:46Z","due_on":null},"assignee":null,"assignees":null,"state":"closed","is_locked":true,"comments":2,"created_at":"2020-09-01T15:48:41Z","updated_at":"2020-09-01T15:50:00Z","closed_at":"2020-09-01T15:49:34Z","due_date":null,"pull_request":null,"repository":{"id":16268,"name":"test_repo","owner":"gitea","full_name":"gitea/test_repo"},"pin_order":0},{"id":30471,"url":"https://gitea.com/api/v1/repos/gitea/test_repo/issues/2","html_url":"https://gitea.com/gitea/test_repo/issues/2","number":2,"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"original_author":"","original_author_id":0,"title":"Spam","body":":(","ref":"","assets":[],"labels":[{"id":3732,"name":"Invalid","exclusive":false,"is_archived":false,"color":"d4c5f9","description":"","url":"https://gitea.com/api/v1/repos/gitea/test_repo/labels/3732"}],"milestone":null,"assignee":null,"assignees":null,"state":"closed","is_locked":false,"comments":2,"created_at":"2020-09-01T00:23:00Z","updated_at":"2020-09-01T14:11:37Z","closed_at":"2020-09-01T14:11:37Z","due_date":null,"pull_request":null,"repository":{"id":16268,"name":"test_repo","owner":"gitea","full_name":"gitea/test_repo"},"pin_order":0},{"id":30470,"url":"https://gitea.com/api/v1/repos/gitea/test_repo/issues/1","html_url":"https://gitea.com/gitea/test_repo/issues/1","number":1,"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"original_author":"","original_author_id":0,"title":"Here Is no content!","body":"","ref":"","assets":[],"labels":[{"id":3734,"name":"Valid","exclusive":false,"is_archived":false,"color":"53e917","description":"","url":"https://gitea.com/api/v1/repos/gitea/test_repo/labels/3734"}],"milestone":{"id":1300,"title":"V1","description":"Generate Content","state":"closed","open_issues":0,"closed_issues":4,"created_at":"1970-01-01T00:00:00Z","updated_at":"1970-01-01T00:00:00Z","closed_at":"2020-09-01T18:36:46Z","due_on":null},"assignee":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@noreply.gitea.com","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"assignees":[{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@noreply.gitea.com","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"}],"state":"closed","is_locked":false,"comments":0,"created_at":"2020-09-01T00:15:11Z","updated_at":"2020-09-01T17:26:25Z","closed_at":"2020-09-01T17:26:25Z","due_date":null,"pull_request":null,"repository":{"id":16268,"name":"test_repo","owner":"gitea","full_name":"gitea/test_repo"},"pin_order":0}]
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Flabels%3Flimit=50&page=1 b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Flabels%3Flimit=50&page=1
new file mode 100644
index 0000000000..0c5e5c4b37
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Flabels%3Flimit=50&page=1
@@ -0,0 +1,10 @@
+Content-Type: application/json;charset=utf-8
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Vary: Origin
+X-Frame-Options: SAMEORIGIN
+X-Total-Count: 6
+Content-Length: 1026
+Access-Control-Expose-Headers: X-Total-Count
+X-Content-Type-Options: nosniff
+
+[{"id":3730,"name":"Bug","exclusive":false,"is_archived":false,"color":"e11d21","description":"","url":"https://gitea.com/api/v1/repos/gitea/test_repo/labels/3730"},{"id":3735,"name":"Enhancement","exclusive":false,"is_archived":false,"color":"207de5","description":"","url":"https://gitea.com/api/v1/repos/gitea/test_repo/labels/3735"},{"id":3731,"name":"Feature","exclusive":false,"is_archived":false,"color":"0052cc","description":"a feature request","url":"https://gitea.com/api/v1/repos/gitea/test_repo/labels/3731"},{"id":3732,"name":"Invalid","exclusive":false,"is_archived":false,"color":"d4c5f9","description":"","url":"https://gitea.com/api/v1/repos/gitea/test_repo/labels/3732"},{"id":3733,"name":"Question","exclusive":false,"is_archived":false,"color":"fbca04","description":"","url":"https://gitea.com/api/v1/repos/gitea/test_repo/labels/3733"},{"id":3734,"name":"Valid","exclusive":false,"is_archived":false,"color":"53e917","description":"","url":"https://gitea.com/api/v1/repos/gitea/test_repo/labels/3734"}]
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fmilestones%3Flimit=50&page=1&state=all b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fmilestones%3Flimit=50&page=1&state=all
new file mode 100644
index 0000000000..56855b5788
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fmilestones%3Flimit=50&page=1&state=all
@@ -0,0 +1,10 @@
+Access-Control-Expose-Headers: X-Total-Count
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+X-Frame-Options: SAMEORIGIN
+X-Total-Count: 2
+Content-Type: application/json;charset=utf-8
+Content-Length: 453
+Vary: Origin
+X-Content-Type-Options: nosniff
+
+[{"id":1301,"title":"V2 Finalize","description":"","state":"open","open_issues":1,"closed_issues":2,"created_at":"1970-01-01T00:00:00Z","updated_at":"2022-11-13T05:29:15Z","closed_at":null,"due_on":"2020-09-04T23:59:59Z"},{"id":1300,"title":"V1","description":"Generate Content","state":"closed","open_issues":0,"closed_issues":4,"created_at":"1970-01-01T00:00:00Z","updated_at":"1970-01-01T00:00:00Z","closed_at":"2020-09-01T18:36:46Z","due_on":null}]
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%2F7%2Freviews%2F1770%2Fcomments b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%2F7%2Freviews%2F1770%2Fcomments
new file mode 100644
index 0000000000..81e4dcfd7f
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%2F7%2Freviews%2F1770%2Fcomments
@@ -0,0 +1,8 @@
+Content-Type: application/json;charset=utf-8
+Content-Length: 1211
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Vary: Origin
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+
+[{"id":116561,"body":"is one `\\newline` to less?","user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"resolver":null,"pull_request_review_id":1770,"created_at":"2020-09-01T16:12:58Z","updated_at":"2024-06-03T01:18:36Z","path":"README.md","commit_id":"187ece0cb6631e2858a6872e5733433bb3ca3b03","original_commit_id":"","diff_hunk":"@@ -2,3 +2,3 @@\n \n-Test repository for testing migration from gitea 2 gitea\n\\ No newline at end of file\n+Test repository for testing migration from gitea 2 gitea","position":4,"original_position":0,"html_url":"https://gitea.com/gitea/test_repo/pulls/7#issuecomment-116561","pull_request_url":"https://gitea.com/gitea/test_repo/pulls/7"}]
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%2F7%2Freviews%2F1771%2Fcomments b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%2F7%2Freviews%2F1771%2Fcomments
new file mode 100644
index 0000000000..192224be31
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%2F7%2Freviews%2F1771%2Fcomments
@@ -0,0 +1,8 @@
+Vary: Origin
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+Content-Type: application/json;charset=utf-8
+Content-Length: 3
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+
+[]
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%2F7%2Freviews%2F1772%2Fcomments b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%2F7%2Freviews%2F1772%2Fcomments
new file mode 100644
index 0000000000..5652a52001
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%2F7%2Freviews%2F1772%2Fcomments
@@ -0,0 +1,8 @@
+Content-Type: application/json;charset=utf-8
+Content-Length: 3
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Vary: Origin
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+
+[]
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%2F7%2Freviews%3Flimit=50&page=1 b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%2F7%2Freviews%3Flimit=50&page=1
new file mode 100644
index 0000000000..8e54635dfc
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%2F7%2Freviews%3Flimit=50&page=1
@@ -0,0 +1,9 @@
+Access-Control-Expose-Headers: X-Total-Count
+X-Content-Type-Options: nosniff
+Content-Type: application/json;charset=utf-8
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Vary: Origin
+X-Frame-Options: SAMEORIGIN
+X-Total-Count: 3
+
+[{"id":1770,"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"team":null,"state":"COMMENT","body":"","commit_id":"187ece0cb6631e2858a6872e5733433bb3ca3b03","stale":false,"official":false,"dismissed":true,"comments_count":1,"submitted_at":"2020-09-01T16:12:58Z","updated_at":"2021-04-18T22:00:49Z","html_url":"https://gitea.com/gitea/test_repo/pulls/7#issuecomment-116562","pull_request_url":"https://gitea.com/gitea/test_repo/pulls/7"},{"id":1771,"user":{"id":9,"login":"techknowlogick","login_name":"","source_id":0,"full_name":"","email":"techknowlogick@noreply.gitea.com","avatar_url":"https://gitea.com/avatars/9b588dd0b384d6f6ae841c5d62302033","html_url":"https://gitea.com/techknowlogick","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-01-14T06:48:35Z","restricted":false,"active":false,"prohibit_login":false,"location":"","website":"https://techknowlogick.com","description":"","visibility":"public","followers_count":11,"following_count":1,"starred_repos_count":4,"username":"techknowlogick"},"team":null,"state":"REQUEST_CHANGES","body":"I think this needs some changes","commit_id":"187ece0cb6631e2858a6872e5733433bb3ca3b03","stale":false,"official":false,"dismissed":true,"comments_count":0,"submitted_at":"2020-09-01T17:06:47Z","updated_at":"2021-04-18T22:00:49Z","html_url":"https://gitea.com/gitea/test_repo/pulls/7#issuecomment-116563","pull_request_url":"https://gitea.com/gitea/test_repo/pulls/7"},{"id":1772,"user":{"id":9,"login":"techknowlogick","login_name":"","source_id":0,"full_name":"","email":"techknowlogick@noreply.gitea.com","avatar_url":"https://gitea.com/avatars/9b588dd0b384d6f6ae841c5d62302033","html_url":"https://gitea.com/techknowlogick","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-01-14T06:48:35Z","restricted":false,"active":false,"prohibit_login":false,"location":"","website":"https://techknowlogick.com","description":"","visibility":"public","followers_count":11,"following_count":1,"starred_repos_count":4,"username":"techknowlogick"},"team":null,"state":"APPROVED","body":"looks good","commit_id":"187ece0cb6631e2858a6872e5733433bb3ca3b03","stale":false,"official":true,"dismissed":true,"comments_count":0,"submitted_at":"2020-09-01T17:19:51Z","updated_at":"2021-04-18T22:00:49Z","html_url":"https://gitea.com/gitea/test_repo/pulls/7#issuecomment-116564","pull_request_url":"https://gitea.com/gitea/test_repo/pulls/7"}]
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%3Flimit=3&page=1&state=all b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%3Flimit=3&page=1&state=all
new file mode 100644
index 0000000000..56417b0e90
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%3Flimit=3&page=1&state=all
@@ -0,0 +1,10 @@
+Access-Control-Expose-Headers: Link, X-Total-Count
+Link: ; rel="next",; rel="last"
+Vary: Origin
+Content-Type: application/json;charset=utf-8
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+X-Total-Count: 6
+
+[{"id":4955,"url":"https://gitea.com/gitea/test_repo/pulls/13","number":13,"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"title":"extend","body":"","labels":[],"milestone":null,"assignee":null,"assignees":null,"requested_reviewers":null,"requested_reviewers_teams":null,"state":"open","draft":false,"is_locked":true,"comments":1,"review_comments":0,"additions":1,"deletions":0,"changed_files":1,"html_url":"https://gitea.com/gitea/test_repo/pulls/13","diff_url":"https://gitea.com/gitea/test_repo/pulls/13.diff","patch_url":"https://gitea.com/gitea/test_repo/pulls/13.patch","mergeable":true,"merged":false,"merged_at":null,"merge_commit_sha":null,"merged_by":null,"allow_maintainer_edit":false,"base":{"label":"master","ref":"master","sha":"827aa28a907853e5ddfa40c8f9bc52471a2685fd","repo_id":16268,"repo":{"id":16268,"owner":{"id":3,"login":"gitea","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/35dea380390772b3130aafbac7ca49e6","html_url":"https://gitea.com/gitea","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2018-11-29T03:16:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"Git Universe","website":"https://about.gitea.com","description":"Git with a cup of tea","visibility":"public","followers_count":53,"following_count":0,"starred_repos_count":0,"username":"gitea"},"name":"test_repo","full_name":"gitea/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":false,"template":false,"parent":null,"mirror":false,"size":68,"language":"","languages_url":"https://gitea.com/api/v1/repos/gitea/test_repo/languages","html_url":"https://gitea.com/gitea/test_repo","url":"https://gitea.com/api/v1/repos/gitea/test_repo","link":"","ssh_url":"git@gitea.com:gitea/test_repo.git","clone_url":"https://gitea.com/gitea/test_repo.git","original_url":"","website":"","stars_count":1,"forks_count":2,"watchers_count":9,"open_issues_count":2,"open_pr_counter":2,"release_counter":2,"default_branch":"master","archived":false,"created_at":"2020-09-01T00:12:27Z","updated_at":"2020-09-01T18:03:41Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":true,"internal_tracker":{"enable_time_tracker":true,"allow_only_contributors_to_track_time":true,"enable_issue_dependencies":true},"has_wiki":true,"has_pull_requests":true,"has_projects":true,"projects_mode":"","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":true,"allow_rebase":true,"allow_rebase_explicit":true,"allow_squash_merge":true,"allow_fast_forward_only_merge":false,"allow_rebase_update":true,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":["gitea","test","migration","ci"],"licenses":null}},"head":{"label":"6543-patch-1","ref":"6543-patch-1","sha":"0ba7693bfd50d26df7f1b7414e937786c5efb05d","repo_id":16268,"repo":{"id":16268,"owner":{"id":3,"login":"gitea","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/35dea380390772b3130aafbac7ca49e6","html_url":"https://gitea.com/gitea","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2018-11-29T03:16:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"Git Universe","website":"https://about.gitea.com","description":"Git with a cup of tea","visibility":"public","followers_count":53,"following_count":0,"starred_repos_count":0,"username":"gitea"},"name":"test_repo","full_name":"gitea/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":false,"template":false,"parent":null,"mirror":false,"size":68,"language":"","languages_url":"https://gitea.com/api/v1/repos/gitea/test_repo/languages","html_url":"https://gitea.com/gitea/test_repo","url":"https://gitea.com/api/v1/repos/gitea/test_repo","link":"","ssh_url":"git@gitea.com:gitea/test_repo.git","clone_url":"https://gitea.com/gitea/test_repo.git","original_url":"","website":"","stars_count":1,"forks_count":2,"watchers_count":9,"open_issues_count":2,"open_pr_counter":2,"release_counter":2,"default_branch":"master","archived":false,"created_at":"2020-09-01T00:12:27Z","updated_at":"2020-09-01T18:03:41Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":true,"internal_tracker":{"enable_time_tracker":true,"allow_only_contributors_to_track_time":true,"enable_issue_dependencies":true},"has_wiki":true,"has_pull_requests":true,"has_projects":true,"projects_mode":"","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":true,"allow_rebase":true,"allow_rebase_explicit":true,"allow_squash_merge":true,"allow_fast_forward_only_merge":false,"allow_rebase_update":true,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":["gitea","test","migration","ci"],"licenses":null}},"merge_base":"827aa28a907853e5ddfa40c8f9bc52471a2685fd","due_date":null,"created_at":"2020-09-01T18:03:54Z","updated_at":"2020-09-01T18:04:26Z","closed_at":null,"pin_order":0},{"id":4954,"url":"https://gitea.com/gitea/test_repo/pulls/12","number":12,"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"title":"Dont Touch","body":"\r\nadd dont touch note","labels":[],"milestone":{"id":1301,"title":"V2 Finalize","description":"","state":"open","open_issues":1,"closed_issues":2,"created_at":"1970-01-01T00:00:00Z","updated_at":"2022-11-13T05:29:15Z","closed_at":null,"due_on":"2020-09-04T23:59:59Z"},"assignee":{"id":9,"login":"techknowlogick","login_name":"","source_id":0,"full_name":"","email":"techknowlogick@noreply.gitea.com","avatar_url":"https://gitea.com/avatars/9b588dd0b384d6f6ae841c5d62302033","html_url":"https://gitea.com/techknowlogick","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-01-14T06:48:35Z","restricted":false,"active":false,"prohibit_login":false,"location":"","website":"https://techknowlogick.com","description":"","visibility":"public","followers_count":11,"following_count":1,"starred_repos_count":4,"username":"techknowlogick"},"assignees":[{"id":9,"login":"techknowlogick","login_name":"","source_id":0,"full_name":"","email":"techknowlogick@noreply.gitea.com","avatar_url":"https://gitea.com/avatars/9b588dd0b384d6f6ae841c5d62302033","html_url":"https://gitea.com/techknowlogick","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-01-14T06:48:35Z","restricted":false,"active":false,"prohibit_login":false,"location":"","website":"https://techknowlogick.com","description":"","visibility":"public","followers_count":11,"following_count":1,"starred_repos_count":4,"username":"techknowlogick"}],"requested_reviewers":null,"requested_reviewers_teams":null,"state":"closed","draft":false,"is_locked":false,"comments":0,"review_comments":3,"additions":1,"deletions":2,"changed_files":1,"html_url":"https://gitea.com/gitea/test_repo/pulls/12","diff_url":"https://gitea.com/gitea/test_repo/pulls/12.diff","patch_url":"https://gitea.com/gitea/test_repo/pulls/12.patch","mergeable":true,"merged":true,"merged_at":"2020-09-01T17:55:34Z","merge_commit_sha":"827aa28a907853e5ddfa40c8f9bc52471a2685fd","merged_by":null,"allow_maintainer_edit":false,"base":{"label":"master","ref":"master","sha":"827aa28a907853e5ddfa40c8f9bc52471a2685fd","repo_id":16268,"repo":{"id":16268,"owner":{"id":3,"login":"gitea","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/35dea380390772b3130aafbac7ca49e6","html_url":"https://gitea.com/gitea","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2018-11-29T03:16:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"Git Universe","website":"https://about.gitea.com","description":"Git with a cup of tea","visibility":"public","followers_count":53,"following_count":0,"starred_repos_count":0,"username":"gitea"},"name":"test_repo","full_name":"gitea/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":false,"template":false,"parent":null,"mirror":false,"size":68,"language":"","languages_url":"https://gitea.com/api/v1/repos/gitea/test_repo/languages","html_url":"https://gitea.com/gitea/test_repo","url":"https://gitea.com/api/v1/repos/gitea/test_repo","link":"","ssh_url":"git@gitea.com:gitea/test_repo.git","clone_url":"https://gitea.com/gitea/test_repo.git","original_url":"","website":"","stars_count":1,"forks_count":2,"watchers_count":9,"open_issues_count":2,"open_pr_counter":2,"release_counter":2,"default_branch":"master","archived":false,"created_at":"2020-09-01T00:12:27Z","updated_at":"2020-09-01T18:03:41Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":true,"internal_tracker":{"enable_time_tracker":true,"allow_only_contributors_to_track_time":true,"enable_issue_dependencies":true},"has_wiki":true,"has_pull_requests":true,"has_projects":true,"projects_mode":"","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":true,"allow_rebase":true,"allow_rebase_explicit":true,"allow_squash_merge":true,"allow_fast_forward_only_merge":false,"allow_rebase_update":true,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":["gitea","test","migration","ci"],"licenses":null}},"head":{"label":"Add-Dont-Touch-Note","ref":"refs/pull/12/head","sha":"b6ab5d9ae000b579a5fff03f92c486da4ddf48b6","repo_id":16280,"repo":{"id":16280,"owner":{"id":9756,"login":"6543-forks","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/c3948ab3b9b62e070e87a22681909dee","html_url":"https://gitea.com/6543-forks","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2020-09-01T17:33:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"","website":"","description":"@6543's fork org","visibility":"public","followers_count":0,"following_count":0,"starred_repos_count":0,"username":"6543-forks"},"name":"test_repo","full_name":"6543-forks/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":true,"template":false,"parent":{"id":16268,"owner":{"id":3,"login":"gitea","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/35dea380390772b3130aafbac7ca49e6","html_url":"https://gitea.com/gitea","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2018-11-29T03:16:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"Git Universe","website":"https://about.gitea.com","description":"Git with a cup of tea","visibility":"public","followers_count":53,"following_count":0,"starred_repos_count":0,"username":"gitea"},"name":"test_repo","full_name":"gitea/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":false,"template":false,"parent":null,"mirror":false,"size":68,"language":"","languages_url":"https://gitea.com/api/v1/repos/gitea/test_repo/languages","html_url":"https://gitea.com/gitea/test_repo","url":"https://gitea.com/api/v1/repos/gitea/test_repo","link":"","ssh_url":"git@gitea.com:gitea/test_repo.git","clone_url":"https://gitea.com/gitea/test_repo.git","original_url":"","website":"","stars_count":1,"forks_count":2,"watchers_count":9,"open_issues_count":2,"open_pr_counter":2,"release_counter":2,"default_branch":"master","archived":false,"created_at":"2020-09-01T00:12:27Z","updated_at":"2020-09-01T18:03:41Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":true,"internal_tracker":{"enable_time_tracker":true,"allow_only_contributors_to_track_time":true,"enable_issue_dependencies":true},"has_wiki":true,"has_pull_requests":true,"has_projects":true,"projects_mode":"","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":true,"allow_rebase":true,"allow_rebase_explicit":true,"allow_squash_merge":true,"allow_fast_forward_only_merge":false,"allow_rebase_update":true,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":["gitea","test","migration","ci"],"licenses":null},"mirror":false,"size":67,"language":"","languages_url":"https://gitea.com/api/v1/repos/6543-forks/test_repo/languages","html_url":"https://gitea.com/6543-forks/test_repo","url":"https://gitea.com/api/v1/repos/6543-forks/test_repo","link":"","ssh_url":"git@gitea.com:6543-forks/test_repo.git","clone_url":"https://gitea.com/6543-forks/test_repo.git","original_url":"","website":"","stars_count":0,"forks_count":0,"watchers_count":1,"open_issues_count":0,"open_pr_counter":0,"release_counter":0,"default_branch":"master","archived":false,"created_at":"2020-09-01T17:39:26Z","updated_at":"2020-09-01T17:57:07Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":false,"has_wiki":false,"has_pull_requests":false,"has_projects":false,"projects_mode":"all","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":false,"allow_rebase":false,"allow_rebase_explicit":false,"allow_squash_merge":false,"allow_fast_forward_only_merge":false,"allow_rebase_update":false,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":[],"licenses":null}},"merge_base":"d9e165e4c7ab6b701f0205d0ffb637e5d2856297","due_date":null,"created_at":"2020-09-01T17:52:39Z","updated_at":"2020-09-02T05:10:25Z","closed_at":"2020-09-01T17:55:33Z","pin_order":0},{"id":4953,"url":"https://gitea.com/gitea/test_repo/pulls/11","number":11,"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"title":"add-xkcd-2199","body":"","labels":[{"id":3734,"name":"Valid","exclusive":false,"is_archived":false,"color":"53e917","description":"","url":"https://gitea.com/api/v1/repos/gitea/test_repo/labels/3734"}],"milestone":null,"assignee":null,"assignees":null,"requested_reviewers":null,"requested_reviewers_teams":null,"state":"open","draft":false,"is_locked":false,"comments":0,"review_comments":0,"additions":0,"deletions":0,"changed_files":1,"html_url":"https://gitea.com/gitea/test_repo/pulls/11","diff_url":"https://gitea.com/gitea/test_repo/pulls/11.diff","patch_url":"https://gitea.com/gitea/test_repo/pulls/11.patch","mergeable":true,"merged":false,"merged_at":null,"merge_commit_sha":null,"merged_by":null,"allow_maintainer_edit":false,"base":{"label":"master","ref":"master","sha":"827aa28a907853e5ddfa40c8f9bc52471a2685fd","repo_id":16268,"repo":{"id":16268,"owner":{"id":3,"login":"gitea","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/35dea380390772b3130aafbac7ca49e6","html_url":"https://gitea.com/gitea","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2018-11-29T03:16:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"Git Universe","website":"https://about.gitea.com","description":"Git with a cup of tea","visibility":"public","followers_count":53,"following_count":0,"starred_repos_count":0,"username":"gitea"},"name":"test_repo","full_name":"gitea/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":false,"template":false,"parent":null,"mirror":false,"size":68,"language":"","languages_url":"https://gitea.com/api/v1/repos/gitea/test_repo/languages","html_url":"https://gitea.com/gitea/test_repo","url":"https://gitea.com/api/v1/repos/gitea/test_repo","link":"","ssh_url":"git@gitea.com:gitea/test_repo.git","clone_url":"https://gitea.com/gitea/test_repo.git","original_url":"","website":"","stars_count":1,"forks_count":2,"watchers_count":9,"open_issues_count":2,"open_pr_counter":2,"release_counter":2,"default_branch":"master","archived":false,"created_at":"2020-09-01T00:12:27Z","updated_at":"2020-09-01T18:03:41Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":true,"internal_tracker":{"enable_time_tracker":true,"allow_only_contributors_to_track_time":true,"enable_issue_dependencies":true},"has_wiki":true,"has_pull_requests":true,"has_projects":true,"projects_mode":"","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":true,"allow_rebase":true,"allow_rebase_explicit":true,"allow_squash_merge":true,"allow_fast_forward_only_merge":false,"allow_rebase_update":true,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":["gitea","test","migration","ci"],"licenses":null}},"head":{"label":"add-xkcd-2199","ref":"add-xkcd-2199","sha":"6bbd02573205288faa95d25e917812b2815a37e5","repo_id":16280,"repo":{"id":16280,"owner":{"id":9756,"login":"6543-forks","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/c3948ab3b9b62e070e87a22681909dee","html_url":"https://gitea.com/6543-forks","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2020-09-01T17:33:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"","website":"","description":"@6543's fork org","visibility":"public","followers_count":0,"following_count":0,"starred_repos_count":0,"username":"6543-forks"},"name":"test_repo","full_name":"6543-forks/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":true,"template":false,"parent":{"id":16268,"owner":{"id":3,"login":"gitea","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/35dea380390772b3130aafbac7ca49e6","html_url":"https://gitea.com/gitea","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2018-11-29T03:16:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"Git Universe","website":"https://about.gitea.com","description":"Git with a cup of tea","visibility":"public","followers_count":53,"following_count":0,"starred_repos_count":0,"username":"gitea"},"name":"test_repo","full_name":"gitea/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":false,"template":false,"parent":null,"mirror":false,"size":68,"language":"","languages_url":"https://gitea.com/api/v1/repos/gitea/test_repo/languages","html_url":"https://gitea.com/gitea/test_repo","url":"https://gitea.com/api/v1/repos/gitea/test_repo","link":"","ssh_url":"git@gitea.com:gitea/test_repo.git","clone_url":"https://gitea.com/gitea/test_repo.git","original_url":"","website":"","stars_count":1,"forks_count":2,"watchers_count":9,"open_issues_count":2,"open_pr_counter":2,"release_counter":2,"default_branch":"master","archived":false,"created_at":"2020-09-01T00:12:27Z","updated_at":"2020-09-01T18:03:41Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":true,"internal_tracker":{"enable_time_tracker":true,"allow_only_contributors_to_track_time":true,"enable_issue_dependencies":true},"has_wiki":true,"has_pull_requests":true,"has_projects":true,"projects_mode":"","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":true,"allow_rebase":true,"allow_rebase_explicit":true,"allow_squash_merge":true,"allow_fast_forward_only_merge":false,"allow_rebase_update":true,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":["gitea","test","migration","ci"],"licenses":null},"mirror":false,"size":67,"language":"","languages_url":"https://gitea.com/api/v1/repos/6543-forks/test_repo/languages","html_url":"https://gitea.com/6543-forks/test_repo","url":"https://gitea.com/api/v1/repos/6543-forks/test_repo","link":"","ssh_url":"git@gitea.com:6543-forks/test_repo.git","clone_url":"https://gitea.com/6543-forks/test_repo.git","original_url":"","website":"","stars_count":0,"forks_count":0,"watchers_count":1,"open_issues_count":0,"open_pr_counter":0,"release_counter":0,"default_branch":"master","archived":false,"created_at":"2020-09-01T17:39:26Z","updated_at":"2020-09-01T17:57:07Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":false,"has_wiki":false,"has_pull_requests":false,"has_projects":false,"projects_mode":"all","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":false,"allow_rebase":false,"allow_rebase_explicit":false,"allow_squash_merge":false,"allow_fast_forward_only_merge":false,"allow_rebase_update":false,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":[],"licenses":null}},"merge_base":"b6ab5d9ae000b579a5fff03f92c486da4ddf48b6","due_date":null,"created_at":"2020-09-01T17:52:28Z","updated_at":"2020-09-01T17:52:29Z","closed_at":null,"pin_order":0}]
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%3Flimit=50&page=1&state=all b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%3Flimit=50&page=1&state=all
new file mode 100644
index 0000000000..91b4c96fa2
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%3Flimit=50&page=1&state=all
@@ -0,0 +1,9 @@
+Access-Control-Expose-Headers: X-Total-Count
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Vary: Origin
+X-Content-Type-Options: nosniff
+X-Total-Count: 6
+Content-Type: application/json;charset=utf-8
+X-Frame-Options: SAMEORIGIN
+
+[{"id":4955,"url":"https://gitea.com/gitea/test_repo/pulls/13","number":13,"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"title":"extend","body":"","labels":[],"milestone":null,"assignee":null,"assignees":null,"requested_reviewers":null,"requested_reviewers_teams":null,"state":"open","draft":false,"is_locked":true,"comments":1,"review_comments":0,"additions":1,"deletions":0,"changed_files":1,"html_url":"https://gitea.com/gitea/test_repo/pulls/13","diff_url":"https://gitea.com/gitea/test_repo/pulls/13.diff","patch_url":"https://gitea.com/gitea/test_repo/pulls/13.patch","mergeable":true,"merged":false,"merged_at":null,"merge_commit_sha":null,"merged_by":null,"allow_maintainer_edit":false,"base":{"label":"master","ref":"master","sha":"827aa28a907853e5ddfa40c8f9bc52471a2685fd","repo_id":16268,"repo":{"id":16268,"owner":{"id":3,"login":"gitea","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/35dea380390772b3130aafbac7ca49e6","html_url":"https://gitea.com/gitea","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2018-11-29T03:16:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"Git Universe","website":"https://about.gitea.com","description":"Git with a cup of tea","visibility":"public","followers_count":53,"following_count":0,"starred_repos_count":0,"username":"gitea"},"name":"test_repo","full_name":"gitea/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":false,"template":false,"parent":null,"mirror":false,"size":68,"language":"","languages_url":"https://gitea.com/api/v1/repos/gitea/test_repo/languages","html_url":"https://gitea.com/gitea/test_repo","url":"https://gitea.com/api/v1/repos/gitea/test_repo","link":"","ssh_url":"git@gitea.com:gitea/test_repo.git","clone_url":"https://gitea.com/gitea/test_repo.git","original_url":"","website":"","stars_count":1,"forks_count":2,"watchers_count":9,"open_issues_count":2,"open_pr_counter":2,"release_counter":2,"default_branch":"master","archived":false,"created_at":"2020-09-01T00:12:27Z","updated_at":"2020-09-01T18:03:41Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":true,"internal_tracker":{"enable_time_tracker":true,"allow_only_contributors_to_track_time":true,"enable_issue_dependencies":true},"has_wiki":true,"has_pull_requests":true,"has_projects":true,"projects_mode":"","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":true,"allow_rebase":true,"allow_rebase_explicit":true,"allow_squash_merge":true,"allow_fast_forward_only_merge":false,"allow_rebase_update":true,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":["gitea","test","migration","ci"],"licenses":null}},"head":{"label":"6543-patch-1","ref":"6543-patch-1","sha":"0ba7693bfd50d26df7f1b7414e937786c5efb05d","repo_id":16268,"repo":{"id":16268,"owner":{"id":3,"login":"gitea","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/35dea380390772b3130aafbac7ca49e6","html_url":"https://gitea.com/gitea","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2018-11-29T03:16:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"Git Universe","website":"https://about.gitea.com","description":"Git with a cup of tea","visibility":"public","followers_count":53,"following_count":0,"starred_repos_count":0,"username":"gitea"},"name":"test_repo","full_name":"gitea/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":false,"template":false,"parent":null,"mirror":false,"size":68,"language":"","languages_url":"https://gitea.com/api/v1/repos/gitea/test_repo/languages","html_url":"https://gitea.com/gitea/test_repo","url":"https://gitea.com/api/v1/repos/gitea/test_repo","link":"","ssh_url":"git@gitea.com:gitea/test_repo.git","clone_url":"https://gitea.com/gitea/test_repo.git","original_url":"","website":"","stars_count":1,"forks_count":2,"watchers_count":9,"open_issues_count":2,"open_pr_counter":2,"release_counter":2,"default_branch":"master","archived":false,"created_at":"2020-09-01T00:12:27Z","updated_at":"2020-09-01T18:03:41Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":true,"internal_tracker":{"enable_time_tracker":true,"allow_only_contributors_to_track_time":true,"enable_issue_dependencies":true},"has_wiki":true,"has_pull_requests":true,"has_projects":true,"projects_mode":"","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":true,"allow_rebase":true,"allow_rebase_explicit":true,"allow_squash_merge":true,"allow_fast_forward_only_merge":false,"allow_rebase_update":true,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":["gitea","test","migration","ci"],"licenses":null}},"merge_base":"827aa28a907853e5ddfa40c8f9bc52471a2685fd","due_date":null,"created_at":"2020-09-01T18:03:54Z","updated_at":"2020-09-01T18:04:26Z","closed_at":null,"pin_order":0},{"id":4954,"url":"https://gitea.com/gitea/test_repo/pulls/12","number":12,"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"title":"Dont Touch","body":"\r\nadd dont touch note","labels":[],"milestone":{"id":1301,"title":"V2 Finalize","description":"","state":"open","open_issues":1,"closed_issues":2,"created_at":"1970-01-01T00:00:00Z","updated_at":"2022-11-13T05:29:15Z","closed_at":null,"due_on":"2020-09-04T23:59:59Z"},"assignee":{"id":9,"login":"techknowlogick","login_name":"","source_id":0,"full_name":"","email":"techknowlogick@noreply.gitea.com","avatar_url":"https://gitea.com/avatars/9b588dd0b384d6f6ae841c5d62302033","html_url":"https://gitea.com/techknowlogick","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-01-14T06:48:35Z","restricted":false,"active":false,"prohibit_login":false,"location":"","website":"https://techknowlogick.com","description":"","visibility":"public","followers_count":11,"following_count":1,"starred_repos_count":4,"username":"techknowlogick"},"assignees":[{"id":9,"login":"techknowlogick","login_name":"","source_id":0,"full_name":"","email":"techknowlogick@noreply.gitea.com","avatar_url":"https://gitea.com/avatars/9b588dd0b384d6f6ae841c5d62302033","html_url":"https://gitea.com/techknowlogick","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-01-14T06:48:35Z","restricted":false,"active":false,"prohibit_login":false,"location":"","website":"https://techknowlogick.com","description":"","visibility":"public","followers_count":11,"following_count":1,"starred_repos_count":4,"username":"techknowlogick"}],"requested_reviewers":null,"requested_reviewers_teams":null,"state":"closed","draft":false,"is_locked":false,"comments":0,"review_comments":3,"additions":1,"deletions":2,"changed_files":1,"html_url":"https://gitea.com/gitea/test_repo/pulls/12","diff_url":"https://gitea.com/gitea/test_repo/pulls/12.diff","patch_url":"https://gitea.com/gitea/test_repo/pulls/12.patch","mergeable":true,"merged":true,"merged_at":"2020-09-01T17:55:34Z","merge_commit_sha":"827aa28a907853e5ddfa40c8f9bc52471a2685fd","merged_by":null,"allow_maintainer_edit":false,"base":{"label":"master","ref":"master","sha":"827aa28a907853e5ddfa40c8f9bc52471a2685fd","repo_id":16268,"repo":{"id":16268,"owner":{"id":3,"login":"gitea","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/35dea380390772b3130aafbac7ca49e6","html_url":"https://gitea.com/gitea","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2018-11-29T03:16:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"Git Universe","website":"https://about.gitea.com","description":"Git with a cup of tea","visibility":"public","followers_count":53,"following_count":0,"starred_repos_count":0,"username":"gitea"},"name":"test_repo","full_name":"gitea/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":false,"template":false,"parent":null,"mirror":false,"size":68,"language":"","languages_url":"https://gitea.com/api/v1/repos/gitea/test_repo/languages","html_url":"https://gitea.com/gitea/test_repo","url":"https://gitea.com/api/v1/repos/gitea/test_repo","link":"","ssh_url":"git@gitea.com:gitea/test_repo.git","clone_url":"https://gitea.com/gitea/test_repo.git","original_url":"","website":"","stars_count":1,"forks_count":2,"watchers_count":9,"open_issues_count":2,"open_pr_counter":2,"release_counter":2,"default_branch":"master","archived":false,"created_at":"2020-09-01T00:12:27Z","updated_at":"2020-09-01T18:03:41Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":true,"internal_tracker":{"enable_time_tracker":true,"allow_only_contributors_to_track_time":true,"enable_issue_dependencies":true},"has_wiki":true,"has_pull_requests":true,"has_projects":true,"projects_mode":"","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":true,"allow_rebase":true,"allow_rebase_explicit":true,"allow_squash_merge":true,"allow_fast_forward_only_merge":false,"allow_rebase_update":true,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":["gitea","test","migration","ci"],"licenses":null}},"head":{"label":"Add-Dont-Touch-Note","ref":"refs/pull/12/head","sha":"b6ab5d9ae000b579a5fff03f92c486da4ddf48b6","repo_id":16280,"repo":{"id":16280,"owner":{"id":9756,"login":"6543-forks","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/c3948ab3b9b62e070e87a22681909dee","html_url":"https://gitea.com/6543-forks","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2020-09-01T17:33:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"","website":"","description":"@6543's fork org","visibility":"public","followers_count":0,"following_count":0,"starred_repos_count":0,"username":"6543-forks"},"name":"test_repo","full_name":"6543-forks/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":true,"template":false,"parent":{"id":16268,"owner":{"id":3,"login":"gitea","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/35dea380390772b3130aafbac7ca49e6","html_url":"https://gitea.com/gitea","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2018-11-29T03:16:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"Git Universe","website":"https://about.gitea.com","description":"Git with a cup of tea","visibility":"public","followers_count":53,"following_count":0,"starred_repos_count":0,"username":"gitea"},"name":"test_repo","full_name":"gitea/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":false,"template":false,"parent":null,"mirror":false,"size":68,"language":"","languages_url":"https://gitea.com/api/v1/repos/gitea/test_repo/languages","html_url":"https://gitea.com/gitea/test_repo","url":"https://gitea.com/api/v1/repos/gitea/test_repo","link":"","ssh_url":"git@gitea.com:gitea/test_repo.git","clone_url":"https://gitea.com/gitea/test_repo.git","original_url":"","website":"","stars_count":1,"forks_count":2,"watchers_count":9,"open_issues_count":2,"open_pr_counter":2,"release_counter":2,"default_branch":"master","archived":false,"created_at":"2020-09-01T00:12:27Z","updated_at":"2020-09-01T18:03:41Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":true,"internal_tracker":{"enable_time_tracker":true,"allow_only_contributors_to_track_time":true,"enable_issue_dependencies":true},"has_wiki":true,"has_pull_requests":true,"has_projects":true,"projects_mode":"","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":true,"allow_rebase":true,"allow_rebase_explicit":true,"allow_squash_merge":true,"allow_fast_forward_only_merge":false,"allow_rebase_update":true,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":["gitea","test","migration","ci"],"licenses":null},"mirror":false,"size":67,"language":"","languages_url":"https://gitea.com/api/v1/repos/6543-forks/test_repo/languages","html_url":"https://gitea.com/6543-forks/test_repo","url":"https://gitea.com/api/v1/repos/6543-forks/test_repo","link":"","ssh_url":"git@gitea.com:6543-forks/test_repo.git","clone_url":"https://gitea.com/6543-forks/test_repo.git","original_url":"","website":"","stars_count":0,"forks_count":0,"watchers_count":1,"open_issues_count":0,"open_pr_counter":0,"release_counter":0,"default_branch":"master","archived":false,"created_at":"2020-09-01T17:39:26Z","updated_at":"2020-09-01T17:57:07Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":false,"has_wiki":false,"has_pull_requests":false,"has_projects":false,"projects_mode":"all","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":false,"allow_rebase":false,"allow_rebase_explicit":false,"allow_squash_merge":false,"allow_fast_forward_only_merge":false,"allow_rebase_update":false,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":[],"licenses":null}},"merge_base":"d9e165e4c7ab6b701f0205d0ffb637e5d2856297","due_date":null,"created_at":"2020-09-01T17:52:39Z","updated_at":"2020-09-02T05:10:25Z","closed_at":"2020-09-01T17:55:33Z","pin_order":0},{"id":4953,"url":"https://gitea.com/gitea/test_repo/pulls/11","number":11,"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"title":"add-xkcd-2199","body":"","labels":[{"id":3734,"name":"Valid","exclusive":false,"is_archived":false,"color":"53e917","description":"","url":"https://gitea.com/api/v1/repos/gitea/test_repo/labels/3734"}],"milestone":null,"assignee":null,"assignees":null,"requested_reviewers":null,"requested_reviewers_teams":null,"state":"open","draft":false,"is_locked":false,"comments":0,"review_comments":0,"additions":0,"deletions":0,"changed_files":1,"html_url":"https://gitea.com/gitea/test_repo/pulls/11","diff_url":"https://gitea.com/gitea/test_repo/pulls/11.diff","patch_url":"https://gitea.com/gitea/test_repo/pulls/11.patch","mergeable":true,"merged":false,"merged_at":null,"merge_commit_sha":null,"merged_by":null,"allow_maintainer_edit":false,"base":{"label":"master","ref":"master","sha":"827aa28a907853e5ddfa40c8f9bc52471a2685fd","repo_id":16268,"repo":{"id":16268,"owner":{"id":3,"login":"gitea","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/35dea380390772b3130aafbac7ca49e6","html_url":"https://gitea.com/gitea","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2018-11-29T03:16:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"Git Universe","website":"https://about.gitea.com","description":"Git with a cup of tea","visibility":"public","followers_count":53,"following_count":0,"starred_repos_count":0,"username":"gitea"},"name":"test_repo","full_name":"gitea/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":false,"template":false,"parent":null,"mirror":false,"size":68,"language":"","languages_url":"https://gitea.com/api/v1/repos/gitea/test_repo/languages","html_url":"https://gitea.com/gitea/test_repo","url":"https://gitea.com/api/v1/repos/gitea/test_repo","link":"","ssh_url":"git@gitea.com:gitea/test_repo.git","clone_url":"https://gitea.com/gitea/test_repo.git","original_url":"","website":"","stars_count":1,"forks_count":2,"watchers_count":9,"open_issues_count":2,"open_pr_counter":2,"release_counter":2,"default_branch":"master","archived":false,"created_at":"2020-09-01T00:12:27Z","updated_at":"2020-09-01T18:03:41Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":true,"internal_tracker":{"enable_time_tracker":true,"allow_only_contributors_to_track_time":true,"enable_issue_dependencies":true},"has_wiki":true,"has_pull_requests":true,"has_projects":true,"projects_mode":"","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":true,"allow_rebase":true,"allow_rebase_explicit":true,"allow_squash_merge":true,"allow_fast_forward_only_merge":false,"allow_rebase_update":true,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":["gitea","test","migration","ci"],"licenses":null}},"head":{"label":"add-xkcd-2199","ref":"add-xkcd-2199","sha":"6bbd02573205288faa95d25e917812b2815a37e5","repo_id":16280,"repo":{"id":16280,"owner":{"id":9756,"login":"6543-forks","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/c3948ab3b9b62e070e87a22681909dee","html_url":"https://gitea.com/6543-forks","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2020-09-01T17:33:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"","website":"","description":"@6543's fork org","visibility":"public","followers_count":0,"following_count":0,"starred_repos_count":0,"username":"6543-forks"},"name":"test_repo","full_name":"6543-forks/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":true,"template":false,"parent":{"id":16268,"owner":{"id":3,"login":"gitea","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/35dea380390772b3130aafbac7ca49e6","html_url":"https://gitea.com/gitea","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2018-11-29T03:16:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"Git Universe","website":"https://about.gitea.com","description":"Git with a cup of tea","visibility":"public","followers_count":53,"following_count":0,"starred_repos_count":0,"username":"gitea"},"name":"test_repo","full_name":"gitea/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":false,"template":false,"parent":null,"mirror":false,"size":68,"language":"","languages_url":"https://gitea.com/api/v1/repos/gitea/test_repo/languages","html_url":"https://gitea.com/gitea/test_repo","url":"https://gitea.com/api/v1/repos/gitea/test_repo","link":"","ssh_url":"git@gitea.com:gitea/test_repo.git","clone_url":"https://gitea.com/gitea/test_repo.git","original_url":"","website":"","stars_count":1,"forks_count":2,"watchers_count":9,"open_issues_count":2,"open_pr_counter":2,"release_counter":2,"default_branch":"master","archived":false,"created_at":"2020-09-01T00:12:27Z","updated_at":"2020-09-01T18:03:41Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":true,"internal_tracker":{"enable_time_tracker":true,"allow_only_contributors_to_track_time":true,"enable_issue_dependencies":true},"has_wiki":true,"has_pull_requests":true,"has_projects":true,"projects_mode":"","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":true,"allow_rebase":true,"allow_rebase_explicit":true,"allow_squash_merge":true,"allow_fast_forward_only_merge":false,"allow_rebase_update":true,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":["gitea","test","migration","ci"],"licenses":null},"mirror":false,"size":67,"language":"","languages_url":"https://gitea.com/api/v1/repos/6543-forks/test_repo/languages","html_url":"https://gitea.com/6543-forks/test_repo","url":"https://gitea.com/api/v1/repos/6543-forks/test_repo","link":"","ssh_url":"git@gitea.com:6543-forks/test_repo.git","clone_url":"https://gitea.com/6543-forks/test_repo.git","original_url":"","website":"","stars_count":0,"forks_count":0,"watchers_count":1,"open_issues_count":0,"open_pr_counter":0,"release_counter":0,"default_branch":"master","archived":false,"created_at":"2020-09-01T17:39:26Z","updated_at":"2020-09-01T17:57:07Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":false,"has_wiki":false,"has_pull_requests":false,"has_projects":false,"projects_mode":"all","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":false,"allow_rebase":false,"allow_rebase_explicit":false,"allow_squash_merge":false,"allow_fast_forward_only_merge":false,"allow_rebase_update":false,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":[],"licenses":null}},"merge_base":"b6ab5d9ae000b579a5fff03f92c486da4ddf48b6","due_date":null,"created_at":"2020-09-01T17:52:28Z","updated_at":"2020-09-01T17:52:29Z","closed_at":null,"pin_order":0},{"id":4952,"url":"https://gitea.com/gitea/test_repo/pulls/8","number":8,"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"title":"add garbage for close pull","body":"well you'll see","labels":[],"milestone":null,"assignee":null,"assignees":null,"requested_reviewers":null,"requested_reviewers_teams":null,"state":"closed","draft":false,"is_locked":false,"comments":0,"review_comments":0,"additions":1,"deletions":2,"changed_files":1,"html_url":"https://gitea.com/gitea/test_repo/pulls/8","diff_url":"https://gitea.com/gitea/test_repo/pulls/8.diff","patch_url":"https://gitea.com/gitea/test_repo/pulls/8.patch","mergeable":true,"merged":false,"merged_at":null,"merge_commit_sha":null,"merged_by":null,"allow_maintainer_edit":false,"base":{"label":"master","ref":"master","sha":"827aa28a907853e5ddfa40c8f9bc52471a2685fd","repo_id":16268,"repo":{"id":16268,"owner":{"id":3,"login":"gitea","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/35dea380390772b3130aafbac7ca49e6","html_url":"https://gitea.com/gitea","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2018-11-29T03:16:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"Git Universe","website":"https://about.gitea.com","description":"Git with a cup of tea","visibility":"public","followers_count":53,"following_count":0,"starred_repos_count":0,"username":"gitea"},"name":"test_repo","full_name":"gitea/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":false,"template":false,"parent":null,"mirror":false,"size":68,"language":"","languages_url":"https://gitea.com/api/v1/repos/gitea/test_repo/languages","html_url":"https://gitea.com/gitea/test_repo","url":"https://gitea.com/api/v1/repos/gitea/test_repo","link":"","ssh_url":"git@gitea.com:gitea/test_repo.git","clone_url":"https://gitea.com/gitea/test_repo.git","original_url":"","website":"","stars_count":1,"forks_count":2,"watchers_count":9,"open_issues_count":2,"open_pr_counter":2,"release_counter":2,"default_branch":"master","archived":false,"created_at":"2020-09-01T00:12:27Z","updated_at":"2020-09-01T18:03:41Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":true,"internal_tracker":{"enable_time_tracker":true,"allow_only_contributors_to_track_time":true,"enable_issue_dependencies":true},"has_wiki":true,"has_pull_requests":true,"has_projects":true,"projects_mode":"","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":true,"allow_rebase":true,"allow_rebase_explicit":true,"allow_squash_merge":true,"allow_fast_forward_only_merge":false,"allow_rebase_update":true,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":["gitea","test","migration","ci"],"licenses":null}},"head":{"label":"garbage-patch","ref":"refs/pull/8/head","sha":"a3427235639a33d2d749e76f076e7619acc75341","repo_id":16280,"repo":{"id":16280,"owner":{"id":9756,"login":"6543-forks","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/c3948ab3b9b62e070e87a22681909dee","html_url":"https://gitea.com/6543-forks","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2020-09-01T17:33:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"","website":"","description":"@6543's fork org","visibility":"public","followers_count":0,"following_count":0,"starred_repos_count":0,"username":"6543-forks"},"name":"test_repo","full_name":"6543-forks/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":true,"template":false,"parent":{"id":16268,"owner":{"id":3,"login":"gitea","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/35dea380390772b3130aafbac7ca49e6","html_url":"https://gitea.com/gitea","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2018-11-29T03:16:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"Git Universe","website":"https://about.gitea.com","description":"Git with a cup of tea","visibility":"public","followers_count":53,"following_count":0,"starred_repos_count":0,"username":"gitea"},"name":"test_repo","full_name":"gitea/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":false,"template":false,"parent":null,"mirror":false,"size":68,"language":"","languages_url":"https://gitea.com/api/v1/repos/gitea/test_repo/languages","html_url":"https://gitea.com/gitea/test_repo","url":"https://gitea.com/api/v1/repos/gitea/test_repo","link":"","ssh_url":"git@gitea.com:gitea/test_repo.git","clone_url":"https://gitea.com/gitea/test_repo.git","original_url":"","website":"","stars_count":1,"forks_count":2,"watchers_count":9,"open_issues_count":2,"open_pr_counter":2,"release_counter":2,"default_branch":"master","archived":false,"created_at":"2020-09-01T00:12:27Z","updated_at":"2020-09-01T18:03:41Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":true,"internal_tracker":{"enable_time_tracker":true,"allow_only_contributors_to_track_time":true,"enable_issue_dependencies":true},"has_wiki":true,"has_pull_requests":true,"has_projects":true,"projects_mode":"","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":true,"allow_rebase":true,"allow_rebase_explicit":true,"allow_squash_merge":true,"allow_fast_forward_only_merge":false,"allow_rebase_update":true,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":["gitea","test","migration","ci"],"licenses":null},"mirror":false,"size":67,"language":"","languages_url":"https://gitea.com/api/v1/repos/6543-forks/test_repo/languages","html_url":"https://gitea.com/6543-forks/test_repo","url":"https://gitea.com/api/v1/repos/6543-forks/test_repo","link":"","ssh_url":"git@gitea.com:6543-forks/test_repo.git","clone_url":"https://gitea.com/6543-forks/test_repo.git","original_url":"","website":"","stars_count":0,"forks_count":0,"watchers_count":1,"open_issues_count":0,"open_pr_counter":0,"release_counter":0,"default_branch":"master","archived":false,"created_at":"2020-09-01T17:39:26Z","updated_at":"2020-09-01T17:57:07Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":false,"has_wiki":false,"has_pull_requests":false,"has_projects":false,"projects_mode":"all","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":false,"allow_rebase":false,"allow_rebase_explicit":false,"allow_squash_merge":false,"allow_fast_forward_only_merge":false,"allow_rebase_update":false,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":[],"licenses":null}},"merge_base":"d9e165e4c7ab6b701f0205d0ffb637e5d2856297","due_date":null,"created_at":"2020-09-01T17:43:20Z","updated_at":"2020-09-01T17:48:41Z","closed_at":"2020-09-01T17:48:29Z","pin_order":0},{"id":4951,"url":"https://gitea.com/gitea/test_repo/pulls/7","number":7,"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"title":"Prepare for Release V1","body":"@techknowlogick you might have a look at it?\n\nclose #6","labels":[{"id":3735,"name":"Enhancement","exclusive":false,"is_archived":false,"color":"207de5","description":"","url":"https://gitea.com/api/v1/repos/gitea/test_repo/labels/3735"}],"milestone":{"id":1300,"title":"V1","description":"Generate Content","state":"closed","open_issues":0,"closed_issues":4,"created_at":"1970-01-01T00:00:00Z","updated_at":"1970-01-01T00:00:00Z","closed_at":"2020-09-01T18:36:46Z","due_on":null},"assignee":null,"assignees":null,"requested_reviewers":null,"requested_reviewers_teams":null,"state":"closed","draft":false,"is_locked":false,"comments":1,"review_comments":3,"additions":3,"deletions":1,"changed_files":1,"html_url":"https://gitea.com/gitea/test_repo/pulls/7","diff_url":"https://gitea.com/gitea/test_repo/pulls/7.diff","patch_url":"https://gitea.com/gitea/test_repo/pulls/7.patch","mergeable":true,"merged":true,"merged_at":"2020-09-01T17:26:02Z","merge_commit_sha":"d9e165e4c7ab6b701f0205d0ffb637e5d2856297","merged_by":null,"allow_maintainer_edit":false,"base":{"label":"master","ref":"master","sha":"827aa28a907853e5ddfa40c8f9bc52471a2685fd","repo_id":16268,"repo":{"id":16268,"owner":{"id":3,"login":"gitea","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/35dea380390772b3130aafbac7ca49e6","html_url":"https://gitea.com/gitea","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2018-11-29T03:16:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"Git Universe","website":"https://about.gitea.com","description":"Git with a cup of tea","visibility":"public","followers_count":53,"following_count":0,"starred_repos_count":0,"username":"gitea"},"name":"test_repo","full_name":"gitea/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":false,"template":false,"parent":null,"mirror":false,"size":68,"language":"","languages_url":"https://gitea.com/api/v1/repos/gitea/test_repo/languages","html_url":"https://gitea.com/gitea/test_repo","url":"https://gitea.com/api/v1/repos/gitea/test_repo","link":"","ssh_url":"git@gitea.com:gitea/test_repo.git","clone_url":"https://gitea.com/gitea/test_repo.git","original_url":"","website":"","stars_count":1,"forks_count":2,"watchers_count":9,"open_issues_count":2,"open_pr_counter":2,"release_counter":2,"default_branch":"master","archived":false,"created_at":"2020-09-01T00:12:27Z","updated_at":"2020-09-01T18:03:41Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":true,"internal_tracker":{"enable_time_tracker":true,"allow_only_contributors_to_track_time":true,"enable_issue_dependencies":true},"has_wiki":true,"has_pull_requests":true,"has_projects":true,"projects_mode":"","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":true,"allow_rebase":true,"allow_rebase_explicit":true,"allow_squash_merge":true,"allow_fast_forward_only_merge":false,"allow_rebase_update":true,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":["gitea","test","migration","ci"],"licenses":null}},"head":{"label":"prepare-v1","ref":"refs/pull/7/head","sha":"187ece0cb6631e2858a6872e5733433bb3ca3b03","repo_id":16268,"repo":{"id":16268,"owner":{"id":3,"login":"gitea","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/35dea380390772b3130aafbac7ca49e6","html_url":"https://gitea.com/gitea","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2018-11-29T03:16:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"Git Universe","website":"https://about.gitea.com","description":"Git with a cup of tea","visibility":"public","followers_count":53,"following_count":0,"starred_repos_count":0,"username":"gitea"},"name":"test_repo","full_name":"gitea/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":false,"template":false,"parent":null,"mirror":false,"size":68,"language":"","languages_url":"https://gitea.com/api/v1/repos/gitea/test_repo/languages","html_url":"https://gitea.com/gitea/test_repo","url":"https://gitea.com/api/v1/repos/gitea/test_repo","link":"","ssh_url":"git@gitea.com:gitea/test_repo.git","clone_url":"https://gitea.com/gitea/test_repo.git","original_url":"","website":"","stars_count":1,"forks_count":2,"watchers_count":9,"open_issues_count":2,"open_pr_counter":2,"release_counter":2,"default_branch":"master","archived":false,"created_at":"2020-09-01T00:12:27Z","updated_at":"2020-09-01T18:03:41Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":true,"internal_tracker":{"enable_time_tracker":true,"allow_only_contributors_to_track_time":true,"enable_issue_dependencies":true},"has_wiki":true,"has_pull_requests":true,"has_projects":true,"projects_mode":"","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":true,"allow_rebase":true,"allow_rebase_explicit":true,"allow_squash_merge":true,"allow_fast_forward_only_merge":false,"allow_rebase_update":true,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":["gitea","test","migration","ci"],"licenses":null}},"merge_base":"9396b697d905d1bcb5380befdf4d7e52c6a7ceb2","due_date":null,"created_at":"2020-09-01T16:10:04Z","updated_at":"2020-09-01T17:26:08Z","closed_at":"2020-09-01T17:26:02Z","pin_order":0},{"id":4949,"url":"https://gitea.com/gitea/test_repo/pulls/3","number":3,"user":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@obermui.de","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"title":"Readme: use '2'","body":"","labels":[{"id":3735,"name":"Enhancement","exclusive":false,"is_archived":false,"color":"207de5","description":"","url":"https://gitea.com/api/v1/repos/gitea/test_repo/labels/3735"}],"milestone":{"id":1300,"title":"V1","description":"Generate Content","state":"closed","open_issues":0,"closed_issues":4,"created_at":"1970-01-01T00:00:00Z","updated_at":"1970-01-01T00:00:00Z","closed_at":"2020-09-01T18:36:46Z","due_on":null},"assignee":null,"assignees":null,"requested_reviewers":null,"requested_reviewers_teams":null,"state":"closed","draft":false,"is_locked":false,"comments":0,"review_comments":0,"additions":1,"deletions":1,"changed_files":1,"html_url":"https://gitea.com/gitea/test_repo/pulls/3","diff_url":"https://gitea.com/gitea/test_repo/pulls/3.diff","patch_url":"https://gitea.com/gitea/test_repo/pulls/3.patch","mergeable":true,"merged":true,"merged_at":"2020-09-01T00:27:14Z","merge_commit_sha":"9396b697d905d1bcb5380befdf4d7e52c6a7ceb2","merged_by":null,"allow_maintainer_edit":false,"base":{"label":"master","ref":"master","sha":"827aa28a907853e5ddfa40c8f9bc52471a2685fd","repo_id":16268,"repo":{"id":16268,"owner":{"id":3,"login":"gitea","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/35dea380390772b3130aafbac7ca49e6","html_url":"https://gitea.com/gitea","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2018-11-29T03:16:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"Git Universe","website":"https://about.gitea.com","description":"Git with a cup of tea","visibility":"public","followers_count":53,"following_count":0,"starred_repos_count":0,"username":"gitea"},"name":"test_repo","full_name":"gitea/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":false,"template":false,"parent":null,"mirror":false,"size":68,"language":"","languages_url":"https://gitea.com/api/v1/repos/gitea/test_repo/languages","html_url":"https://gitea.com/gitea/test_repo","url":"https://gitea.com/api/v1/repos/gitea/test_repo","link":"","ssh_url":"git@gitea.com:gitea/test_repo.git","clone_url":"https://gitea.com/gitea/test_repo.git","original_url":"","website":"","stars_count":1,"forks_count":2,"watchers_count":9,"open_issues_count":2,"open_pr_counter":2,"release_counter":2,"default_branch":"master","archived":false,"created_at":"2020-09-01T00:12:27Z","updated_at":"2020-09-01T18:03:41Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":true,"internal_tracker":{"enable_time_tracker":true,"allow_only_contributors_to_track_time":true,"enable_issue_dependencies":true},"has_wiki":true,"has_pull_requests":true,"has_projects":true,"projects_mode":"","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":true,"allow_rebase":true,"allow_rebase_explicit":true,"allow_squash_merge":true,"allow_fast_forward_only_merge":false,"allow_rebase_update":true,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":["gitea","test","migration","ci"],"licenses":null}},"head":{"label":"readme_nit","ref":"refs/pull/3/head","sha":"c273a16d4c3b2d745df690005dabe79cc6504ac3","repo_id":16268,"repo":{"id":16268,"owner":{"id":3,"login":"gitea","login_name":"","source_id":0,"full_name":"","email":"","avatar_url":"https://gitea.com/avatars/35dea380390772b3130aafbac7ca49e6","html_url":"https://gitea.com/gitea","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2018-11-29T03:16:17Z","restricted":false,"active":false,"prohibit_login":false,"location":"Git Universe","website":"https://about.gitea.com","description":"Git with a cup of tea","visibility":"public","followers_count":53,"following_count":0,"starred_repos_count":0,"username":"gitea"},"name":"test_repo","full_name":"gitea/test_repo","description":"Test repository for testing migration from gitea to gitea","empty":false,"private":false,"fork":false,"template":false,"parent":null,"mirror":false,"size":68,"language":"","languages_url":"https://gitea.com/api/v1/repos/gitea/test_repo/languages","html_url":"https://gitea.com/gitea/test_repo","url":"https://gitea.com/api/v1/repos/gitea/test_repo","link":"","ssh_url":"git@gitea.com:gitea/test_repo.git","clone_url":"https://gitea.com/gitea/test_repo.git","original_url":"","website":"","stars_count":1,"forks_count":2,"watchers_count":9,"open_issues_count":2,"open_pr_counter":2,"release_counter":2,"default_branch":"master","archived":false,"created_at":"2020-09-01T00:12:27Z","updated_at":"2020-09-01T18:03:41Z","archived_at":"1970-01-01T00:00:00Z","permissions":{"admin":false,"push":false,"pull":true},"has_issues":true,"internal_tracker":{"enable_time_tracker":true,"allow_only_contributors_to_track_time":true,"enable_issue_dependencies":true},"has_wiki":true,"has_pull_requests":true,"has_projects":true,"projects_mode":"","has_releases":true,"has_packages":false,"has_actions":false,"ignore_whitespace_conflicts":false,"allow_merge_commits":true,"allow_rebase":true,"allow_rebase_explicit":true,"allow_squash_merge":true,"allow_fast_forward_only_merge":false,"allow_rebase_update":true,"default_delete_branch_after_merge":false,"default_merge_style":"merge","default_allow_maintainer_edit":false,"avatar_url":"","internal":false,"mirror_interval":"","object_format_name":"sha1","mirror_updated":"0001-01-01T00:00:00Z","repo_transfer":null,"topics":["gitea","test","migration","ci"],"licenses":null}},"merge_base":"a016fd754759b2cdfe5cad1cdf638c7e6b281940","due_date":null,"created_at":"2020-09-01T00:27:03Z","updated_at":"2020-09-01T15:54:30Z","closed_at":"2020-09-01T00:27:14Z","pin_order":0}]
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Freleases%3Flimit=50&page=1 b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Freleases%3Flimit=50&page=1
new file mode 100644
index 0000000000..13f5706fc1
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Freleases%3Flimit=50&page=1
@@ -0,0 +1,9 @@
+Content-Type: application/json;charset=utf-8
+Vary: Origin
+X-Frame-Options: SAMEORIGIN
+Access-Control-Expose-Headers: X-Total-Count
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+X-Content-Type-Options: nosniff
+X-Total-Count: 2
+
+[{"id":167250,"tag_name":"v2-rc1","target_commitish":"master","name":"Second Release","body":"this repo has:\r\n* reactions\r\n* wiki\r\n* issues  (open/closed)\r\n* pulls (open/closed/merged) (external/internal)\r\n* pull reviews\r\n* projects\r\n* milestones\r\n* labels\r\n* releases\r\n\r\nto test migration against","url":"https://gitea.com/api/v1/repos/gitea/test_repo/releases/167250","html_url":"https://gitea.com/gitea/test_repo/releases/tag/v2-rc1","tarball_url":"https://gitea.com/gitea/test_repo/archive/v2-rc1.tar.gz","zipball_url":"https://gitea.com/gitea/test_repo/archive/v2-rc1.zip","upload_url":"https://gitea.com/api/v1/repos/gitea/test_repo/releases/167250/assets","draft":false,"prerelease":true,"created_at":"2020-09-01T18:02:43Z","published_at":"2020-09-01T18:02:43Z","author":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@noreply.gitea.com","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"assets":[]},{"id":167249,"tag_name":"V1","target_commitish":"master","name":"First Release","body":"as title","url":"https://gitea.com/api/v1/repos/gitea/test_repo/releases/167249","html_url":"https://gitea.com/gitea/test_repo/releases/tag/V1","tarball_url":"https://gitea.com/gitea/test_repo/archive/V1.tar.gz","zipball_url":"https://gitea.com/gitea/test_repo/archive/V1.zip","upload_url":"https://gitea.com/api/v1/repos/gitea/test_repo/releases/167249/assets","draft":false,"prerelease":false,"created_at":"2020-09-01T17:30:32Z","published_at":"2020-09-01T17:30:32Z","author":{"id":689,"login":"6543","login_name":"","source_id":0,"full_name":"","email":"6543@noreply.gitea.com","avatar_url":"https://gitea.com/avatars/aeb6c290f1988daefa7421c5409e80dc","html_url":"https://gitea.com/6543","language":"","is_admin":false,"last_login":"0001-01-01T00:00:00Z","created":"2019-07-17T21:08:41Z","restricted":false,"active":false,"prohibit_login":false,"location":"Germany","website":"https://mh.obermui.de","description":"gitea instance: https://code.obermui.de","visibility":"public","followers_count":10,"following_count":7,"starred_repos_count":18,"username":"6543"},"assets":[]}]
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Ftopics%3Flimit=0&page=1 b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Ftopics%3Flimit=0&page=1
new file mode 100644
index 0000000000..4d1cf9e322
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Ftopics%3Flimit=0&page=1
@@ -0,0 +1,10 @@
+Vary: Origin
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+X-Total-Count: 4
+Content-Length: 45
+Access-Control-Expose-Headers: X-Total-Count
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Content-Type: application/json;charset=utf-8
+
+{"topics":["ci","gitea","migration","test"]}
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Fsettings%2Fapi b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Fsettings%2Fapi
new file mode 100644
index 0000000000..f16a0a33c8
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Fsettings%2Fapi
@@ -0,0 +1,8 @@
+Content-Type: application/json;charset=utf-8
+Content-Length: 117
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Vary: Origin
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+
+{"max_response_items":50,"default_paging_num":30,"default_git_trees_per_page":1000,"default_max_blob_size":10485760}
diff --git a/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Fversion b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Fversion
new file mode 100644
index 0000000000..739d679c0d
--- /dev/null
+++ b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Fversion
@@ -0,0 +1,8 @@
+Content-Length: 41
+Cache-Control: max-age=0, private, must-revalidate, no-transform
+Vary: Origin
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+Content-Type: application/json;charset=utf-8
+
+{"version":"1.23.0+dev-608-gec2d1593c2"}

From ece87d0569bbfbe73f98ace10d4ef6b7d235730f Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Tue, 5 Nov 2024 16:18:06 +0100
Subject: [PATCH 314/443] chore(ci): deprecate legacy infrastructure supporting
 v*.next

https://code.forgejo.org/infrastructure/k8s/ was replaced with
https://code.forgejo.org/infrastructure/k8s-cluster/
---
 .forgejo/workflows/publish-release.yml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/.forgejo/workflows/publish-release.yml b/.forgejo/workflows/publish-release.yml
index c7d69e1132..66432f37a0 100644
--- a/.forgejo/workflows/publish-release.yml
+++ b/.forgejo/workflows/publish-release.yml
@@ -60,17 +60,6 @@ jobs:
           verbose: ${{ vars.VERBOSE }}
 
       - name: upgrade v*.next.forgejo.org
-        run: |
-          export DEBIAN_FRONTEND=noninteractive
-          apt-get update -qq
-          apt-get -q install -y -qq curl
-          version="${{ github.ref_name }}"
-          version=${version##*v}
-          major=$(echo $version | sed -E -e 's/^([0-9]+).*/\1/')
-          # https://forgejo.org/docs/next/developer/infrastructure
-          curl -o /dev/null -sS https://v$major.next.forgejo.org/.well-known/wakeup-on-logs/forgejo-v$major
-
-      - name: upgrade v*.next.forgejo.org (k8s)
         uses: https://code.forgejo.org/infrastructure/next-digest@v1.1.0
         with:
           url: https://placeholder:${{ secrets.TOKEN_NEXT_DIGEST }}@code.forgejo.org/infrastructure/next-digest

From 2f8e7a2c6746550593a84b43accd879970b57ea1 Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Tue, 5 Nov 2024 21:20:55 +0100
Subject: [PATCH 315/443] [CHORE] Add extra testing

- Do more property testing for null values.
- Add test for `AbsoluteLong`.
---
 modules/templates/util_date.go      |  2 +-
 modules/templates/util_date_test.go | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/modules/templates/util_date.go b/modules/templates/util_date.go
index 45dd8da02f..10f7cdb508 100644
--- a/modules/templates/util_date.go
+++ b/modules/templates/util_date.go
@@ -27,7 +27,7 @@ func (du *DateUtils) AbsoluteShort(time any) template.HTML {
 
 // AbsoluteLong renders in "January 01, 2006" format
 func (du *DateUtils) AbsoluteLong(time any) template.HTML {
-	return timeutil.DateTime("short", time)
+	return timeutil.DateTime("long", time)
 }
 
 // FullTime renders in "Jan 01, 2006 20:33:44" format
diff --git a/modules/templates/util_date_test.go b/modules/templates/util_date_test.go
index 96c3776d39..e3dec5c8db 100644
--- a/modules/templates/util_date_test.go
+++ b/modules/templates/util_date_test.go
@@ -4,6 +4,7 @@
 package templates
 
 import (
+	"html/template"
 	"testing"
 	"time"
 
@@ -12,10 +13,12 @@ import (
 	"code.gitea.io/gitea/modules/timeutil"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestDateTime(t *testing.T) {
-	testTz, _ := time.LoadLocation("America/New_York")
+	testTz, err := time.LoadLocation("America/New_York")
+	require.NoError(t, err)
 	defer test.MockVariableValue(&setting.DefaultUILocation, testTz)()
 	defer test.MockVariableValue(&setting.IsInTesting, false)()
 
@@ -26,10 +29,11 @@ func TestDateTime(t *testing.T) {
 	refTime, _ := time.Parse(time.RFC3339, refTimeStr)
 	refTimeStamp := timeutil.TimeStamp(refTime.Unix())
 
-	assert.EqualValues(t, "-", du.AbsoluteShort(nil))
-	assert.EqualValues(t, "-", du.AbsoluteShort(0))
-	assert.EqualValues(t, "-", du.AbsoluteShort(time.Time{}))
-	assert.EqualValues(t, "-", du.AbsoluteShort(timeutil.TimeStamp(0)))
+	for _, val := range []any{nil, 0, time.Time{}, timeutil.TimeStamp(0)} {
+		for _, fun := range []func(val any) template.HTML{du.AbsoluteLong, du.AbsoluteShort, du.FullTime} {
+			assert.EqualValues(t, "-", fun(val))
+		}
+	}
 
 	actual := dateTimeLegacy("short", "invalid")
 	assert.EqualValues(t, `-`, actual)
@@ -40,12 +44,18 @@ func TestDateTime(t *testing.T) {
 	actual = du.AbsoluteShort(refTime)
 	assert.EqualValues(t, `2018-01-01`, actual)
 
+	actual = du.AbsoluteLong(refTime)
+	assert.EqualValues(t, `2018-01-01`, actual)
+
 	actual = dateTimeLegacy("short", refDateStr)
 	assert.EqualValues(t, `2018-01-01`, actual)
 
 	actual = du.AbsoluteShort(refTimeStamp)
 	assert.EqualValues(t, `2017-12-31`, actual)
 
+	actual = du.AbsoluteLong(refTimeStamp)
+	assert.EqualValues(t, `2017-12-31`, actual)
+
 	actual = du.FullTime(refTimeStamp)
 	assert.EqualValues(t, `2017-12-31 19:00:00 -05:00`, actual)
 }

From 310376525b8644658983073517ae81b9b5f826bf Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Tue, 5 Nov 2024 21:40:44 +0100
Subject: [PATCH 316/443] [CHORE] Use forked `binding` library

- Use the forked [binding](https://code.forgejo.org/go-chi/binding)
library. This library has two benefits, it removes the usage of
`github.com/goccy/go-json` (has no benefit as the minimo library is also
using it). It adds the `TrimSpace` feature, which will during the
binding part trim the spaces around the value it got from the form, this
is done before validation.
---
 assets/go-licenses.json                  | 10 +++++-----
 go.mod                                   |  2 +-
 go.sum                                   |  4 ++--
 modules/issue/template/template.go       |  2 +-
 modules/validation/binding.go            |  2 +-
 modules/validation/binding_test.go       |  2 +-
 modules/validation/glob_pattern_test.go  |  2 +-
 modules/validation/refname_test.go       |  2 +-
 modules/validation/regex_pattern_test.go |  2 +-
 modules/validation/validurl_test.go      |  2 +-
 modules/web/middleware/binding.go        |  2 +-
 modules/web/route.go                     |  2 +-
 routers/api/v1/api.go                    |  2 +-
 routers/private/internal.go              |  2 +-
 routers/web/auth/oauth.go                |  2 +-
 routers/web/repo/issue.go                |  2 +-
 routers/web/repo/setting/webhook.go      |  2 +-
 services/forms/admin.go                  |  2 +-
 services/forms/auth_form.go              |  2 +-
 services/forms/org.go                    |  2 +-
 services/forms/package_form.go           |  2 +-
 services/forms/repo_branch_form.go       |  2 +-
 services/forms/repo_form.go              |  2 +-
 services/forms/repo_tag_form.go          |  2 +-
 services/forms/runner.go                 |  2 +-
 services/forms/user_form.go              |  2 +-
 services/forms/user_form_auth_openid.go  |  2 +-
 services/webhook/discord.go              |  2 +-
 services/webhook/slack.go                |  2 +-
 services/webhook/sourcehut/builds.go     |  2 +-
 30 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/assets/go-licenses.json b/assets/go-licenses.json
index 6bff22a505..bdb6071b7f 100644
--- a/assets/go-licenses.json
+++ b/assets/go-licenses.json
@@ -24,6 +24,11 @@
     "path": "code.forgejo.org/forgejo/reply/LICENSE",
     "licenseText": "MIT License\n\nCopyright (c) The Forgejo Authors\nCopyright (c) Discourse\nCopyright (c) Claudemiro\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
   },
+  {
+    "name": "code.forgejo.org/go-chi/binding",
+    "path": "code.forgejo.org/go-chi/binding/LICENSE",
+    "licenseText": "Apache License\nVersion 2.0, January 2004\nhttp://www.apache.org/licenses/\n\nTERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n1. Definitions.\n\n\"License\" shall mean the terms and conditions for use, reproduction, and\ndistribution as defined by Sections 1 through 9 of this document.\n\n\"Licensor\" shall mean the copyright owner or entity authorized by the copyright\nowner that is granting the License.\n\n\"Legal Entity\" shall mean the union of the acting entity and all other entities\nthat control, are controlled by, or are under common control with that entity.\nFor the purposes of this definition, \"control\" means (i) the power, direct or\nindirect, to cause the direction or management of such entity, whether by\ncontract or otherwise, or (ii) ownership of fifty percent (50%) or more of the\noutstanding shares, or (iii) beneficial ownership of such entity.\n\n\"You\" (or \"Your\") shall mean an individual or Legal Entity exercising\npermissions granted by this License.\n\n\"Source\" form shall mean the preferred form for making modifications, including\nbut not limited to software source code, documentation source, and configuration\nfiles.\n\n\"Object\" form shall mean any form resulting from mechanical transformation or\ntranslation of a Source form, including but not limited to compiled object code,\ngenerated documentation, and conversions to other media types.\n\n\"Work\" shall mean the work of authorship, whether in Source or Object form, made\navailable under the License, as indicated by a copyright notice that is included\nin or attached to the work (an example is provided in the Appendix below).\n\n\"Derivative Works\" shall mean any work, whether in Source or Object form, that\nis based on (or derived from) the Work and for which the editorial revisions,\nannotations, elaborations, or other modifications represent, as a whole, an\noriginal work of authorship. For the purposes of this License, Derivative Works\nshall not include works that remain separable from, or merely link (or bind by\nname) to the interfaces of, the Work and Derivative Works thereof.\n\n\"Contribution\" shall mean any work of authorship, including the original version\nof the Work and any modifications or additions to that Work or Derivative Works\nthereof, that is intentionally submitted to Licensor for inclusion in the Work\nby the copyright owner or by an individual or Legal Entity authorized to submit\non behalf of the copyright owner. For the purposes of this definition,\n\"submitted\" means any form of electronic, verbal, or written communication sent\nto the Licensor or its representatives, including but not limited to\ncommunication on electronic mailing lists, source code control systems, and\nissue tracking systems that are managed by, or on behalf of, the Licensor for\nthe purpose of discussing and improving the Work, but excluding communication\nthat is conspicuously marked or otherwise designated in writing by the copyright\nowner as \"Not a Contribution.\"\n\n\"Contributor\" shall mean Licensor and any individual or Legal Entity on behalf\nof whom a Contribution has been received by Licensor and subsequently\nincorporated within the Work.\n\n2. Grant of Copyright License.\n\nSubject to the terms and conditions of this License, each Contributor hereby\ngrants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,\nirrevocable copyright license to reproduce, prepare Derivative Works of,\npublicly display, publicly perform, sublicense, and distribute the Work and such\nDerivative Works in Source or Object form.\n\n3. Grant of Patent License.\n\nSubject to the terms and conditions of this License, each Contributor hereby\ngrants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,\nirrevocable (except as stated in this section) patent license to make, have\nmade, use, offer to sell, sell, import, and otherwise transfer the Work, where\nsuch license applies only to those patent claims licensable by such Contributor\nthat are necessarily infringed by their Contribution(s) alone or by combination\nof their Contribution(s) with the Work to which such Contribution(s) was\nsubmitted. If You institute patent litigation against any entity (including a\ncross-claim or counterclaim in a lawsuit) alleging that the Work or a\nContribution incorporated within the Work constitutes direct or contributory\npatent infringement, then any patent licenses granted to You under this License\nfor that Work shall terminate as of the date such litigation is filed.\n\n4. Redistribution.\n\nYou may reproduce and distribute copies of the Work or Derivative Works thereof\nin any medium, with or without modifications, and in Source or Object form,\nprovided that You meet the following conditions:\n\nYou must give any other recipients of the Work or Derivative Works a copy of\nthis License; and\nYou must cause any modified files to carry prominent notices stating that You\nchanged the files; and\nYou must retain, in the Source form of any Derivative Works that You distribute,\nall copyright, patent, trademark, and attribution notices from the Source form\nof the Work, excluding those notices that do not pertain to any part of the\nDerivative Works; and\nIf the Work includes a \"NOTICE\" text file as part of its distribution, then any\nDerivative Works that You distribute must include a readable copy of the\nattribution notices contained within such NOTICE file, excluding those notices\nthat do not pertain to any part of the Derivative Works, in at least one of the\nfollowing places: within a NOTICE text file distributed as part of the\nDerivative Works; within the Source form or documentation, if provided along\nwith the Derivative Works; or, within a display generated by the Derivative\nWorks, if and wherever such third-party notices normally appear. The contents of\nthe NOTICE file are for informational purposes only and do not modify the\nLicense. You may add Your own attribution notices within Derivative Works that\nYou distribute, alongside or as an addendum to the NOTICE text from the Work,\nprovided that such additional attribution notices cannot be construed as\nmodifying the License.\nYou may add Your own copyright statement to Your modifications and may provide\nadditional or different license terms and conditions for use, reproduction, or\ndistribution of Your modifications, or for any such Derivative Works as a whole,\nprovided Your use, reproduction, and distribution of the Work otherwise complies\nwith the conditions stated in this License.\n\n5. Submission of Contributions.\n\nUnless You explicitly state otherwise, any Contribution intentionally submitted\nfor inclusion in the Work by You to the Licensor shall be under the terms and\nconditions of this License, without any additional terms or conditions.\nNotwithstanding the above, nothing herein shall supersede or modify the terms of\nany separate license agreement you may have executed with Licensor regarding\nsuch Contributions.\n\n6. Trademarks.\n\nThis License does not grant permission to use the trade names, trademarks,\nservice marks, or product names of the Licensor, except as required for\nreasonable and customary use in describing the origin of the Work and\nreproducing the content of the NOTICE file.\n\n7. Disclaimer of Warranty.\n\nUnless required by applicable law or agreed to in writing, Licensor provides the\nWork (and each Contributor provides its Contributions) on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,\nincluding, without limitation, any warranties or conditions of TITLE,\nNON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are\nsolely responsible for determining the appropriateness of using or\nredistributing the Work and assume any risks associated with Your exercise of\npermissions under this License.\n\n8. Limitation of Liability.\n\nIn no event and under no legal theory, whether in tort (including negligence),\ncontract, or otherwise, unless required by applicable law (such as deliberate\nand grossly negligent acts) or agreed to in writing, shall any Contributor be\nliable to You for damages, including any direct, indirect, special, incidental,\nor consequential damages of any character arising as a result of this License or\nout of the use or inability to use the Work (including but not limited to\ndamages for loss of goodwill, work stoppage, computer failure or malfunction, or\nany and all other commercial damages or losses), even if such Contributor has\nbeen advised of the possibility of such damages.\n\n9. Accepting Warranty or Additional Liability.\n\nWhile redistributing the Work or Derivative Works thereof, You may choose to\noffer, and charge a fee for, acceptance of support, warranty, indemnity, or\nother liability obligations and/or rights consistent with this License. However,\nin accepting such obligations, You may act only on Your own behalf and on Your\nsole responsibility, not on behalf of any other Contributor, and only if You\nagree to indemnify, defend, and hold each Contributor harmless for any liability\nincurred by, or claims asserted against, such Contributor by reason of your\naccepting any such warranty or additional liability.\n\nEND OF TERMS AND CONDITIONS\n\nAPPENDIX: How to apply the Apache License to your work\n\nTo apply the Apache License to your work, attach the following boilerplate\nnotice, with the fields enclosed by brackets \"[]\" replaced with your own\nidentifying information. (Don't include the brackets!) The text should be\nenclosed in the appropriate comment syntax for the file format. We also\nrecommend that a file or class name and description of purpose be included on\nthe same \"printed page\" as the copyright notice for easier identification within\nthird-party archives.\n\n   Copyright [yyyy] [name of copyright owner]\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n     http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License."
+  },
   {
     "name": "code.forgejo.org/go-chi/cache",
     "path": "code.forgejo.org/go-chi/cache/LICENSE",
@@ -74,11 +79,6 @@
     "path": "git.sr.ht/~mariusor/go-xsd-duration/LICENSE",
     "licenseText": "MIT License\n\nCopyright (c) 2019 Go xsd:duration\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
   },
-  {
-    "name": "gitea.com/go-chi/binding",
-    "path": "gitea.com/go-chi/binding/LICENSE",
-    "licenseText": "Apache License\nVersion 2.0, January 2004\nhttp://www.apache.org/licenses/\n\nTERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n1. Definitions.\n\n\"License\" shall mean the terms and conditions for use, reproduction, and\ndistribution as defined by Sections 1 through 9 of this document.\n\n\"Licensor\" shall mean the copyright owner or entity authorized by the copyright\nowner that is granting the License.\n\n\"Legal Entity\" shall mean the union of the acting entity and all other entities\nthat control, are controlled by, or are under common control with that entity.\nFor the purposes of this definition, \"control\" means (i) the power, direct or\nindirect, to cause the direction or management of such entity, whether by\ncontract or otherwise, or (ii) ownership of fifty percent (50%) or more of the\noutstanding shares, or (iii) beneficial ownership of such entity.\n\n\"You\" (or \"Your\") shall mean an individual or Legal Entity exercising\npermissions granted by this License.\n\n\"Source\" form shall mean the preferred form for making modifications, including\nbut not limited to software source code, documentation source, and configuration\nfiles.\n\n\"Object\" form shall mean any form resulting from mechanical transformation or\ntranslation of a Source form, including but not limited to compiled object code,\ngenerated documentation, and conversions to other media types.\n\n\"Work\" shall mean the work of authorship, whether in Source or Object form, made\navailable under the License, as indicated by a copyright notice that is included\nin or attached to the work (an example is provided in the Appendix below).\n\n\"Derivative Works\" shall mean any work, whether in Source or Object form, that\nis based on (or derived from) the Work and for which the editorial revisions,\nannotations, elaborations, or other modifications represent, as a whole, an\noriginal work of authorship. For the purposes of this License, Derivative Works\nshall not include works that remain separable from, or merely link (or bind by\nname) to the interfaces of, the Work and Derivative Works thereof.\n\n\"Contribution\" shall mean any work of authorship, including the original version\nof the Work and any modifications or additions to that Work or Derivative Works\nthereof, that is intentionally submitted to Licensor for inclusion in the Work\nby the copyright owner or by an individual or Legal Entity authorized to submit\non behalf of the copyright owner. For the purposes of this definition,\n\"submitted\" means any form of electronic, verbal, or written communication sent\nto the Licensor or its representatives, including but not limited to\ncommunication on electronic mailing lists, source code control systems, and\nissue tracking systems that are managed by, or on behalf of, the Licensor for\nthe purpose of discussing and improving the Work, but excluding communication\nthat is conspicuously marked or otherwise designated in writing by the copyright\nowner as \"Not a Contribution.\"\n\n\"Contributor\" shall mean Licensor and any individual or Legal Entity on behalf\nof whom a Contribution has been received by Licensor and subsequently\nincorporated within the Work.\n\n2. Grant of Copyright License.\n\nSubject to the terms and conditions of this License, each Contributor hereby\ngrants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,\nirrevocable copyright license to reproduce, prepare Derivative Works of,\npublicly display, publicly perform, sublicense, and distribute the Work and such\nDerivative Works in Source or Object form.\n\n3. Grant of Patent License.\n\nSubject to the terms and conditions of this License, each Contributor hereby\ngrants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,\nirrevocable (except as stated in this section) patent license to make, have\nmade, use, offer to sell, sell, import, and otherwise transfer the Work, where\nsuch license applies only to those patent claims licensable by such Contributor\nthat are necessarily infringed by their Contribution(s) alone or by combination\nof their Contribution(s) with the Work to which such Contribution(s) was\nsubmitted. If You institute patent litigation against any entity (including a\ncross-claim or counterclaim in a lawsuit) alleging that the Work or a\nContribution incorporated within the Work constitutes direct or contributory\npatent infringement, then any patent licenses granted to You under this License\nfor that Work shall terminate as of the date such litigation is filed.\n\n4. Redistribution.\n\nYou may reproduce and distribute copies of the Work or Derivative Works thereof\nin any medium, with or without modifications, and in Source or Object form,\nprovided that You meet the following conditions:\n\nYou must give any other recipients of the Work or Derivative Works a copy of\nthis License; and\nYou must cause any modified files to carry prominent notices stating that You\nchanged the files; and\nYou must retain, in the Source form of any Derivative Works that You distribute,\nall copyright, patent, trademark, and attribution notices from the Source form\nof the Work, excluding those notices that do not pertain to any part of the\nDerivative Works; and\nIf the Work includes a \"NOTICE\" text file as part of its distribution, then any\nDerivative Works that You distribute must include a readable copy of the\nattribution notices contained within such NOTICE file, excluding those notices\nthat do not pertain to any part of the Derivative Works, in at least one of the\nfollowing places: within a NOTICE text file distributed as part of the\nDerivative Works; within the Source form or documentation, if provided along\nwith the Derivative Works; or, within a display generated by the Derivative\nWorks, if and wherever such third-party notices normally appear. The contents of\nthe NOTICE file are for informational purposes only and do not modify the\nLicense. You may add Your own attribution notices within Derivative Works that\nYou distribute, alongside or as an addendum to the NOTICE text from the Work,\nprovided that such additional attribution notices cannot be construed as\nmodifying the License.\nYou may add Your own copyright statement to Your modifications and may provide\nadditional or different license terms and conditions for use, reproduction, or\ndistribution of Your modifications, or for any such Derivative Works as a whole,\nprovided Your use, reproduction, and distribution of the Work otherwise complies\nwith the conditions stated in this License.\n\n5. Submission of Contributions.\n\nUnless You explicitly state otherwise, any Contribution intentionally submitted\nfor inclusion in the Work by You to the Licensor shall be under the terms and\nconditions of this License, without any additional terms or conditions.\nNotwithstanding the above, nothing herein shall supersede or modify the terms of\nany separate license agreement you may have executed with Licensor regarding\nsuch Contributions.\n\n6. Trademarks.\n\nThis License does not grant permission to use the trade names, trademarks,\nservice marks, or product names of the Licensor, except as required for\nreasonable and customary use in describing the origin of the Work and\nreproducing the content of the NOTICE file.\n\n7. Disclaimer of Warranty.\n\nUnless required by applicable law or agreed to in writing, Licensor provides the\nWork (and each Contributor provides its Contributions) on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,\nincluding, without limitation, any warranties or conditions of TITLE,\nNON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are\nsolely responsible for determining the appropriateness of using or\nredistributing the Work and assume any risks associated with Your exercise of\npermissions under this License.\n\n8. Limitation of Liability.\n\nIn no event and under no legal theory, whether in tort (including negligence),\ncontract, or otherwise, unless required by applicable law (such as deliberate\nand grossly negligent acts) or agreed to in writing, shall any Contributor be\nliable to You for damages, including any direct, indirect, special, incidental,\nor consequential damages of any character arising as a result of this License or\nout of the use or inability to use the Work (including but not limited to\ndamages for loss of goodwill, work stoppage, computer failure or malfunction, or\nany and all other commercial damages or losses), even if such Contributor has\nbeen advised of the possibility of such damages.\n\n9. Accepting Warranty or Additional Liability.\n\nWhile redistributing the Work or Derivative Works thereof, You may choose to\noffer, and charge a fee for, acceptance of support, warranty, indemnity, or\nother liability obligations and/or rights consistent with this License. However,\nin accepting such obligations, You may act only on Your own behalf and on Your\nsole responsibility, not on behalf of any other Contributor, and only if You\nagree to indemnify, defend, and hold each Contributor harmless for any liability\nincurred by, or claims asserted against, such Contributor by reason of your\naccepting any such warranty or additional liability.\n\nEND OF TERMS AND CONDITIONS\n\nAPPENDIX: How to apply the Apache License to your work\n\nTo apply the Apache License to your work, attach the following boilerplate\nnotice, with the fields enclosed by brackets \"[]\" replaced with your own\nidentifying information. (Don't include the brackets!) The text should be\nenclosed in the appropriate comment syntax for the file format. We also\nrecommend that a file or class name and description of purpose be included on\nthe same \"printed page\" as the copyright notice for easier identification within\nthird-party archives.\n\n   Copyright [yyyy] [name of copyright owner]\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n     http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License."
-  },
   {
     "name": "gitea.com/lunny/levelqueue",
     "path": "gitea.com/lunny/levelqueue/LICENSE",
diff --git a/go.mod b/go.mod
index f99df48bc9..60b14837eb 100644
--- a/go.mod
+++ b/go.mod
@@ -6,6 +6,7 @@ require (
 	code.forgejo.org/f3/gof3/v3 v3.7.0
 	code.forgejo.org/forgejo-contrib/go-libravatar v0.0.0-20191008002943-06d1c002b251
 	code.forgejo.org/forgejo/reply v1.0.2
+	code.forgejo.org/go-chi/binding v0.0.0-20241105210225-1f8bf5136720
 	code.forgejo.org/go-chi/cache v0.0.0-20240912103640-dcb08fba860d
 	code.forgejo.org/go-chi/captcha v0.0.0-20240905153133-df43b9250ed5
 	code.forgejo.org/go-chi/session v0.0.0-20241017103059-2a992261fc26
@@ -14,7 +15,6 @@ require (
 	code.gitea.io/sdk/gitea v0.17.1
 	codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570
 	connectrpc.com/connect v1.17.0
-	gitea.com/go-chi/binding v0.0.0-20240430071103-39a851e106ed
 	gitea.com/lunny/levelqueue v0.4.2-0.20230414023320-3c0159fe0fe4
 	github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121
 	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358
diff --git a/go.sum b/go.sum
index e799ddc69d..c2af9b3c36 100644
--- a/go.sum
+++ b/go.sum
@@ -10,6 +10,8 @@ code.forgejo.org/forgejo/archiver/v3 v3.5.1 h1:UmmbA7D5550uf71SQjarmrn6yKwOGxtEj
 code.forgejo.org/forgejo/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4=
 code.forgejo.org/forgejo/reply v1.0.2 h1:dMhQCHV6/O3L5CLWNTol+dNzDAuyCK88z4J/lCdgFuQ=
 code.forgejo.org/forgejo/reply v1.0.2/go.mod h1:RyZUfzQLc+fuLIGjTSQWDAJWPiL4WtKXB/FifT5fM7U=
+code.forgejo.org/go-chi/binding v0.0.0-20241105210225-1f8bf5136720 h1:DDdvrdov1a6HK0xiJIUTfGh1RpKP0prkHi2guxhDKIU=
+code.forgejo.org/go-chi/binding v0.0.0-20241105210225-1f8bf5136720/go.mod h1:fWwqaHj0H1/KeCpBqdvKunflq8pYfciEHI5v3UUeE2E=
 code.forgejo.org/go-chi/cache v0.0.0-20240912103640-dcb08fba860d h1:nOu/2GX571t4intmtfvpctS148OqsBYrGUySVm93ifc=
 code.forgejo.org/go-chi/cache v0.0.0-20240912103640-dcb08fba860d/go.mod h1:OVlZ/TqDYJ+RUJ+R+J+OLxtlyjo3pbjBeK7LAWAB+Vk=
 code.forgejo.org/go-chi/captcha v0.0.0-20240905153133-df43b9250ed5 h1:A7P1liXCpJBHEJ5KIDsF0ujnQ8FQ/aX1UixTW0vGrDQ=
@@ -32,8 +34,6 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4HHsCo6xi2oWZYKWW4bly/Ory9FuTpFPRxj/mAg=
 git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs=
-gitea.com/go-chi/binding v0.0.0-20240430071103-39a851e106ed h1:EZZBtilMLSZNWtHHcgq2mt6NSGhJSZBuduAlinMEmso=
-gitea.com/go-chi/binding v0.0.0-20240430071103-39a851e106ed/go.mod h1:E3i3cgB04dDx0v3CytCgRTTn9Z/9x891aet3r456RVw=
 gitea.com/lunny/levelqueue v0.4.2-0.20230414023320-3c0159fe0fe4 h1:IFT+hup2xejHqdhS7keYWioqfmxdnfblFDTGoOwcZ+o=
 gitea.com/lunny/levelqueue v0.4.2-0.20230414023320-3c0159fe0fe4/go.mod h1:HBqmLbz56JWpfEGG0prskAV97ATNRoj5LDmPicD22hU=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
diff --git a/modules/issue/template/template.go b/modules/issue/template/template.go
index 967bed0261..dbbc9e9186 100644
--- a/modules/issue/template/template.go
+++ b/modules/issue/template/template.go
@@ -13,7 +13,7 @@ import (
 	"code.gitea.io/gitea/modules/container"
 	api "code.gitea.io/gitea/modules/structs"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 // Validate checks whether an IssueTemplate is considered valid, and returns the first error
diff --git a/modules/validation/binding.go b/modules/validation/binding.go
index fe434500d5..1c81423ab3 100644
--- a/modules/validation/binding.go
+++ b/modules/validation/binding.go
@@ -11,7 +11,7 @@ import (
 	"code.gitea.io/gitea/modules/auth"
 	"code.gitea.io/gitea/modules/git"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 	"github.com/gobwas/glob"
 )
 
diff --git a/modules/validation/binding_test.go b/modules/validation/binding_test.go
index 01ff4e3435..4f1031abf3 100644
--- a/modules/validation/binding_test.go
+++ b/modules/validation/binding_test.go
@@ -8,7 +8,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 	chi "github.com/go-chi/chi/v5"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/modules/validation/glob_pattern_test.go b/modules/validation/glob_pattern_test.go
index 1bf622e61d..42d86754e1 100644
--- a/modules/validation/glob_pattern_test.go
+++ b/modules/validation/glob_pattern_test.go
@@ -6,7 +6,7 @@ package validation
 import (
 	"testing"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 	"github.com/gobwas/glob"
 )
 
diff --git a/modules/validation/refname_test.go b/modules/validation/refname_test.go
index 3af7387c47..bb64cab51e 100644
--- a/modules/validation/refname_test.go
+++ b/modules/validation/refname_test.go
@@ -6,7 +6,7 @@ package validation
 import (
 	"testing"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 var gitRefNameValidationTestCases = []validationTestCase{
diff --git a/modules/validation/regex_pattern_test.go b/modules/validation/regex_pattern_test.go
index efcb276734..90bd969c4f 100644
--- a/modules/validation/regex_pattern_test.go
+++ b/modules/validation/regex_pattern_test.go
@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"testing"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 func getRegexPatternErrorString(pattern string) string {
diff --git a/modules/validation/validurl_test.go b/modules/validation/validurl_test.go
index 39f7fa5d65..77fa7aa097 100644
--- a/modules/validation/validurl_test.go
+++ b/modules/validation/validurl_test.go
@@ -6,7 +6,7 @@ package validation
 import (
 	"testing"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 var urlValidationTestCases = []validationTestCase{
diff --git a/modules/web/middleware/binding.go b/modules/web/middleware/binding.go
index bc0735b2cd..4e43f6d4b3 100644
--- a/modules/web/middleware/binding.go
+++ b/modules/web/middleware/binding.go
@@ -13,7 +13,7 @@ import (
 	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/modules/validation"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 // Form form binding interface
diff --git a/modules/web/route.go b/modules/web/route.go
index 805fcb4411..eda6871d85 100644
--- a/modules/web/route.go
+++ b/modules/web/route.go
@@ -9,7 +9,7 @@ import (
 
 	"code.gitea.io/gitea/modules/web/middleware"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 	"github.com/go-chi/chi/v5"
 )
 
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index b8f49a5bb6..718b27aeef 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -103,7 +103,7 @@ import (
 
 	_ "code.gitea.io/gitea/routers/api/v1/swagger" // for swagger generation
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 func sudo() func(ctx *context.APIContext) {
diff --git a/routers/private/internal.go b/routers/private/internal.go
index 311f59b60e..dfbdc6967b 100644
--- a/routers/private/internal.go
+++ b/routers/private/internal.go
@@ -15,7 +15,7 @@ import (
 	"code.gitea.io/gitea/modules/web"
 	"code.gitea.io/gitea/services/context"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 	chi_middleware "github.com/go-chi/chi/v5/middleware"
 )
 
diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go
index ee08b514b1..a9cbce9a9d 100644
--- a/routers/web/auth/oauth.go
+++ b/routers/web/auth/oauth.go
@@ -40,7 +40,7 @@ import (
 	remote_service "code.gitea.io/gitea/services/remote"
 	user_service "code.gitea.io/gitea/services/user"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/gothic"
diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
index a9351c6a55..6a485b0066 100644
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@@ -58,7 +58,7 @@ import (
 	pull_service "code.gitea.io/gitea/services/pull"
 	repo_service "code.gitea.io/gitea/services/repository"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 const (
diff --git a/routers/web/repo/setting/webhook.go b/routers/web/repo/setting/webhook.go
index eee493e2c2..af54997794 100644
--- a/routers/web/repo/setting/webhook.go
+++ b/routers/web/repo/setting/webhook.go
@@ -28,7 +28,7 @@ import (
 	"code.gitea.io/gitea/services/forms"
 	webhook_service "code.gitea.io/gitea/services/webhook"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 const (
diff --git a/services/forms/admin.go b/services/forms/admin.go
index d71fc076fc..1f055cff55 100644
--- a/services/forms/admin.go
+++ b/services/forms/admin.go
@@ -10,7 +10,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 // AdminCreateUserForm form for admin to create user
diff --git a/services/forms/auth_form.go b/services/forms/auth_form.go
index a3eca9473b..f0da63155a 100644
--- a/services/forms/auth_form.go
+++ b/services/forms/auth_form.go
@@ -9,7 +9,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 // AuthenticationForm form for authentication
diff --git a/services/forms/org.go b/services/forms/org.go
index db182f7e96..dea2e159e9 100644
--- a/services/forms/org.go
+++ b/services/forms/org.go
@@ -11,7 +11,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 // ________                            .__                __  .__
diff --git a/services/forms/package_form.go b/services/forms/package_form.go
index 9b6f907164..d475d2f569 100644
--- a/services/forms/package_form.go
+++ b/services/forms/package_form.go
@@ -9,7 +9,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 type PackageCleanupRuleForm struct {
diff --git a/services/forms/repo_branch_form.go b/services/forms/repo_branch_form.go
index 42e6c85c37..186a4ad367 100644
--- a/services/forms/repo_branch_form.go
+++ b/services/forms/repo_branch_form.go
@@ -9,7 +9,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 // NewBranchForm form for creating a new branch
diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go
index c3d9c3edc9..63049284d0 100644
--- a/services/forms/repo_form.go
+++ b/services/forms/repo_form.go
@@ -21,7 +21,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 // CreateRepoForm form for creating repository
diff --git a/services/forms/repo_tag_form.go b/services/forms/repo_tag_form.go
index 0135684737..38f5996db3 100644
--- a/services/forms/repo_tag_form.go
+++ b/services/forms/repo_tag_form.go
@@ -9,7 +9,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 // ProtectTagForm form for changing protected tag settings
diff --git a/services/forms/runner.go b/services/forms/runner.go
index 6abfc66fc2..f933750858 100644
--- a/services/forms/runner.go
+++ b/services/forms/runner.go
@@ -9,7 +9,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 // EditRunnerForm form for admin to create runner
diff --git a/services/forms/user_form.go b/services/forms/user_form.go
index 67c8f00715..afd3a42982 100644
--- a/services/forms/user_form.go
+++ b/services/forms/user_form.go
@@ -16,7 +16,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 // InstallForm form for installation page
diff --git a/services/forms/user_form_auth_openid.go b/services/forms/user_form_auth_openid.go
index 595bfecad9..c5ab703fa1 100644
--- a/services/forms/user_form_auth_openid.go
+++ b/services/forms/user_form_auth_openid.go
@@ -9,7 +9,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 // SignInOpenIDForm form for signing in with OpenID
diff --git a/services/webhook/discord.go b/services/webhook/discord.go
index b0142b8509..7741ceb10d 100644
--- a/services/webhook/discord.go
+++ b/services/webhook/discord.go
@@ -26,7 +26,7 @@ import (
 	"code.gitea.io/gitea/services/forms"
 	"code.gitea.io/gitea/services/webhook/shared"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 type discordHandler struct{}
diff --git a/services/webhook/slack.go b/services/webhook/slack.go
index af93976bd6..1fa33444f3 100644
--- a/services/webhook/slack.go
+++ b/services/webhook/slack.go
@@ -22,7 +22,7 @@ import (
 	"code.gitea.io/gitea/services/forms"
 	"code.gitea.io/gitea/services/webhook/shared"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )
 
 type slackHandler struct{}
diff --git a/services/webhook/sourcehut/builds.go b/services/webhook/sourcehut/builds.go
index 7b7ace15bb..5a34503a7d 100644
--- a/services/webhook/sourcehut/builds.go
+++ b/services/webhook/sourcehut/builds.go
@@ -24,7 +24,7 @@ import (
 	"code.gitea.io/gitea/services/forms"
 	"code.gitea.io/gitea/services/webhook/shared"
 
-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 	"gopkg.in/yaml.v3"
 )
 

From 495274769973ad7a6531060c7bbfaf009cca671b Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Tue, 5 Nov 2024 22:05:35 +0100
Subject: [PATCH 317/443] [FEAT] Trim spaces from repository name

- This uses the `TrimSpace` preprocessing of the binding library to
remove any accidental spaces from the input.
- Integration test added.
- Resolves #4309
---
 services/forms/repo_form.go             |  2 +-
 tests/integration/repo_generate_test.go | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go
index 63049284d0..58c34473aa 100644
--- a/services/forms/repo_form.go
+++ b/services/forms/repo_form.go
@@ -27,7 +27,7 @@ import (
 // CreateRepoForm form for creating repository
 type CreateRepoForm struct {
 	UID           int64  `binding:"Required"`
-	RepoName      string `binding:"Required;AlphaDashDot;MaxSize(100)"`
+	RepoName      string `binding:"Required;AlphaDashDot;MaxSize(100)" preprocess:"TrimSpace"`
 	Private       bool
 	Description   string `binding:"MaxSize(2048)"`
 	DefaultBranch string `binding:"GitRefName;MaxSize(100)"`
diff --git a/tests/integration/repo_generate_test.go b/tests/integration/repo_generate_test.go
index c475c92eef..0b2870ad56 100644
--- a/tests/integration/repo_generate_test.go
+++ b/tests/integration/repo_generate_test.go
@@ -11,9 +11,11 @@ import (
 	"strings"
 	"testing"
 
+	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unittest"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/test"
 	"code.gitea.io/gitea/modules/translation"
 	"code.gitea.io/gitea/tests"
 
@@ -135,3 +137,19 @@ func TestRepoGenerateToOrg(t *testing.T) {
 
 	testRepoGenerate(t, session, "44", "user27", "template1", user, org, "generated2")
 }
+
+func TestRepoCreateFormTrimSpace(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+	session := loginUser(t, user.Name)
+
+	req := NewRequestWithValues(t, "POST", "/repo/create", map[string]string{
+		"_csrf":     GetCSRF(t, session, "/repo/create"),
+		"uid":       "2",
+		"repo_name": " spaced-name ",
+	})
+	resp := session.MakeRequest(t, req, http.StatusSeeOther)
+
+	assert.EqualValues(t, "/user2/spaced-name", test.RedirectURL(resp))
+	unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerID: 2, Name: "spaced-name"})
+}

From 329650a9b4062dc106c1f4322634e572a385add8 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Wed, 6 Nov 2024 00:03:27 +0000
Subject: [PATCH 318/443] Update dependency djlint to v1.36.0

---
 poetry.lock    | 84 +++++++++++++++-----------------------------------
 pyproject.toml |  2 +-
 2 files changed, 25 insertions(+), 61 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 5bfced4407..e431693b14 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -59,41 +59,39 @@ six = ">=1.13.0"
 
 [[package]]
 name = "djlint"
-version = "1.35.4"
+version = "1.36.0"
 description = "HTML Template Linter and Formatter"
 optional = false
 python-versions = ">=3.9"
 files = [
-    {file = "djlint-1.35.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:14a278a340a46f8e1187afba8e0bccdd6ebee58ac129807448d35f6445671665"},
-    {file = "djlint-1.35.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e741641de0a26025ef6ba04978aea9480a1d3ddd4d9060820cbc250a34a552bf"},
-    {file = "djlint-1.35.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2effff20e821199439882843a56179e6b1c158c2c2a1b058e1e5d87643f84c77"},
-    {file = "djlint-1.35.4-cp310-cp310-win_amd64.whl", hash = "sha256:085fdc16d359abf270f1bfe7b22d4cc73c85ab070147cefb09b32d962cefddc3"},
-    {file = "djlint-1.35.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:66db077a033c03abe26ebdd7819229a86cee9edb7ce6c5eab03100c5dc178202"},
-    {file = "djlint-1.35.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d62563deae046bc2e94747110bc785cce416088e9ee6db6c31702c01d0f5212f"},
-    {file = "djlint-1.35.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9c4bfbaba4622a1439d30956da891315aefce7c56ffaefe1220cfeb1d99cf628"},
-    {file = "djlint-1.35.4-cp311-cp311-win_amd64.whl", hash = "sha256:677d95914d45b6fdeaf3f356dd857feef55be041804909e5a35042acc7c7c196"},
-    {file = "djlint-1.35.4-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:c5dddbf2d5cb2bbbf4ef53c6e7c0042e41ff3e7097eed3f1ce53a8e4c2cb7eec"},
-    {file = "djlint-1.35.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:65ebe3f4dcee2944d101e3ccadc71cab13a4c59cebd428bb5ba59609d365c232"},
-    {file = "djlint-1.35.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b457e672fca03eefdfcf6e4c1dd4bfc2c324e8b0755e5def2d94c9273eb6edc7"},
-    {file = "djlint-1.35.4-cp312-cp312-win_amd64.whl", hash = "sha256:6982bebd9e2587bc503d6bd0fdea492fd70ebac79aad7cbecd0d67dfebe1de4e"},
-    {file = "djlint-1.35.4-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:7b12ad12048c4a44a61bd39e5f85147e9b8f1ca85b76c5066603747f660a2922"},
-    {file = "djlint-1.35.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:24aca63394d2f060d5f6367c34e3dca3ecb1c5c5a908ce24147243bccc8710c9"},
-    {file = "djlint-1.35.4-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:858e6bce13aedaf387a20d625e4795113b78ac1fb572bd4d03abb76f89822722"},
-    {file = "djlint-1.35.4-cp313-cp313-win_amd64.whl", hash = "sha256:491a41c23981164bbc7bc754ab0d39c99f5aa1887680a3fd00543f6dd50fc907"},
-    {file = "djlint-1.35.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:519546a873909ab7832cb1b07f9503fa8b6fee2a8178e4ee42ae62640eb19b93"},
-    {file = "djlint-1.35.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c7864eceffed926eabc78f52a2aeda3895df8eb38b6ff17e4455debba64cd922"},
-    {file = "djlint-1.35.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8adcfb56fcb20010f4c778b879846ec488689356a1f9e502326d980e582e78a9"},
-    {file = "djlint-1.35.4-cp39-cp39-win_amd64.whl", hash = "sha256:0c41a21de3de0e60cc02154d432d407577e83e21e2ac7ca45f195095beb57099"},
-    {file = "djlint-1.35.4-py3-none-any.whl", hash = "sha256:ed6088d416019e453c1451463ed44ffbf3f84c3bd8b1dfeadc456103fd1e5d14"},
-    {file = "djlint-1.35.4.tar.gz", hash = "sha256:d4a1342d83e65171059925b87ab351a1d5201289a764f9e092ef7a99e312554e"},
+    {file = "djlint-1.36.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:285eef75559b6fb89b064b8f5f82aa81be3dcf7d98bc64eac64c9540c1d7c382"},
+    {file = "djlint-1.36.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:84132b86fc71da429874574a812346c62095f7f0a72eec992db8b2719c009e5e"},
+    {file = "djlint-1.36.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:911ce39481310b7cf956122cfba1cad506a7fea91b20416b28c2279faa3ecf05"},
+    {file = "djlint-1.36.0-cp310-cp310-win_amd64.whl", hash = "sha256:927eab288635a33d2ed4548363e42202655cad9d5eda5b27c39164be1ecbbc3d"},
+    {file = "djlint-1.36.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:166994f48446321a449c71215da97354eae00488e755bbb100e216ef2f222860"},
+    {file = "djlint-1.36.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2c273a23d2f8053b08da0ddf3d98df432807b2f9646ca3361a3fde538924eae2"},
+    {file = "djlint-1.36.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:bd55db8740a7e454558809fd489c54303a85da33ad2724b3e7686c1f96145b7d"},
+    {file = "djlint-1.36.0-cp311-cp311-win_amd64.whl", hash = "sha256:a50b5d45cd8c6299893ab69f0909d72545acde07fbf77f2c0bc857b292ffe619"},
+    {file = "djlint-1.36.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:f60d6a50a6f9a78d0ffaedf2921aa181f88342d51b330c63309109af5845dccf"},
+    {file = "djlint-1.36.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a85d79b5fcb7c829e3466e106f5851a8cff0b363ab42aa79e7efb8b1aa68894d"},
+    {file = "djlint-1.36.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dcff6d3013ba55a26604abb0ce63b185de192b250c7220242e373d5fb6fa3700"},
+    {file = "djlint-1.36.0-cp312-cp312-win_amd64.whl", hash = "sha256:8fd87e4ca1a1d5595e9fb8566b4eb5df025836d3dedec5fe6d8579a1dcbce8c2"},
+    {file = "djlint-1.36.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:393542dce74fe1eee0f4da8ef0ef6df262200eeb6c9fda37332f10c20c2d2a9b"},
+    {file = "djlint-1.36.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:03473829eccc0b02538b7325ccee43122365083cfd1375c8291672eb84348c8a"},
+    {file = "djlint-1.36.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9f99be7522e37451b4adb9cd601822a8942ae393da9a36880072a089930c4903"},
+    {file = "djlint-1.36.0-cp313-cp313-win_amd64.whl", hash = "sha256:b79804a64e2435fb9d474e814fa0c39a1dd0e0566f4cfca3b979a6ac65e893fa"},
+    {file = "djlint-1.36.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1da98e2e3cf46b593d1cc8d884969ca2aa30117260459e03e44f675740815b9e"},
+    {file = "djlint-1.36.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:a59f8463de9fe8b5c5bdea3f787ee197cf790f479c5e0c0b3deb44e13416a2f4"},
+    {file = "djlint-1.36.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:171ac17fd6826257705fe725ff4155e63e5d11da206466e730072a75806e72bc"},
+    {file = "djlint-1.36.0-cp39-cp39-win_amd64.whl", hash = "sha256:e57a167c0bf284b5dd697ca4ef2def25e9290c9db5b191bcc889db4385d977f7"},
+    {file = "djlint-1.36.0-py3-none-any.whl", hash = "sha256:dc10fe009b8d6dfafa800b326e8e3cfff6267d7040a485ff635f2ff09e200a44"},
+    {file = "djlint-1.36.0.tar.gz", hash = "sha256:c6a16905d69d02bfd745084a3ebf065707efbaf0a31762b34441802beb206b51"},
 ]
 
 [package.dependencies]
 click = ">=8.0.1"
 colorama = ">=0.4.4"
 cssbeautifier = ">=1.14.4"
-html-tag-names = ">=0.1.2"
-html-void-elements = ">=0.1"
 jsbeautifier = ">=1.14.4"
 json5 = ">=0.9.11"
 pathspec = ">=0.12"
@@ -101,7 +99,6 @@ pyyaml = ">=6"
 regex = ">=2023"
 tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""}
 tqdm = ">=4.62.2"
-typing-extensions = ">=3.7.4"
 
 [[package]]
 name = "editorconfig"
@@ -113,28 +110,6 @@ files = [
     {file = "EditorConfig-0.12.4.tar.gz", hash = "sha256:24857fa1793917dd9ccf0c7810a07e05404ce9b823521c7dce22a4fb5d125f80"},
 ]
 
-[[package]]
-name = "html-tag-names"
-version = "0.1.2"
-description = "List of known HTML tag names"
-optional = false
-python-versions = ">=3.7,<4.0"
-files = [
-    {file = "html-tag-names-0.1.2.tar.gz", hash = "sha256:04924aca48770f36b5a41c27e4d917062507be05118acb0ba869c97389084297"},
-    {file = "html_tag_names-0.1.2-py3-none-any.whl", hash = "sha256:eeb69ef21078486b615241f0393a72b41352c5219ee648e7c61f5632d26f0420"},
-]
-
-[[package]]
-name = "html-void-elements"
-version = "0.1.0"
-description = "List of HTML void tag names."
-optional = false
-python-versions = ">=3.7,<4.0"
-files = [
-    {file = "html-void-elements-0.1.0.tar.gz", hash = "sha256:931b88f84cd606fee0b582c28fcd00e41d7149421fb673e1e1abd2f0c4f231f0"},
-    {file = "html_void_elements-0.1.0-py3-none-any.whl", hash = "sha256:784cf39db03cdeb017320d9301009f8f3480f9d7b254d0974272e80e0cb5e0d2"},
-]
-
 [[package]]
 name = "jsbeautifier"
 version = "1.15.1"
@@ -378,17 +353,6 @@ notebook = ["ipywidgets (>=6)"]
 slack = ["slack-sdk"]
 telegram = ["requests"]
 
-[[package]]
-name = "typing-extensions"
-version = "4.12.2"
-description = "Backported and Experimental Type Hints for Python 3.8+"
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d"},
-    {file = "typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"},
-]
-
 [[package]]
 name = "yamllint"
 version = "1.35.1"
@@ -410,4 +374,4 @@ dev = ["doc8", "flake8", "flake8-import-order", "rstcheck[sphinx]", "sphinx"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "4cb250b948026c976808ab8fef55def0f81f2e130bf7d5ccda21bc20fa782009"
+content-hash = "d66176c989ec148e340319aee8cd0dd2118da76d7657dcde3bec6a0d4b9bd704"
diff --git a/pyproject.toml b/pyproject.toml
index 78de24d91c..23d35dcd94 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,7 +5,7 @@ package-mode = false
 python = "^3.10"
 
 [tool.poetry.group.dev.dependencies]
-djlint = "1.35.4"
+djlint = "1.36.0"
 yamllint = "1.35.1"
 codespell = "^2.2.6"
 

From 104a1b6fca3684a438e3da9d0e6dfd0e846d9b34 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Wed, 6 Nov 2024 02:03:49 +0000
Subject: [PATCH 319/443] Update dependency happy-dom to v15.10.1

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 35382ad815..632895008d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -86,7 +86,7 @@
         "eslint-plugin-vue-scoped-css": "2.8.1",
         "eslint-plugin-wc": "2.2.0",
         "globals": "15.12.0",
-        "happy-dom": "15.9.0",
+        "happy-dom": "15.10.1",
         "license-checker-rseidelsohn": "4.4.2",
         "markdownlint-cli": "0.42.0",
         "postcss-html": "1.7.0",
@@ -10257,9 +10257,9 @@
       }
     },
     "node_modules/happy-dom": {
-      "version": "15.9.0",
-      "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-15.9.0.tgz",
-      "integrity": "sha512-p+6ySXcpvjVW0Xetv6e8ccT2txbDpHE0RfZOEE84tQ8ESL1nlzCjvS6fZD77DkYXE540D+2N20hhFeBN6B/CJA==",
+      "version": "15.10.1",
+      "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-15.10.1.tgz",
+      "integrity": "sha512-FuGnj/qIB4QnBL6fWmD7Wnh6STxevLgOVWB6+nopDGgWG1+t9CXkNB2ldZ+iqwD2UKxD2D0SU8el8A6AX6Q1+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index e1d6737f23..b3afec3488 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "eslint-plugin-vue-scoped-css": "2.8.1",
     "eslint-plugin-wc": "2.2.0",
     "globals": "15.12.0",
-    "happy-dom": "15.9.0",
+    "happy-dom": "15.10.1",
     "license-checker-rseidelsohn": "4.4.2",
     "markdownlint-cli": "0.42.0",
     "postcss-html": "1.7.0",

From 8b27dcb3b69cb136c8414e347339a6d9930d6b52 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Wed, 6 Nov 2024 14:39:53 +0000
Subject: [PATCH 320/443] Update renovate to v39 (forgejo) (major) (#5829)

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5829
Reviewed-by: Michael Kriese 
Co-authored-by: Renovate Bot 
Co-committed-by: Renovate Bot 
---
 .forgejo/workflows/renovate.yml | 2 +-
 Makefile                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml
index 011d90da00..1f29156069 100644
--- a/.forgejo/workflows/renovate.yml
+++ b/.forgejo/workflows/renovate.yml
@@ -23,7 +23,7 @@ jobs:
 
     runs-on: docker
     container:
-      image: code.forgejo.org/forgejo-contrib/renovate:38.142.5
+      image: code.forgejo.org/forgejo-contrib/renovate:39.5.0
 
     steps:
       - name: Load renovate repo cache
diff --git a/Makefile b/Makefile
index 13fdb5194a..a95a951792 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1 # renovate: datasour
 DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.26.0 # renovate: datasource=go
 GOMOCK_PACKAGE ?= go.uber.org/mock/mockgen@v0.4.0 # renovate: datasource=go
 GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.16.2 # renovate: datasource=go
-RENOVATE_NPM_PACKAGE ?= renovate@38.142.5 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate
+RENOVATE_NPM_PACKAGE ?= renovate@39.5.0 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate
 
 ifeq ($(HAS_GO), yes)
 	CGO_EXTRA_CFLAGS := -DSQLITE_MAX_VARIABLE_NUMBER=32766

From 8bb33b2c4c269f2f459450b4628ac1e488aed6d9 Mon Sep 17 00:00:00 2001
From: Michael Kriese 
Date: Wed, 6 Nov 2024 15:42:07 +0100
Subject: [PATCH 321/443] chore(renovate): use squash for automerge

We don't sign commits, so no benefit for a merge commit.
---
 renovate.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/renovate.json b/renovate.json
index f1dbe57cb7..8231ca6657 100644
--- a/renovate.json
+++ b/renovate.json
@@ -15,6 +15,7 @@
   "postUpdateOptions": ["gomodTidy", "gomodUpdateImportPaths", "npmDedupe"],
   "prConcurrentLimit": 10,
   "osvVulnerabilityAlerts": true,
+  "automergeStrategy": "squash",
   "labels": ["dependency-upgrade"],
   "packageRules": [
     {

From 968ca15f0661c0a8d821192ad06b7f9739695d62 Mon Sep 17 00:00:00 2001
From: Michael Kriese 
Date: Wed, 6 Nov 2024 15:58:44 +0100
Subject: [PATCH 322/443] chore(renovate): fix regex

---
 renovate.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renovate.json b/renovate.json
index 8231ca6657..28cb82e2df 100644
--- a/renovate.json
+++ b/renovate.json
@@ -128,7 +128,7 @@
     },
     {
       "description": "Disable renovate self-updates for release branches",
-      "matchBaseBranches": ["^v\\d+\\.\\d+\\/forgejo$"],
+      "matchBaseBranches": ["/^v\\d+\\.\\d+\\/forgejo$/"],
       "matchDatasources": ["docker"],
       "matchPackageNames": [
         "code.forgejo.org/forgejo-contrib/renovate",

From c801838690dc7c501e2331ba97ae3d5939a2830c Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Wed, 6 Nov 2024 15:36:02 +0100
Subject: [PATCH 323/443] fix: labels are missing in the pull request payload
 removing a label

When ReplaceIssueLabels calls issue.LoadLabels it was a noop because
issue.isLabelsLoaded is still set to true because of the call  to
issue.LoadLabels that was done at the beginning of the function.
---
 models/issues/issue_label.go              |   1 +
 tests/integration/actions_trigger_test.go | 188 +++++++++++++++-------
 2 files changed, 133 insertions(+), 56 deletions(-)

diff --git a/models/issues/issue_label.go b/models/issues/issue_label.go
index 10fc821454..2f0e2897a9 100644
--- a/models/issues/issue_label.go
+++ b/models/issues/issue_label.go
@@ -496,6 +496,7 @@ func ReplaceIssueLabels(ctx context.Context, issue *Issue, labels []*Label, doer
 		}
 	}
 
+	issue.isLabelsLoaded = false
 	issue.Labels = nil
 	if err = issue.LoadLabels(ctx); err != nil {
 		return err
diff --git a/tests/integration/actions_trigger_test.go b/tests/integration/actions_trigger_test.go
index c57a64e7dd..25dcacde34 100644
--- a/tests/integration/actions_trigger_test.go
+++ b/tests/integration/actions_trigger_test.go
@@ -84,7 +84,23 @@ jobs:
 			baseGitRepo.Close()
 		}()
 
-		// prepare the pull request
+		// prepare the repository labels
+		labelStr := "/api/v1/repos/user2/repo-pull-request/labels"
+		labelsCount := 2
+		labels := make([]*api.Label, labelsCount)
+		for i := 0; i < labelsCount; i++ {
+			color := "abcdef"
+			req := NewRequestWithJSON(t, "POST", labelStr, &api.CreateLabelOption{
+				Name:  fmt.Sprintf("label%d", i),
+				Color: color,
+			}).AddTokenAuth(token)
+			resp := MakeRequest(t, req, http.StatusCreated)
+			labels[i] = new(api.Label)
+			DecodeJSON(t, resp, &labels[i])
+			assert.Equal(t, color, labels[i].Color)
+		}
+
+		// create the pull request
 		testEditFileToNewBranch(t, session, "user2", "repo-pull-request", "main", "wip-something", "README.md", "Hello, world 1")
 		testPullCreate(t, session, "user2", "repo-pull-request", true, "main", "wip-something", "Commit status PR")
 		pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: baseRepo.ID})
@@ -94,24 +110,15 @@ jobs:
 		issueURL := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%s", "user2", "repo-pull-request", fmt.Sprintf("%d", pr.Issue.Index))
 
 		// prepare the labels
-		labelStr := "/api/v1/repos/user2/repo-pull-request/labels"
-		req := NewRequestWithJSON(t, "POST", labelStr, &api.CreateLabelOption{
-			Name:        "mylabel",
-			Color:       "abcdef",
-			Description: "description mylabel",
-		}).AddTokenAuth(token)
-		resp := MakeRequest(t, req, http.StatusCreated)
-		label := new(api.Label)
-		DecodeJSON(t, resp, &label)
 		labelURL := fmt.Sprintf("%s/labels", issueURL)
 
 		// prepare the milestone
 		milestoneStr := "/api/v1/repos/user2/repo-pull-request/milestones"
-		req = NewRequestWithJSON(t, "POST", milestoneStr, &api.CreateMilestoneOption{
+		req := NewRequestWithJSON(t, "POST", milestoneStr, &api.CreateMilestoneOption{
 			Title: "mymilestone",
 			State: "open",
 		}).AddTokenAuth(token)
-		resp = MakeRequest(t, req, http.StatusCreated)
+		resp := MakeRequest(t, req, http.StatusCreated)
 		milestone := new(api.Milestone)
 		DecodeJSON(t, resp, &milestone)
 
@@ -128,47 +135,97 @@ jobs:
 			return false
 		}
 
-		count := 0
+		assertActionRun := func(t *testing.T, sha, onType string, action api.HookIssueAction, actionRun *actions_model.ActionRun) {
+			assert.Equal(t, fmt.Sprintf("%s.yml", onType), actionRun.WorkflowID)
+			assert.Equal(t, sha, actionRun.CommitSHA)
+			assert.Equal(t, actions_module.GithubEventPullRequest, actionRun.TriggerEvent)
+			event, err := actionRun.GetPullRequestEventPayload()
+			require.NoError(t, err)
+			assert.Equal(t, action, event.Action)
+		}
+
+		type assertType func(t *testing.T, sha, onType string, action api.HookIssueAction, actionRuns []*actions_model.ActionRun)
+		assertActionRuns := func(t *testing.T, sha, onType string, action api.HookIssueAction, actionRuns []*actions_model.ActionRun) {
+			require.Len(t, actionRuns, 1)
+			assertActionRun(t, sha, onType, action, actionRuns[0])
+		}
+
 		for _, testCase := range []struct {
-			onType      string
-			jobID       string
-			doSomething func()
-			action      api.HookIssueAction
-			hasLabel    bool
+			onType         string
+			jobID          string
+			doSomething    func()
+			actionRunCount int
+			action         api.HookIssueAction
+			assert         assertType
 		}{
 			{
-				onType:      "opened",
-				doSomething: func() {},
-				action:      api.HookIssueOpened,
+				onType:         "opened",
+				doSomething:    func() {},
+				actionRunCount: 1,
+				action:         api.HookIssueOpened,
+				assert:         assertActionRuns,
 			},
 			{
 				onType: "synchronize",
 				doSomething: func() {
 					testEditFile(t, session, "user2", "repo-pull-request", "wip-something", "README.md", "Hello, world 2")
 				},
-				action: api.HookIssueSynchronized,
+				actionRunCount: 1,
+				action:         api.HookIssueSynchronized,
+				assert:         assertActionRuns,
 			},
 			{
 				onType: "labeled",
 				doSomething: func() {
 					req := NewRequestWithJSON(t, "POST", labelURL, &api.IssueLabelsOption{
-						Labels: []any{label.ID},
+						Labels: []any{labels[0].ID, labels[1].ID},
 					}).AddTokenAuth(token)
 					MakeRequest(t, req, http.StatusOK)
 				},
-				action:   api.HookIssueLabelUpdated,
-				hasLabel: true,
+				actionRunCount: 2,
+				action:         api.HookIssueLabelUpdated,
+				assert: func(t *testing.T, sha, onType string, action api.HookIssueAction, actionRuns []*actions_model.ActionRun) {
+					assertActionRun(t, sha, onType, api.HookIssueLabelUpdated, actionRuns[0])
+					assertActionRun(t, sha, onType, api.HookIssueLabelUpdated, actionRuns[1])
+				},
 			},
 			{
 				onType: "unlabeled",
 				doSomething: func() {
 					req := NewRequestWithJSON(t, "PUT", labelURL, &api.IssueLabelsOption{
-						Labels: []any{},
+						Labels: []any{labels[0].ID},
 					}).AddTokenAuth(token)
 					MakeRequest(t, req, http.StatusOK)
 				},
-				action:   api.HookIssueLabelCleared,
-				hasLabel: true,
+				actionRunCount: 3,
+				action:         api.HookIssueLabelCleared,
+				assert: func(t *testing.T, sha, onType string, action api.HookIssueAction, actionRuns []*actions_model.ActionRun) {
+					foundPayloadWithLabels := false
+					knownLabels := []string{"label0", "label1"}
+					for _, actionRun := range actionRuns {
+						assert.Equal(t, sha, actionRun.CommitSHA)
+						assert.Equal(t, actions_module.GithubEventPullRequest, actionRun.TriggerEvent)
+						event, err := actionRun.GetPullRequestEventPayload()
+						require.NoError(t, err)
+						switch event.Action {
+						case api.HookIssueLabelUpdated:
+							assert.Equal(t, "labeled.yml", actionRun.WorkflowID)
+							assert.Equal(t, "label0", event.Label.Name)
+							require.Len(t, event.PullRequest.Labels, 1)
+							assert.Contains(t, "label0", event.PullRequest.Labels[0].Name)
+						case api.HookIssueLabelCleared:
+							assert.Equal(t, "unlabeled.yml", actionRun.WorkflowID)
+							assert.Contains(t, knownLabels, event.Label.Name)
+							if len(event.PullRequest.Labels) > 0 {
+								foundPayloadWithLabels = true
+								assert.Contains(t, knownLabels, event.PullRequest.Labels[0].Name)
+							}
+						default:
+							require.Fail(t, fmt.Sprintf("unexpected action '%s'", event.Action))
+						}
+					}
+					assert.True(t, foundPayloadWithLabels, "expected at least one clear label payload with non empty labels")
+				},
 			},
 			{
 				onType: "assigned",
@@ -178,7 +235,9 @@ jobs:
 					}).AddTokenAuth(token)
 					MakeRequest(t, req, http.StatusCreated)
 				},
-				action: api.HookIssueAssigned,
+				actionRunCount: 1,
+				action:         api.HookIssueAssigned,
+				assert:         assertActionRuns,
 			},
 			{
 				onType: "unassigned",
@@ -188,7 +247,9 @@ jobs:
 					}).AddTokenAuth(token)
 					MakeRequest(t, req, http.StatusCreated)
 				},
-				action: api.HookIssueUnassigned,
+				actionRunCount: 1,
+				action:         api.HookIssueUnassigned,
+				assert:         assertActionRuns,
 			},
 			{
 				onType: "milestoned",
@@ -198,7 +259,9 @@ jobs:
 					}).AddTokenAuth(token)
 					MakeRequest(t, req, http.StatusCreated)
 				},
-				action: api.HookIssueMilestoned,
+				actionRunCount: 1,
+				action:         api.HookIssueMilestoned,
+				assert:         assertActionRuns,
 			},
 			{
 				onType: "demilestoned",
@@ -209,7 +272,9 @@ jobs:
 					}).AddTokenAuth(token)
 					MakeRequest(t, req, http.StatusCreated)
 				},
-				action: api.HookIssueDemilestoned,
+				actionRunCount: 1,
+				action:         api.HookIssueDemilestoned,
+				assert:         assertActionRuns,
 			},
 			{
 				onType: "closed",
@@ -219,7 +284,9 @@ jobs:
 					err = issue_service.ChangeStatus(db.DefaultContext, pr.Issue, user2, sha, true)
 					require.NoError(t, err)
 				},
-				action: api.HookIssueClosed,
+				actionRunCount: 1,
+				action:         api.HookIssueClosed,
+				assert:         assertActionRuns,
 			},
 			{
 				onType: "reopened",
@@ -229,43 +296,52 @@ jobs:
 					err = issue_service.ChangeStatus(db.DefaultContext, pr.Issue, user2, sha, false)
 					require.NoError(t, err)
 				},
-				action: api.HookIssueReOpened,
+				actionRunCount: 1,
+				action:         api.HookIssueReOpened,
+				assert:         assertActionRuns,
 			},
 		} {
 			t.Run(testCase.onType, func(t *testing.T) {
+				defer func() {
+					// cleanup leftovers, start from scratch
+					_, err = db.DeleteByBean(db.DefaultContext, actions_model.ActionRun{RepoID: baseRepo.ID})
+					require.NoError(t, err)
+					_, err = db.DeleteByBean(db.DefaultContext, actions_model.ActionRunJob{RepoID: baseRepo.ID})
+					require.NoError(t, err)
+				}()
+
 				// trigger the onType event
 				testCase.doSomething()
-				count++
+				count := testCase.actionRunCount
 				context := fmt.Sprintf("%[1]s / %[1]s (pull_request)", testCase.onType)
 
-				// wait for a new ActionRun to be created
-				assert.Eventually(t, func() bool {
-					return count == unittest.GetCount(t, &actions_model.ActionRun{RepoID: baseRepo.ID})
+				var actionRuns []*actions_model.ActionRun
+
+				// wait for ActionRun(s) to be created
+				require.Eventually(t, func() bool {
+					actionRuns = make([]*actions_model.ActionRun, 0)
+					require.NoError(t, db.GetEngine(db.DefaultContext).Where("repo_id=?", baseRepo.ID).Find(&actionRuns))
+					return assert.Len(t, actionRuns, count)
 				}, 30*time.Second, 1*time.Second)
 
-				// verify the expected  ActionRun was created
+				// verify the expected  ActionRuns were created
 				sha, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName())
 				require.NoError(t, err)
-				actionRun := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{RepoID: baseRepo.ID, WorkflowID: fmt.Sprintf("%s.yml", testCase.onType)})
-
-				assert.Equal(t, sha, actionRun.CommitSHA)
-				assert.Equal(t, actions_module.GithubEventPullRequest, actionRun.TriggerEvent)
-				event, err := actionRun.GetPullRequestEventPayload()
-				if testCase.hasLabel {
-					assert.NotNil(t, event.Label)
-				}
-				require.NoError(t, err)
-				assert.Equal(t, testCase.action, event.Action)
-
-				// verify the expected  ActionRunJob was created and is StatusWaiting
-				job := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{JobID: testCase.onType, CommitSHA: sha})
-				assert.Equal(t, actions_model.StatusWaiting, job.Status)
-
 				// verify the commit status changes to CommitStatusSuccess when the job changes to StatusSuccess
 				assert.True(t, checkCommitStatus(sha, context, api.CommitStatusPending))
-				job.Status = actions_model.StatusSuccess
-				actions_service.CreateCommitStatus(db.DefaultContext, job)
+				for _, actionRun := range actionRuns {
+					// verify the expected  ActionRunJob was created and is StatusWaiting
+					job := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: actionRun.ID, CommitSHA: sha})
+					assert.Equal(t, actions_model.StatusWaiting, job.Status)
+
+					// change the state of the job to success
+					job.Status = actions_model.StatusSuccess
+					actions_service.CreateCommitStatus(db.DefaultContext, job)
+				}
+				// verify the commit status changed to CommitStatusSuccess because the job(s) changed to StatusSuccess
 				assert.True(t, checkCommitStatus(sha, context, api.CommitStatusSuccess))
+
+				testCase.assert(t, sha, testCase.onType, testCase.action, actionRuns)
 			})
 		}
 	})

From ffcf80c3a5f429420c94db1b7bd71589d5811c2d Mon Sep 17 00:00:00 2001
From: Maciej Pasternacki 
Date: Wed, 6 Nov 2024 20:34:49 +0100
Subject: [PATCH 324/443] Make direnv optional to let developers use their own
 direnv configuration

---
 .envrc => .envrc.example | 0
 .gitignore               | 3 +++
 2 files changed, 3 insertions(+)
 rename .envrc => .envrc.example (100%)

diff --git a/.envrc b/.envrc.example
similarity index 100%
rename from .envrc
rename to .envrc.example
diff --git a/.gitignore b/.gitignore
index 7f40d0ba55..744577248d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -115,6 +115,9 @@ prime/
 *_source.tar.bz2
 .DS_Store
 
+# Direnv configuration
+/.envrc
+
 # nix-direnv generated files
 .direnv/
 

From 94650c27a88d962f59f2da4b8e3b286e7f0fa20a Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Thu, 7 Nov 2024 00:03:28 +0000
Subject: [PATCH 325/443] Update dependency go to v1.23.3

---
 .forgejo/testdata/build-release/go.mod | 2 +-
 go.mod                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.forgejo/testdata/build-release/go.mod b/.forgejo/testdata/build-release/go.mod
index 1c442048b6..729cb6f831 100644
--- a/.forgejo/testdata/build-release/go.mod
+++ b/.forgejo/testdata/build-release/go.mod
@@ -1,3 +1,3 @@
 module code.gitea.io/gitea
 
-go 1.23.2
+go 1.23.3
diff --git a/go.mod b/go.mod
index 60b14837eb..513f119014 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module code.gitea.io/gitea
 
-go 1.23.2
+go 1.23.3
 
 require (
 	code.forgejo.org/f3/gof3/v3 v3.7.0

From ee5d1cf8761eda9ac540f5e784b0992cffcffe18 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Thu, 7 Nov 2024 06:40:27 +0000
Subject: [PATCH 326/443] Update dependency happy-dom to v15.11.0 (forgejo)
 (#5840) Co-authored-by: Renovate Bot 
 Co-committed-by: Renovate Bot 

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 632895008d..561e4acf9e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -86,7 +86,7 @@
         "eslint-plugin-vue-scoped-css": "2.8.1",
         "eslint-plugin-wc": "2.2.0",
         "globals": "15.12.0",
-        "happy-dom": "15.10.1",
+        "happy-dom": "15.11.0",
         "license-checker-rseidelsohn": "4.4.2",
         "markdownlint-cli": "0.42.0",
         "postcss-html": "1.7.0",
@@ -10257,9 +10257,9 @@
       }
     },
     "node_modules/happy-dom": {
-      "version": "15.10.1",
-      "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-15.10.1.tgz",
-      "integrity": "sha512-FuGnj/qIB4QnBL6fWmD7Wnh6STxevLgOVWB6+nopDGgWG1+t9CXkNB2ldZ+iqwD2UKxD2D0SU8el8A6AX6Q1+g==",
+      "version": "15.11.0",
+      "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-15.11.0.tgz",
+      "integrity": "sha512-/zyxHbXriYJ8b9Urh43ILk/jd9tC07djURnJuAimJ3tJCOLOzOUp7dEHDwJOZyzROlrrooUhr/0INZIDBj1Bjw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index b3afec3488..290db61201 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "eslint-plugin-vue-scoped-css": "2.8.1",
     "eslint-plugin-wc": "2.2.0",
     "globals": "15.12.0",
-    "happy-dom": "15.10.1",
+    "happy-dom": "15.11.0",
     "license-checker-rseidelsohn": "4.4.2",
     "markdownlint-cli": "0.42.0",
     "postcss-html": "1.7.0",

From 600be26638b0b9cfc8e9fe06caf957132ea8a426 Mon Sep 17 00:00:00 2001
From: Codeberg Translate 
Date: Thu, 7 Nov 2024 07:22:37 +0000
Subject: [PATCH 327/443] i18n: update of translations from Codeberg Translate
 (#5754)

Co-authored-by: Juno Takano 
Co-authored-by: Outbreak2096 
Co-authored-by: Benedikt Straub 
Co-authored-by: Edgarsons 
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro 
Co-authored-by: SomeTr 
Co-authored-by: Atalanttore 
Co-authored-by: Anonymous 
Co-authored-by: Dirk 
Co-authored-by: xtex 
Co-authored-by: artnay 
Co-authored-by: WithLithum 
Co-authored-by: dobrvlskyi 
Co-authored-by: earl-warren 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5754
Reviewed-by: Michael Kriese 
Co-authored-by: Codeberg Translate 
Co-committed-by: Codeberg Translate 
---
 options/locale/locale_cs-CZ.ini |  16 ++-
 options/locale/locale_de-DE.ini |   8 +-
 options/locale/locale_et.ini    |   2 +-
 options/locale/locale_fi-FI.ini |  13 ++-
 options/locale/locale_fr-FR.ini |   1 +
 options/locale/locale_lv-LV.ini | 168 ++++++++++++++++----------------
 options/locale/locale_nds.ini   |  10 +-
 options/locale/locale_pt-BR.ini |  19 +++-
 options/locale/locale_ru-RU.ini |   6 ++
 options/locale/locale_uk-UA.ini | 127 +++++++++++++++++-------
 options/locale/locale_zh-CN.ini |  31 +++---
 11 files changed, 257 insertions(+), 144 deletions(-)

diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
index a400aed94b..c77d086bd2 100644
--- a/options/locale/locale_cs-CZ.ini
+++ b/options/locale/locale_cs-CZ.ini
@@ -23,7 +23,7 @@ create_new=Vytvořit…
 user_profile_and_more=Profil a nastavení…
 signed_in_as=Přihlášen/a jako
 enable_javascript=Tato stránka vyžaduje JavaScript.
-toc=Obsah
+toc=Tabulka obsahu
 licenses=Licence
 return_to_forgejo=Vrátit se do Forgejo
 
@@ -201,6 +201,12 @@ buttons.enable_monospace_font=Zapnout neproporcionální písmo
 buttons.disable_monospace_font=Vypnout neproporcionální písmo
 buttons.unindent.tooltip = Zrušit vnoření položek pod jednu úroveň
 buttons.indent.tooltip = Vnořit položky pod jednu úroveň
+buttons.new_table.tooltip = Přidat tabulku
+table_modal.header = Přidat tabulku
+table_modal.placeholder.header = Záhlaví
+table_modal.placeholder.content = Obsah
+table_modal.label.rows = Řádky
+table_modal.label.columns = Sloupce
 
 [filter]
 string.asc=A – Z
@@ -251,7 +257,7 @@ err_empty_db_path=Cesta k databázi SQLite3 nemůže být prázdná.
 no_admin_and_disable_registration=Nelze vypnout registraci účtů bez vytvoření účtu administrátora.
 err_empty_admin_password=Heslo administrátora nemůže být prázdné.
 err_empty_admin_email=E-mail administrátora nemůže být prázdný.
-err_admin_name_is_reserved=Uživatelské jméno administrátora není platné, uživatelské jméno je rezervované
+err_admin_name_is_reserved=Uživatelské jméno administrátora není platné, jméno je rezervované
 err_admin_name_pattern_not_allowed=Uživatelské jméno administrátora je neplatné, uživatelské jméno odpovídá vyhrazenému vzoru
 err_admin_name_is_invalid=Uživatelské jméno administrátora není platné
 
@@ -742,7 +748,7 @@ uid=UID
 webauthn=Dvoufázové ověření (bezpečnostní klíče)
 
 public_profile=Veřejný profil
-biography_placeholder=Řekněte nám něco o sobě! (Můžete použít Markdown)
+biography_placeholder=Řekněte ostatním něco o sobě! (Je podporován Markdown)
 location_placeholder=Sdílejte svou přibližnou polohu s ostatními
 profile_desc=Nastavte, jak bude váš profil zobrazen ostatním uživatelům. Vaše hlavní e-mailová adresa bude použita pro oznámení, obnovení hesla a operace Git.
 password_username_disabled=Externí uživatelé nemohou měnit svoje uživatelské jméno. Kontaktujte prosím svého administrátora pro více detailů.
@@ -2561,7 +2567,7 @@ diff.generated=vygenerováno
 diff.vendored=vendorováno
 diff.comment.add_line_comment=Přidat jednořádkový komentář
 diff.comment.placeholder=Zanechat komentář
-diff.comment.markdown_info=Je podporována úprava vzhledu pomocí markdown.
+diff.comment.markdown_info=Je podporováno stylování pomocí Markdown.
 diff.comment.add_single_comment=Přidat jeden komentář
 diff.comment.add_review_comment=Přidat komentář
 diff.comment.start_review=Začít posuzování
@@ -2832,7 +2838,7 @@ activity.published_tag_label = Štítek
 settings.pull_mirror_sync_quota_exceeded = Kvóta překročena, nestahuji změny.
 settings.transfer_quota_exceeded = Nový majitel (%s) překročil kvótu. Repozitář nebyl převeden.
 release.asset_name = Název přílohy
-release.invalid_external_url = Neplatná externí URL: „%s“
+release.invalid_external_url = Neplatná externí adresa URL: „%s“
 no_eol.text = Žádný EOL
 no_eol.tooltip = Tento soubor neobsahuje koncový znak ukončení řádku.
 pulls.cmd_instruction_merge_warning = Varování: Nastavení „Autodetekce ručního sloučení“ není u tohoto repozitáře povoleno, tuto žádost o sloučení budete muset poté označit jako ručně sloučenou.
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
index b96d185142..3ce84d2e34 100644
--- a/options/locale/locale_de-DE.ini
+++ b/options/locale/locale_de-DE.ini
@@ -199,6 +199,12 @@ buttons.enable_monospace_font=Festbreitenschrift aktivieren
 buttons.disable_monospace_font=Festbreitenschrift deaktivieren
 buttons.indent.tooltip = Einträge um eine Ebene verschachteln
 buttons.unindent.tooltip = Einträge um eine Ebene entschachteln
+buttons.new_table.tooltip = Tabelle hinzufügen
+table_modal.header = Tabelle hinzufügen
+table_modal.placeholder.content = Inhalt
+table_modal.placeholder.header = Kopfzeile
+table_modal.label.rows = Zeilen
+table_modal.label.columns = Spalten
 
 [filter]
 string.asc=A–Z
@@ -740,7 +746,7 @@ uid=UID
 webauthn=Hardware-Sicherheitsschlüssel
 
 public_profile=Öffentliches Profil
-biography_placeholder=Erzähle uns ein wenig über dich selbst! (Du kannst Markdown verwenden)
+biography_placeholder=Erzähle anderen ein wenig über dich selbst! (Markdown wird unterstützt)
 location_placeholder=Teile deinen ungefähren Standort mit anderen
 profile_desc=Leg fest, wie dein Profil anderen Benutzern angezeigt wird. Deine primäre E-Mail-Adresse wird für Benachrichtigungen, Passwort-Wiederherstellung und webbasierte Git-Operationen verwendet.
 password_username_disabled=Benutzer, die nicht von Forgejo verwaltet werden können ihren Benutzernamen nicht ändern. Bitte kontaktiere deinen Administrator für mehr Details.
diff --git a/options/locale/locale_et.ini b/options/locale/locale_et.ini
index b09f701064..2991fb01fe 100644
--- a/options/locale/locale_et.ini
+++ b/options/locale/locale_et.ini
@@ -111,7 +111,7 @@ never = Mitte kunagi
 unknown = Teadmata
 rss_feed = RSS infovoog
 confirm_delete_artifact = Kas oled kindel et soovite artefakti "%s" kustutada?
-pin = 
+pin =
 artifacts = Artefaktid
 archived = Arhiveeritud
 concept_system_global = Ülemaailmne
diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini
index bae6c8e59d..eb4c0234e8 100644
--- a/options/locale/locale_fi-FI.ini
+++ b/options/locale/locale_fi-FI.ini
@@ -861,7 +861,7 @@ migrate_items_issues=Ongelmat
 migrate_items_pullrequests=Vetopyynnöt
 migrate_items_releases=Julkaisut
 migrate_repo=Tee repomigraatio
-migrate.clone_address=Migraation / Kloonaa URL osoitteesta
+migrate.clone_address=Migraatio/kloonaus URL-osoitteesta
 migrate.github_token_desc=Voit laittaa yhden tai useamman pääsymerkin pilkulla erotellen tähän nopeuttaaksesi migraatiota GitHub APIn vauhtirajojen takia. VAROITUS: Tämän ominaisuuden väärinkäyttö voi rikkoa palveluntarjoajan ehtoja ja johtaa tilin estämiseen.
 migrate.permission_denied=Sinun ei sallita tuovan paikallisia repoja.
 migrate.failed=Siirto epäonnistui: %v
@@ -1739,7 +1739,7 @@ branch.renamed = Haaran %s uudeksi nimeksi asetettiin %s.
 release.tag_name_protected = Tagin nimi on suojattu.
 pulls.merge_conflict_summary = Virheviesti
 issues.delete.title = Poistetaanko tämä ongelma?
-migrate.github.description = Tee datamigraatio github.comista tai GitHub Enterprise -palvelimelta.
+migrate.github.description = Tee migraatio github.comista tai GitHub Enterprise -palvelimelta.
 settings.merge_style_desc = Yhdistämistyylit
 settings.protected_branch_deletion = Poista haaran suojaus
 settings.deletion_success = Repositorio on poistettu.
@@ -1781,6 +1781,15 @@ diff.file_before = Ennen
 diff.file_after = Jälkeen
 settings.protect_new_rule = Luo uusi haaran suojaussääntö
 settings.branch_filter = Haarasuodatin
+object_format_helper = Repositorion objektimuoto. Tätä ei voi muuttaa myöhemmin. SHA1 on yhteensopivin muoto.
+migrate.gogs.description = Tee migraatio notabug.orgista tai muista Gogs-instansseista.
+migrate.forgejo.description = Tee migraatio codeberg.orgista tai muista Forgejo-instansseista.
+migrate.gitbucket.description = Tee migraatio GitBucket-instansseista.
+migrate.onedev.description = Tee migraatio code.onedev.io:sta tai muista OneDev-instansseista.
+migrate.codebase.description = Tee migraatio codebasehq.comista.
+migrate.git.description = Tee repomigraatio mistä tahansa Git-palvelusta.
+migrate.gitlab.description = Tee migraatio gitlab.comista tai muista GitLab-instansseista.
+migrate.gitea.description = Tee migraatio gitea.comista tai muista Gitea-instansseista.
 
 
 
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
index d914b558e8..b8aa1176b1 100644
--- a/options/locale/locale_fr-FR.ini
+++ b/options/locale/locale_fr-FR.ini
@@ -200,6 +200,7 @@ buttons.enable_monospace_font=Activer la police à chasse fixe
 buttons.disable_monospace_font=Désactiver la police à chasse fixe
 buttons.indent.tooltip = Indenter les éléments d'un niveau
 buttons.unindent.tooltip = Supprimer un niveau d'indentation
+buttons.new_table.tooltip = Ajouter une table
 
 [filter]
 string.asc=A - Z
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
index aeaddf3b9c..1e0d189989 100644
--- a/options/locale/locale_lv-LV.ini
+++ b/options/locale/locale_lv-LV.ini
@@ -31,10 +31,10 @@ username=Lietotājvārds
 email=E-pasta adrese
 password=Parole
 access_token=Piekļuves pilnvara
-re_type=Apstipriniet paroli
+re_type=Apstiprināt paroli
 captcha=Cilvēktests
-twofa=Divfaktoru autentifikācija
-twofa_scratch=Divfaktoru vienreizējais kods
+twofa=Divpakāpju pieteikšanās
+twofa_scratch=Divpakāpju vienreizējais kods
 passcode=Kods
 
 webauthn_insert_key=Ievietojiet Jūsu drošības atslēgu
@@ -56,13 +56,13 @@ organization=Organizācija
 mirror=Spogulis
 new_repo=Jauns repozitorijs
 new_migrate=Jauna migrācija
-new_mirror=Jauns spogulis
+new_mirror=Jauns spoguļserveris
 new_fork=Jauns atdalīts repozitorijs
 new_org=Jauna organizācija
 new_project=Jauns projekts
 new_project_column=Jauna kolonna
 manage_org=Pārvaldīt organizācijas
-admin_panel=Vietnes administrēšana
+admin_panel=Vietnes pārvaldība
 account_settings=Konta iestatījumi
 settings=Iestatījumi
 your_profile=Profils
@@ -145,7 +145,7 @@ value=Vērtība
 [aria]
 navbar=Navigācijas josla
 footer=Kājene
-footer.software=Par programmatūru
+footer.software=Par šo programmatūru
 footer.links=Saites
 
 [heatmap]
@@ -197,12 +197,12 @@ install=Instalācija
 title=Sākotnējā konfigurācija
 docker_helper=Ja Forgejo ir uzstādīts Docker konteinerī, izlasiet vadlīninas pirms maināt iestatījumus.
 require_db_desc=Forgejo nepieciešams MySQL, PostgreSQL, SQLite3 vai TiDB (izmantojot MySQL protokolu).
-db_title=Datu bāzes iestatījumi
-db_type=Datu bāzes veids
+db_title=Datubāzes iestatījumi
+db_type=Datubāzes veids
 host=Resursdators
 user=Lietotājvārds
 password=Parole
-db_name=Datu bāzes nosaukums
+db_name=Datubāzes nosaukums
 db_schema=Shēma
 db_schema_helper=Atstājiet tukšu, lai izmantu datubāzes noklusēto ("public").
 ssl_mode=SSL
@@ -223,7 +223,7 @@ err_admin_name_is_invalid=Administratora lietotāja nav korekts
 
 general_title=Vispārīgie iestatījumi
 app_name=Vietnes nosaukums
-app_name_helper=Šeit var ievadīt savas kompānijas nosaukumu.
+app_name_helper=Šeit ir ievadāms sava servera nosaukums. Tas tiks attēlots katrā lapā.
 repo_path=Repozitoriju glabāšanas ceļš
 repo_path_helper=Git repozitoriji tiks glabāti šajā direktorijā.
 lfs_path=Git LFS glabāšanas vieta
@@ -234,24 +234,24 @@ domain=Servera domēns
 domain_helper=Domēns vai servera adrese.
 ssh_port=SSH servera ports
 ssh_port_helper=Porta numurs, kuru SSH serveris klausīsies. Atstājiet tukšu, lai atspējotu.
-http_port=Forgejo HTTP klausīšanās ports
+http_port=HTTP klausīšanās ports
 http_port_helper=Porta numurs, kuru Forgejo tīmekļa serveris klausīsies.
-app_url=Forgejo pamata URL
+app_url=Pamata URL
 app_url_helper=Pamata adrese HTTP(S) klonēšanas URL un e-pastu paziņojumiem.
-log_root_path=Žurnalizēšanas ceļš
+log_root_path=Žurnālu atrašanās vieta
 log_root_path_helper=Žurnalizēšanas faili tiks rakstīti šajā direktorijā.
 
 optional_title=Neobligātie iestatījumi
-email_title=E-pastu iestatījumi
+email_title=E-pasta iestatījumi
 smtp_addr=SMTP resursdators
 smtp_port=SMTP ports
-smtp_from=Nosūtīt e-pastu kā
+smtp_from=Sūtīt e-pasta ziņojumus kā
 smtp_from_helper=E-pasta adrese, ko Forgejo izmantos. Ievadiet tika e-pasta adrese vai izmantojiet "Vārds"  formātu.
 mailer_user=SMTP lietotājvārds
 mailer_password=SMTP parole
 register_confirm=Reģistrējoties pieprasīt apstiprināt e-pastu
 mail_notify=Iespējot e-pasta paziņojumus
-server_service_title=Servera un citu servisu iestatījumi
+server_service_title=Servera un trešo pušu pakalpojumu iestatījumi
 offline_mode=Iespējot bezsaistes režīmu
 offline_mode.description=Atspējot ārējos satura piegādes tīklus, lai visi resursi tiktu piegādāti lokāli.
 disable_gravatar=Atspējot Gravatar
@@ -306,11 +306,11 @@ env_config_keys_prompt=Šie vides mainīgie tiks pielietoti arī konfigurācijas
 [home]
 uname_holder=Lietotājvārds vai e-pasts
 password_holder=Parole
-switch_dashboard_context=Mainīt infopaneļa kontekstu
+switch_dashboard_context=Mainīt pārskata paneļa kontekstu
 my_repos=Repozitoriji
 show_more_repos=Parādīt vairāk repozitorijus…
 collaborative_repos=Sadarbības repozitoriji
-my_orgs=Manas organizācijas
+my_orgs=Apvienības
 my_mirrors=Mani spoguļi
 view_home=Skatīties %s
 search_repos=Meklēt repozitoriju…
@@ -361,7 +361,7 @@ disable_register_mail=Reģistrācijas e-pasta apstiprināšana ir atspējota.
 manual_activation_only=Sazinieties ar lapas administratoru, lai pabeigtu konta aktivizāciju.
 remember_me=Atcerēties šo ierīci
 remember_me.compromised=Pieteikšanās pilnvara vairs nav derīga, kas var norādīt uz ļaunprātīgām darbībām kontā. Lūgums pārbaudīt, vai kontā nav neparastu darbību.
-forgot_password_title=Aizmirsu paroli
+forgot_password_title=Aizmirsta parole
 forgot_password=Aizmirsi paroli?
 sign_up_now=Nepieciešams konts? Reģistrējies tagad.
 sign_up_successful=Konts tika veiksmīgi izveidots. Laipni lūdzam!
@@ -371,14 +371,14 @@ allow_password_change=Pieprasīt lietotājam mainīt paroli (ieteicams)
 reset_password_mail_sent_prompt=Apstiprināšanas e-pasts tika nosūtīts uz %s. Pārbaudiet savu e-pasta kontu tuvāko %s laikā, lai pabeigtu paroles atjaunošanas procesu.
 active_your_account=Aktivizēt savu kontu
 account_activated=Konts ir aktivizēts
-prohibit_login=Pieteikšanās liegta
-prohibit_login_desc=Jūsu konts ir bloķēts, sazinieties ar sistēmas administratoru.
+prohibit_login=Konta darbība ir apturēta
+prohibit_login_desc=Kontam ir liegts mijiedarboties ar serveri. Jāsazinās ar tā pārvaldītāju, lai atgūtu piekļuvi.
 resent_limit_prompt=Jūs pieprasījāt aktivizācijas e-pastu pārāk bieži. Lūdzu, uzgaidiet 3 minūtes un mēģiniet vēlreiz.
 has_unconfirmed_mail=Sveiki %s, Jums ir neapstiprināta e-pasta adrese (%s). Ja neesat saņēmis apstiprināšanas e-pastu vai Jums ir nepieciešams nosūtīt jaunu, lūdzu, nospiediet pogu, kas atrodas zemāk.
 resend_mail=Nospiediet šeit, lai vēlreiz nosūtītu aktivizācijas e-pastu
 email_not_associate=Šī e-pasta adrese nav saistīta ar nevienu kontu.
-send_reset_mail=Nosūtīt paroles atjaunošanas e-pastu
-reset_password=Paroles atjaunošana
+send_reset_mail=Nosūtīt atkopšanas e-pasta ziņojumu
+reset_password=Konta atkopšana
 invalid_code=Jūsu apstiprināšanas kodam ir beidzies derīguma termiņš vai arī tas ir nepareizs.
 invalid_code_forgot_password=Apliecinājuma kods ir nederīgs vai tā derīgums ir beidzies. Nospiediet šeit, lai uzsāktu jaunu sesiju.
 invalid_password=Jūsu parole neatbilst parolei, kas tika ievadīta veidojot so kontu.
@@ -394,11 +394,11 @@ twofa_passcode_incorrect=Piekļuves kods nav pareizs. Ja esat pazaudējis ierīc
 twofa_scratch_token_incorrect=Ievadīts nepareizs vienreizējais kods.
 login_userpass=Pieteikties
 tab_openid=OpenID
-oauth_signup_tab=Reģistrēt jaunu kontu
-oauth_signup_title=Pabeigt konta veidošanu
-oauth_signup_submit=Pabeigt reģistrāciju
+oauth_signup_tab=Izveidot jaunu kontu
+oauth_signup_title=Pabeigt jaunā konta izveidošanu
+oauth_signup_submit=Pabeigt konta izveidošanu
 oauth_signin_tab=Sasaistīt ar esošu kontu
-oauth_signin_title=Pieteikties, lai autorizētu saistīto kontu
+oauth_signin_title=Pieteikties, lai autorizētu sasaistīto kontu
 oauth_signin_submit=Sasaistīt kontu
 oauth.signin.error=Radās kļūda apstrādājot pieteikšanās pieprasījumu. Ja šī kļūda atkārtojas, sazinieties ar lapas administratoru.
 oauth.signin.error.access_denied=Autorizācijas pieprasījums tika noraidīts.
@@ -520,8 +520,8 @@ SSPISeparatorReplacement=Atdalītājs
 SSPIDefaultLanguage=Noklusējuma valoda
 
 require_error=` nedrīkst būt tukšs.`
-alpha_dash_error=` drīkst saturēt tikai latīņu alfabēta burtus, ciparus vai domuzīmes (-_).`
-alpha_dash_dot_error=` drīkst saturēt tikai latīņu alfabēta burtus, ciparus, domuzīmes (-_) vai punktu.`
+alpha_dash_error=` drīkst sastāvēt tikai no burtiem un cipariem, domuzīmēm ("-") un apakšsvītrām ("_").`
+alpha_dash_dot_error=` drīkst sastāvēt tikai no burtiem un cipariem, domuzīmēm ('-'), apakšsvītrām ('_') un punktiem ('.').`
 git_ref_name_error=` jābūt korektam git references nosaukumam.`
 size_error=` jābūt %s simbolus garam.`
 min_size_error=` jabūt vismaz %s simbolu garumā.`
@@ -531,7 +531,7 @@ url_error=`"%s" nav korekts URL.`
 include_error=` ir jāsatur tekstu "%s".`
 glob_pattern_error=` glob šablons nav korekts: %s.`
 regex_pattern_error=` regulārā izteiksme nav korekta: %s.`
-username_error=` drīkst saturēt tikai burtus un ciparus ('0-9','a-z','A-Z'), domuzīme ('-'), apakšsvītra ('_') un punkts ('.'). Nevar sākties vai beigties ar simbolu, kas nav burts vai skaitlis, kā arī nevar būt vairāki simboli pēc kārtas, kas nav burti vai skaitļi.`
+username_error=` drīkst sastāvēt tikai no burtiem un cipariem ("0-9", "a-z", "A-Z"), domuzīmēm ("-"), apakšsvītrām ("_") un punktiem ("."). Tas nevar sākties vai beigties ar rakstzīmi, kas nav burts vai cipars, kā arī nav atļautas vairākas secīgas rakstzīmes, kas nav burti vai cipari.`
 invalid_group_team_map_error=` sasaiste nav korekta: %s`
 unknown_error=Nezināma kļūda:
 captcha_incorrect=Ievadīts nepareizs drošības kods.
@@ -567,7 +567,7 @@ enterred_invalid_owner_name=Pārliecinieties, vai ievadītā īpašnieka vārds
 enterred_invalid_password=Pārliecinieties, vai ievadītā parole ir pareiza.
 user_not_exist=Lietotājs neeksistē.
 team_not_exist=Komanda neeksistē.
-last_org_owner=Nevar noņemt pēdejo lietotāju no īpašnieku komandas. Organizācijai ir jābūt vismaz vienam īpašniekam.
+last_org_owner=Nevar noņemt īpašnieku komandas pēdējo lietotāju. Apvienībai ir jābūt vismaz vienam īpašniekam.
 cannot_add_org_to_team=Organizāciju nevar pievienot kā komandas biedru.
 duplicate_invite_to_team=Lietotājs jau ir uzaicināts kā komandas biedrs.
 organization_leave_success=Jūs esat pametis organizāciju %s.
@@ -576,11 +576,11 @@ invalid_ssh_key=Nav iespējams pārbaudīt SSH atslēgu: %s
 invalid_gpg_key=Nav iespējams pārbaudīt GPG atslēgu: %s
 invalid_ssh_principal=Kļūdaina identitāte: %s
 must_use_public_key=Atslēga, ko norādījāt ir privātā atslēga. Nekad nenodotiet savu privātu atslēgu nevienam. Izmantojiet publisko atslēgu.
-unable_verify_ssh_key=SSH atslēgu nav iespējams pārbaudīt, pārliecinieties, ka tajā nav kļūdu.
+unable_verify_ssh_key=SSH atslēgu nav iespējams apliecināt. Kārtīgi jāpārbauda, vai nav pieļautas kļūdas.
 auth_failed=Autentifikācija neizdevās: %v
 
 still_own_repo=Šis konts ir vismaz viena repozitorija īpašnieks, tos sākumā ir nepieciešams izdzēst vai mainīt to īpašnieku.
-still_has_org=Jūsu konts ir piesaistīts vismaz vienai organizācijai, sākumā nepieciešams to pamest.
+still_has_org=Konts ir vienas vai vairāku apvienību dalībnieks, vispirms tās ir jāpamet.
 still_own_packages=Jūsu kontam pieder viena vai vairākas pakotnes, tās nepieciešams izdzēst.
 org_still_own_repo=Organizācijai pieder repozitoriji, tos sākumā ir nepieciešams izdzēst vai mainīt to īpašnieku.
 org_still_own_packages=Šai organizācijai pieder viena vai vārākas pakotnes, tās nepieciešams izdzēst.
@@ -611,7 +611,7 @@ settings=Lietotāja iestatījumi
 
 form.name_reserved=Lietotājvārdu "%s" nedrīkst izmantot.
 form.name_pattern_not_allowed=Lietotājvārds "%s" nav atļauts.
-form.name_chars_not_allowed=Lietotāja vārds "%s" satur neatļautus simbolus.
+form.name_chars_not_allowed=Lietotāja vārds "%s" satur nederīgas rakstzīmes.
 
 [settings]
 profile=Profils
@@ -623,25 +623,25 @@ avatar=Profila attēls
 ssh_gpg_keys=SSH / GPG atslēgas
 social=Sociālie konti
 applications=Lietotnes
-orgs=Pārvaldīt organizācijas
+orgs=Pārvaldīt apvienības
 repos=Repozitoriji
 delete=Dzēst kontu
-twofa=Divfaktoru autentifikācija
+twofa=Divpakāpju pieteikšanās (TOTP)
 account_link=Saistītie konti
 organization=Organizācijas
 uid=UID
-webauthn=Drošības atslēgas
+webauthn=Divpakāpju pieteikšanās (drošības atslēgas)
 
 public_profile=Publiskais profils
-biography_placeholder=Pastāsti mums mazliet par sevi! (Var izmantot Markdown)
+biography_placeholder=Pastāsti citiem mazliet par sevi! (Tiek atbalstīts Markdown)
 location_placeholder=Kopīgot savu aptuveno atrašanās vietu ar citiem
 profile_desc=Norādīt, kā profils tiek attēlots citiem lietotājiem. Primārā e-pasta adrese tiks izmantota paziņojumiem, paroles atjaunošanai un Git tīmekļa darbībām.
 password_username_disabled=Ne-lokāliem lietotājiem nav atļauts mainīt savu lietotāja vārdu. Sazinieties ar sistēmas administratoru, lai uzzinātu sīkāk.
 full_name=Pilns vārds
 website=Mājas lapa
 location=Atrašanās vieta
-update_theme=Mainīt motīvu
-update_profile=Mainīt profilu
+update_theme=Mainīt izskatu
+update_profile=Atjaunināt profilu
 update_language=Mainīt valodu
 update_language_not_found=Valoda "%s" nav pieejama.
 update_language_success=Valoda tika nomainīta.
@@ -663,10 +663,10 @@ comment_type_group_milestone=Atskaites punktus
 comment_type_group_assignee=Atbildīgos
 comment_type_group_title=Nosaukuma izmaiņas
 comment_type_group_branch=Atzara izmaiņas
-comment_type_group_time_tracking=Laika uzskaiti
+comment_type_group_time_tracking=Laika uzskaitīšana
 comment_type_group_deadline=Termiņus
 comment_type_group_dependency=Atkarības
-comment_type_group_lock=Slēgšanas maiņu
+comment_type_group_lock=Aizslēgšanas stāvoklis
 comment_type_group_review_request=Izmaiņu pieprasījumus
 comment_type_group_pull_request_push=Pievienotās revīzijas
 comment_type_group_project=Projektus
@@ -676,20 +676,20 @@ privacy=Privātums
 keep_activity_private=Profila lapā paslēpt notikumus
 keep_activity_private_popup=Savu aktivitāti redzēsiet tikai Jūs un administratori
 
-lookup_avatar_by_mail=Meklēt profila bildes pēc e-pasta
+lookup_avatar_by_mail=Meklēt profila attēlus pēc e-pasta adreses
 federated_avatar_lookup=Apvienotais profila bilžu meklētājs
-enable_custom_avatar=Iespējot maināmu profila attēlu
+enable_custom_avatar=izmantot pielāgotu profila attēlu
 choose_new_avatar=Izvēlēties jaunu profila attēlu
-update_avatar=Saglabāt profila bildi
-delete_current_avatar=Dzēst pašreizējo profila bildi
+update_avatar=Atjaunināt attēlu
+delete_current_avatar=Izdzēst pašreizējo attēlu
 uploaded_avatar_not_a_image=Augšupielādētais fails nav attēls.
 uploaded_avatar_is_too_big=Augšupielādētā faila izmērs (%d KiB) pārsniedz pieļaujamo izmēru (%d KiB).
 update_avatar_success=Profila attēls tika saglabāts.
 update_user_avatar_success=Lietotāja profila attēls tika atjaunots.
 
-update_password=Mainīt paroli
+update_password=Atjaunināt paroli
 old_password=Pašreizējā parole
-new_password=Jauna parole
+new_password=Jaunā parole
 retype_new_password=Apstiprināt jauno paroli
 password_incorrect=Ievadīta nepareiza pašreizējā parole.
 change_password_success=Parole tika veiksmīgi nomainīta. Tagad varat pieteikties ar jauno paroli.
@@ -697,19 +697,19 @@ password_change_disabled=Ārējie konti nevar mainīt paroli, izmantojot, Forgej
 
 emails=E-pasta adreses
 manage_emails=Pārvaldīt e-pasta adreses
-manage_themes=Izvēlieties noklusējuma motīvu
-manage_openid=Pārvaldīt OpenID adreses
+manage_themes=Noklusējuma izskats
+manage_openid=OpenID adreses
 email_desc=Primārā e-pasta adrese tiks izmantota paziņojumiem, paroļu atjaunošanai un, ja tā nav paslēpta, Git tīmekļa darbībām.
 theme_desc=Šis būs noklusējuma motīvs visiem lietotājiem.
 primary=Primārā
 activated=Aktivizēts
 requires_activation=Nepieciešams aktivizēt
-primary_email=Uzstādīt kā primāro
-activate_email=Nosūtīt aktivizācijas e-pastu
-activations_pending=Gaida aktivizāciju
+primary_email=Padarīt par galveno
+activate_email=Nosūtīt aktivizēšanas e-pasta ziņojumu
+activations_pending=Gaida aktivizēšanu
 can_not_add_email_activations_pending=Ir nepabeigta aktivizācija. Pēc dažām minūtēm mēģiniet vēlreiz, ja ir vēlme pievienot jaunu e-pasta adresi.
 delete_email=Noņemt
-email_deletion=Dzēst e-pasta adresi
+email_deletion=Noņemt e-pasta adresi
 email_deletion_desc=E-pasta adrese un ar to saistītā informācija tiks dzēsta no šī konta. Git revīzijas ar šo e-pasta adresi netiks mainītas. Vai turpināt?
 email_deletion_success=E-pasta adrese ir veiksmīgi izdzēsta.
 theme_update_success=Jūsu motīvs tika nomainīts.
@@ -717,7 +717,7 @@ theme_update_error=Izvēlētais motīvs neeksistē.
 openid_deletion=Dzēst OpenID adresi
 openid_deletion_desc=Dzēšot šo OpenID adresi no Jūsu konta, ar to vairs nebūs iespējams pieteikties. Vai turpināt?
 openid_deletion_success=OpenID adrese tika noņemta.
-add_new_email=Pievienot jaunu e-pasta adresi
+add_new_email=Pievienot e-pasta adresi
 add_new_openid=Pievienot jaunu OpenID vietrādi
 add_email=Pievienot e-pasta adresi
 add_openid=Pievienot OpenID vietrādi
@@ -844,12 +844,12 @@ create_oauth2_application_button=Izveidot lietotni
 create_oauth2_application_success=Ir veiksmīgi izveidota jauna OAuth2 lietotne.
 update_oauth2_application_success=Ir veiksmīgi atjaunota OAuth2 lietotne.
 oauth2_application_name=Lietotnes nosaukums
-oauth2_confidential_client=Konfidenciāls klients. Norādiet lietotēm, kas glabā noslēpumu slepenībā, piemēram, tīmekļa lietotnēm. Nenorādiet instalējamām lietotnēm, tai skaitā darbavirsmas vai mobilajām lietotnēm.
+oauth2_confidential_client=Slepens klients. Jāatlasa lietotnēm, kas glabā noslēpumu slepenībā, piemēram, tīmekļa lietotnēm. Nav jāatlasa ierastajām lietotnēm, tajā skaitā darbvirsmas un viedierīču lietotnēm.
 oauth2_redirect_uris=Pārsūtīšanas URI. Norādiet katru URI savā rindā.
 save_application=Saglabāt
 oauth2_client_id=Klienta ID
 oauth2_client_secret=Klienta noslēpums
-oauth2_regenerate_secret=Pārģenerēt noslēpumus
+oauth2_regenerate_secret=Atkārtoti izveidot noslēpumu
 oauth2_regenerate_secret_hint=Pazaudēts noslēpums?
 oauth2_client_secret_hint=Pēc šīs lapas pamešanas vai atsvaidzināšanas noslēpums vairs netiks parādīts. Lūgums pārliecināties, ka tas ir saglabāts.
 oauth2_application_edit=Labot
@@ -868,10 +868,10 @@ twofa_desc=Divfaktoru autentifikācija uzlabo konta drošību.
 twofa_recovery_tip=Ja ierīce tiek pazaudēta, iespējams izmantot vienreiz izmantojamo atkopšanas atslēgu, lai atgūtu piekļuvi savam kontam.
 twofa_is_enrolled=Kontam ir ieslēgta divfaktoru autentifikācija.
 twofa_not_enrolled=Kontam šobrīd nav ieslēgta divfaktoru autentifikācija.
-twofa_disable=Atslēgt divfaktoru autentifikāciju
-twofa_scratch_token_regenerate=Ģenerēt jaunu vienreizējo kodu
+twofa_disable=Atspējot divpakāpju pieteikšanos
+twofa_scratch_token_regenerate=Atkārtoti izveidot vienreizējas izmantošanas atkopšanas atslēgu
 twofa_scratch_token_regenerated=Vienreizējā pilnvara tagad ir %s. Tā ir jāglabā drošā vietā, tā vairs nekad netiks rādīta.
-twofa_enroll=Ieslēgt divfaktoru autentifikāciju
+twofa_enroll=Ieslēgt divpakāpju pieteikšanos
 twofa_disable_note=Nepieciešamības gadījumā divfaktoru autentifikāciju ir iespējams atslēgt.
 twofa_disable_desc=Atslēdzot divfaktoru autentifikāciju, konts vairs nebūs tik drošs. Vai turpināt?
 regenerate_scratch_token_desc=Ja esat aizmirsis vienreizējo kodu vai esat to jau izmantojis, lai pieteiktos, atjaunojiet to šeit.
@@ -891,11 +891,11 @@ webauthn_delete_key_desc=Noņemot drošības atslēgu ar to vairs nebūs iespēj
 webauthn_key_loss_warning=Ja tiek pazaudētas drošības atslēgas, tiks zaudēta piekļuve kontam.
 webauthn_alternative_tip=Ir vēlams uzstādīt papildu autentifikācijas veidu.
 
-manage_account_links=Pārvaldīt saistītos kontus
+manage_account_links=Sasaistītie konti
 manage_account_links_desc=Šādi ārējie konti ir piesaistīti Jūsu Forgejo kontam.
 account_links_not_available=Pašlaik nav neviena ārējā konta piesaistīta šim kontam.
 link_account=Sasaistīt kontu
-remove_account_link=Noņemt saistīto kontu
+remove_account_link=Noņemt sasaistīto kontu
 remove_account_link_desc=Noņemot saistīto kontu, tam tiks liegta piekļuve Jūsu Forgejo kontam. Vai turpināt?
 remove_account_link_success=Saistītais konts tika noņemts.
 
@@ -904,18 +904,18 @@ hooks.desc=Pievienot tīmekļa āķus, kas izpildīsies visos repozitori
 orgs_none=Jūs neesat nevienas organizācijas biedrs.
 repos_none=Jums nepieder neviens repozitorijs.
 
-delete_account=Dzēst savu kontu
+delete_account=Izdzēst savu kontu
 delete_prompt=Šī darbība pilnībā izdzēsīs Jūsu kontu, kā arī tā ir NEATGRIEZENISKA.
 delete_with_all_comments=Jūsu konts ir jaunāks par %s. Lai izveirotos no spoka komentāriem, visu problēmu un izmaiņu pieprasījumu komentāri tiks dzēsti līdz ar kontu.
-confirm_delete_account=Apstiprināt dzēšanu
-delete_account_title=Dzēst lietotāja kontu
+confirm_delete_account=Apstiprināt izdzēšanu
+delete_account_title=Izdzēst lietotāja kontu
 delete_account_desc=Vai tiešām vēlaties dzēst šo kontu?
 
 email_notifications.enable=Iespējot e-pasta paziņojumus
-email_notifications.onmention=Tikai, ja esmu pieminēts
-email_notifications.disable=Nesūtīt paziņojumus
-email_notifications.submit=Saglabāt sūtīšanas iestatījumus
-email_notifications.andyourown=Iekļaut savus paziņojumus
+email_notifications.onmention=Tikai, ja piemin mani
+email_notifications.disable=Atspējot e-pasta paziņojumus
+email_notifications.submit=Iestatīt e-pasta iestatījumus
+email_notifications.andyourown=Un manus paziņojumus
 
 visibility=Lietotāja redzamība
 visibility.public=Publisks
@@ -933,7 +933,7 @@ repo_name=Repozitorija nosaukums
 repo_name_helper=Labi repozitorija nosaukumi ir īsi, unikāli un tādi, ko viegli atcerēties.
 repo_size=Repozitorija izmērs
 template=Sagatave
-template_select=Izvēlieties sagatavi.
+template_select=Atlasīt sagatavi
 template_helper=Padarīt repozitoriju par sagatavi
 template_description=Sagatavju repozitoriji tiek izmantoti, lai balstoties uz tiem veidotu jaunus repozitorijus saglabājot direktoriju un failu struktūru.
 visibility=Redzamība
@@ -956,19 +956,19 @@ download_zip=Lejupielādēt ZIP
 download_tar=Lejupielādēt TAR.GZ
 download_bundle=Lejupielādēt BUNDLE
 generate_repo=Ģenerēt repozitoriju
-generate_from=Ģenerēt no
+generate_from=Izveidot no
 repo_desc=Apraksts
 repo_desc_helper=Ievadiet īsu aprakstu (neobligāts)
 repo_lang=Valoda
-repo_gitignore_helper=Izvēlieties .gitignore sagatavi.
+repo_gitignore_helper=Atlasīt .gitignore sagatavi
 repo_gitignore_helper_desc=Izvēlieties kādi faili netiks glabāti repozitorijā no sagatavēm biežāk lietotājām valodām. Pēc noklusējuma .gitignore iekļauj valodu kompilācijas rīku artifaktus.
-issue_labels=Problēmu etiķetes
-issue_labels_helper=Izvēlieties problēmu etiķešu kopu.
+issue_labels=Iezīmes
+issue_labels_helper=Atlasīt iezīmju kopu
 license=Licence
-license_helper=Izvēlieties licences failu.
+license_helper=Atlasīt licences datni
 license_helper_desc=Licence nosaka, ko citi var un ko nevar darīt ar šo kodu. Neesat pārliecintāts, kādu izvēlēties šim projektam? Aplūkojiet licences izvēle.
 readme=LASIMANI
-readme_helper=Izvēlieties LASIMANI faila sagatavi.
+readme_helper=Atlasīt README datnes sagatavi
 readme_helper_desc=Šajā vietā ir iespējams detalizēti aprakstīt šo projektu.
 auto_init=Inicializēt repozitoriju (Pievieno .gitignore, licenci un README)
 trust_model_helper=Izvēlieties parakstu pārbaudes uzticamības modeli. Iespējamie varianti ir:
@@ -977,15 +977,15 @@ trust_model_helper_committer=Revīzijas iesūtītāja: Uzticēties parakstiem, k
 trust_model_helper_collaborator_committer=Līdzstrādnieka un revīzijas iesūtītāja: Uzticēties līdzstrādnieku parakstiem, kas atbilst revīzijas iesūtītājam
 trust_model_helper_default=Noklusētais: Izmantojiet šī servera noklusēto uzticamības modeli
 create_repo=Izveidot repozitoriju
-default_branch=Noklusētais atzars
+default_branch=Noklusējuma zars
 default_branch_label=noklusējuma
 default_branch_helper=Noklusētais atzars nosaka pamata atzaru uz kuru tiks veidoti izmaiņu pieprasījumi un koda revīziju iesūtīšana.
 mirror_prune=Izmest
 mirror_prune_desc=Izdzēst visas ārējās atsauces, kas ārējā repozitorijā vairs neeksistē
-mirror_interval=Spoguļošanas intervāls (derīgas laika vienības ir 'h', 'm', 's'). Norādiet 0, lai atslēgtu periodisku spoguļošanu. (Minimālais intervāls: %s)
+mirror_interval=Starplaiks starp spoguļošanu (derīgas laika vienības ir 'h', 'm', 's'). 0, lai atslēgtu atkārtojošos sinhronizēšanu. (Mazākais pieļaujamais laika posms: %s)
 mirror_interval_invalid=Nekorekts spoguļošanas intervāls.
 mirror_sync_on_commit=Sinhronizēt, kad revīzijas tiek iesūtītas
-mirror_address=Spoguļa adrese
+mirror_address=Klonēt no URL
 mirror_address_desc=Pieslēgšanās rekvizītus norādiet autorizācijas sadaļā.
 mirror_address_url_invalid=Norādītais URL ir nederīgs. Visas URL daļas ir jānorāda pareizi.
 mirror_address_protocol_invalid=Norādītais URL ir nederīgs. Var spoguļot tikai no http(s):// vai git:// adresēm.
@@ -1005,7 +1005,7 @@ reactions_more=un vēl %d
 unit_disabled=Administrators ir atspējojies šo repozitorija sadaļu.
 language_other=Citas
 adopt_search=Ievadiet lietotāja vārdu, lai meklētu nepārņemtos repozitorijus... (atstājiet tukšu, lai meklētu visus)
-adopt_preexisting_label=Pārņemt failus
+adopt_preexisting_label=Pārņemt datnes
 adopt_preexisting=Pārņemt jau eksistējošos failus
 adopt_preexisting_content=Izveidot repozitoriju no direktorijas %s
 adopt_preexisting_success=Pārņemti faili un izveidots repozitorijs no %s
@@ -3512,13 +3512,13 @@ runners.last_online=Pēdējo reizi tiešsaistē
 runners.runner_title=Izpildītājs
 runners.task_list=Pēdējās darbības, kas izpildītas
 runners.task_list.no_tasks=Vēl nav uzdevumu.
-runners.task_list.run=Izpildīt
+runners.task_list.run=Izpildījums
 runners.task_list.status=Statuss
 runners.task_list.repository=Repozitorijs
 runners.task_list.commit=Revīzija
 runners.task_list.done_at=Beigu laiks
 runners.edit_runner=Labot izpildītāju
-runners.update_runner=Atjaunot izpildītāju
+runners.update_runner=Atjaunināt izmaiņas
 runners.update_runner_success=Izpildītājs veiksmīgi atjaunots
 runners.update_runner_failed=Neizdevās atjaunot izpildītāju
 runners.delete_runner=Dzēst izpildītāju
@@ -3588,3 +3588,7 @@ executable_file=Izpildāmais fails
 symbolic_link=Simboliska saite
 submodule=Apakšmodulis
 
+
+
+[search]
+commit_kind = Meklēt iesūtījumus...
\ No newline at end of file
diff --git a/options/locale/locale_nds.ini b/options/locale/locale_nds.ini
index 46c27fbea1..7336077652 100644
--- a/options/locale/locale_nds.ini
+++ b/options/locale/locale_nds.ini
@@ -52,7 +52,7 @@ email = E-Mail-Adress
 re_type = Passwoord utwiesen
 webauthn_error_unable_to_process = De Server kunn diene Anfraag nich verarbeiden.
 new_mirror = Nejer Spegel
-webauthn_sign_in = Drück de Knopp up dienem Sekerheids-Slötel. Wenn dien Slötel keenen Knopp hett, steek ’t ut un weer in.
+webauthn_sign_in = Drück de Knoop up dienem Sekerheids-Slötel. Wenn dien Slötel keenen Knoop hett, steek ’t ut un weer in.
 webauthn_error_insecure = WebAuthn unnerstütt blots seker Verbinnens. Wenn du över HTTP testen willst, kannst du de Quell »localhost« of »127.0.0.1« bruken
 webauthn_error_duplicated = De Sekerheids-Slötel is för deese Anfraag nich verlöövt. Bidde wees wiss, dat de Slötel nich al vermarkt is.
 webauthn_error_timeout = Tied överweggahn ehr dien Slötel lesen worden kunn. Bidde laad deese Sied neei un versöök dat noch eenmaal.
@@ -206,6 +206,12 @@ buttons.unindent.tooltip = Dingen um een Stand utschuven
 buttons.heading.tooltip = Överschrift hentofögen
 buttons.list.ordered.tooltip = Nummereerte List hentofögen
 buttons.enable_monospace_font = Fastbreden-Schrift anknipsen
+buttons.new_table.tooltip = Tabell hentofögen
+table_modal.header = Tabell hentofögen
+table_modal.placeholder.header = Kopprieg
+table_modal.placeholder.content = Inholl
+table_modal.label.rows = Riegen
+table_modal.label.columns = Striepen
 
 [filter]
 string.desc = Z – A
@@ -627,7 +633,7 @@ delete_key = Wegdoon
 ssh_key_deletion = SSH-Slötel wegdoon
 ssh_principal_deletion_success = De Höövdmann is wegdaan worden.
 orgs = Vereenigungen
-biography_placeholder = Vertell uns een bietje wat över di! (Du kannst Markdown bruken)
+biography_placeholder = Vertell annern een bietje wat över di! (Markdown word unnerstütt)
 change_username = Dien Brukernaam is ännert worden.
 ui = Thema
 additional_repo_units_hint_description = Wiest eenen Wenk »Mehr anknipsen« för Repositoriums, in wat nich all verföögbaar Delen anknipst sünd.
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
index a941f270e4..c0fe99b9e8 100644
--- a/options/locale/locale_pt-BR.ini
+++ b/options/locale/locale_pt-BR.ini
@@ -199,6 +199,12 @@ buttons.enable_monospace_font=Habilitar fonte mono espaçada
 buttons.disable_monospace_font=Desabilitar fonte mono espaçada
 buttons.indent.tooltip = Aninhar items em um nível
 buttons.unindent.tooltip = Desaninhar items em um nível
+buttons.new_table.tooltip = Adicionar tabela
+table_modal.header = Adicionar tabela
+table_modal.placeholder.header = Cabeçalho
+table_modal.placeholder.content = Conteúdo
+table_modal.label.rows = Linhas
+table_modal.label.columns = Colunas
 
 [filter]
 string.asc=A - Z
@@ -222,6 +228,7 @@ lightweight_desc=Forgejo utiliza poucos recursos e consegue mesmo rodar no barat
 license=Código aberto
 license_desc=Está tudo no Forgejo! Contribua e torne este projeto ainda melhor. Não tenha vergonha de contribuir!
 install_desc = Apenas rode o binário para a sua plataforma, execute-o com Docker, ou obtenha-o empacotado.
+platform_desc = Foi confirmado que o Forgejo roda em sistemas operacionais livres, como Linux e FreeBSD, assim como em diferentes arquiteturas de CPU. Escolha sua preferida!
 
 [install]
 install=Instalação
@@ -476,6 +483,7 @@ hint_login = Já possui uma conta? Faça login agora!
 sign_in_openid = Continuar com OpenID
 back_to_sign_in = Voltar a Iniciar Sessão
 unauthorized_credentials = As credenciais estão incorretas ou expiraram. Tente novamente o comando ou consulte %s para obter mais informações
+use_onetime_code = Usar um código de uso único
 
 [mail]
 view_it_on=Veja em %s
@@ -737,7 +745,7 @@ uid=UID
 webauthn=Chaves de segurança
 
 public_profile=Perfil público
-biography_placeholder=Conte-nos um pouco sobre você! (Você pode usar Markdown)
+biography_placeholder=Conte um pouco sobre você! (Markdown é suportado)
 location_placeholder=Compartilhe sua localização aproximada com outras pessoas
 profile_desc=Controle como o seu perfil é exibido para outros usuários. Seu endereço de e-mail principal será usado para notificações, recuperação de senha e operações do Git baseadas na Web.
 password_username_disabled=Usuários não-locais não podem alterar seus nomes de usuário. Por favor contate o administrador do site para mais informações.
@@ -2500,7 +2508,7 @@ diff.load=Carregar Diff
 diff.generated=gerado
 diff.vendored=externo
 diff.comment.placeholder=Deixe um comentário
-diff.comment.markdown_info=Estilo com markdown é suportado.
+diff.comment.markdown_info=Estilo com Markdown é suportado.
 diff.comment.add_single_comment=Adicionar um único comentário
 diff.comment.add_review_comment=Adicionar comentário
 diff.comment.start_review=Iniciar revisão
@@ -2815,8 +2823,8 @@ settings.ignore_stale_approvals_desc = Não contar aprovações feitas em commit
 settings.protect_status_check_patterns = Padrões de verificação de status
 error.broken_git_hook = Os hooks Git desse repositório parecem estar quebrados. Por favor, siga a documentação para corrigi-los e então faça push de alguns commits para atualizar o status.
 release.type_attachment = Anexo
-release.type_external_asset = Recurso Externo
-release.asset_name = Nome do Recurso
+release.type_external_asset = Recurso externo
+release.asset_name = Nome do recurso
 release.asset_external_url = URL Externa
 release.hide_archive_links_helper = Esconder automaticamente arquivos de código fonte gerados para esse release. Por exemplo, se você estiver enviando os seus manualmente.
 branch.delete_desc = Apagar um branch é permanente. Ainda que o branch apagado possa continuar a existir por um breve período antes de ser realmente apagado, isso NÃO PODE ser desfeito na maioria dos casos. Continuar?
@@ -2829,6 +2837,9 @@ settings.discord_icon_url.exceeds_max_length = A URL do ícone precisa ter 2048
 issues.review.add_review_requests = solicitou revisões de %[1]s %[2]s
 issues.review.remove_review_requests = removeu pedidos de revisão para %[1]s %[2]s
 issues.review.add_remove_review_requests = solicitou revisões de %[1]s e removeu pedidos de revisão para %[2]s %[3]s
+pulls.delete_after_merge.head_branch.is_default = O branch head que você quer excluir é o branch padrão e não pode ser excluído.
+pulls.delete_after_merge.head_branch.is_protected = O branch head que você quer excluir é um branch protegido e não pode ser excluído.
+pulls.delete_after_merge.head_branch.insufficient_branch = Você não tem permissão para excluir o branch head.
 
 [graphs]
 
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
index 3507b2ea67..7a1b68b529 100644
--- a/options/locale/locale_ru-RU.ini
+++ b/options/locale/locale_ru-RU.ini
@@ -199,6 +199,12 @@ buttons.enable_monospace_font=Включить моноширинный шриф
 buttons.disable_monospace_font=Выключить моноширинный шрифт
 buttons.unindent.tooltip = Уменьшить вложенность на 1
 buttons.indent.tooltip = Увеличить вложенность на 1
+buttons.new_table.tooltip = Создать таблицу
+table_modal.label.columns = Кол-во столбцов
+table_modal.header = Создание таблицы
+table_modal.placeholder.header = Заголовок
+table_modal.placeholder.content = Содержимое
+table_modal.label.rows = Кол-во строк
 
 [filter]
 string.asc=A - Я
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
index 9a98b4be81..39f37783c0 100644
--- a/options/locale/locale_uk-UA.ini
+++ b/options/locale/locale_uk-UA.ini
@@ -132,7 +132,7 @@ value = Значення
 webauthn_insert_key = Під'єднайте ключ безпеки
 download_logs = Завантажити журнали
 webauthn_sign_in = Натисніть кнопку на ключі безпеки. Якщо ключ безпеки не має кнопки, від'єднайте його й під'єднайте ще раз.
-webauthn_unsupported_browser = Ваш оглядач наразі не підтримує WebAuthn.
+webauthn_unsupported_browser = Ваш браузер наразі не підтримує WebAuthn.
 webauthn_error_insecure = WebAuthn підтримує лише захищені з'єднання. Для тестування через HTTP можете використати origin-рядок «localhost» чи «127.0.0.1»
 webauthn_error_timeout = Ключ не встиг зчитатись протягом відведеного терміну. Будь ласка, перезавантажте сторінку й повторіть спробу.
 locked = Заблоковано
@@ -197,8 +197,14 @@ buttons.disable_monospace_font = Вимкнути моноширинний шр
 buttons.indent.tooltip = Вкласти предмет на один рівень
 buttons.unindent.tooltip = Викласти об'єкт на один рівень
 buttons.mention.tooltip = Згадати користувача чи команду
-buttons.ref.tooltip = Посилатись на недолік чи на запит на злиття
+buttons.ref.tooltip = Послатись на задачу чи на запит на злиття
 buttons.enable_monospace_font = Увімкнути моноширинний шрифт
+buttons.new_table.tooltip = Додати таблицю
+table_modal.label.columns = Стовпці
+table_modal.header = Додати таблицю
+table_modal.placeholder.header = Заголовок
+table_modal.placeholder.content = Вміст
+table_modal.label.rows = Рядки
 
 [filter]
 string.asc = А - Я
@@ -247,7 +253,7 @@ err_empty_db_path=Шлях до файлу бази даних SQLite3 не мо
 no_admin_and_disable_registration=Ви не можете вимкнути реєстрацію до створення облікового запису адміністратора.
 err_empty_admin_password=Пароль адміністратора не може бути порожнім.
 err_empty_admin_email=Електронна адреса адміністратора не може бути порожньою.
-err_admin_name_is_reserved=Неправильне ім'я користувача-адміністратора - ім'я зарезервоване
+err_admin_name_is_reserved=Неправильне ім'я користувача-адміністратора — ім'я зарезервоване
 err_admin_name_pattern_not_allowed=Ім'я адміністратора недійсне, це ім'я підпадає під зарезервований шаблон
 err_admin_name_is_invalid=Неправильне ім'я користувача-адміністратора
 
@@ -299,7 +305,7 @@ enable_captcha.description=Вимагати перевірку CAPTCHA для с
 require_sign_in_view=Вимагати авторизації для перегляду вмісту екземпляра
 admin_setting.description=Створювати обліковий запис адміністратора необов'язково. Перший зареєстрований користувач автоматично стає адміністратором.
 admin_title=Налаштування облікового запису адміністратора
-admin_name=Ім'я користувача адміністратора
+admin_name=Ім'я користувача-адміністратора
 admin_password=Пароль
 confirm_password=Підтвердження пароля
 admin_email=Адреса електронної пошти
@@ -521,8 +527,8 @@ repo.transfer.subject_to_you=%s бажає передати вам репози
 repo.transfer.to_you=вам
 repo.transfer.body=Щоб прийняти або відхилити перейдіть до %s або просто ігноруйте.
 
-repo.collaborator.added.subject=%s додав вас до %s
-repo.collaborator.added.text=Ви були додані в якості співавтора репозиторію:
+repo.collaborator.added.subject=%s додав вас до %s в якості співавтора
+repo.collaborator.added.text=Вас додано в якості співавтора репозиторію:
 primary_mail_change.subject = Ваша основна пошта була змінена
 totp_disabled.subject = TOTP було вимкнено
 totp_disabled.text_1 = Тимчасовий одноразовий пароль (TOTP) на вашому обліковому записі було вимкнено.
@@ -638,6 +644,16 @@ joined_on = Реєстрація %s
 email_visibility.private = Ваш email видно лише вам і адміністраторам
 email_visibility.limited = Вашу е-пошту видно всім авторизованим
 settings = Користувацькі параметри
+block_user.detail_3 = Ви не зможете додати один одного в якості співавтора репозиторію.
+show_on_map = Показати це місце на мапі
+block_user.detail_2 = Цей користувач не зможе взаємодіяти з репозиторіями, власником яких є ви, а також із задачами та коментарями, які ви створили.
+block_user.detail_1 = Ви припините стежити один за одним і не зможете підписатися один на одного.
+block = Заблокувати
+unblock = Розблокувати
+code = Код
+block_user = Заблокувати користувача
+block_user.detail = Зверніть увагу, що блокування користувача має такі наслідки:
+follow_blocked_user = Ви не можете підписатися на цього користувача, тому що ви його заблокували або він заблокував вас.
 
 
 [settings]
@@ -866,10 +882,10 @@ confirm_delete_account=Підтвердити видалення
 delete_account_title=Видалити обліковий запис
 delete_account_desc=Ви впевнені, що хочете остаточно видалити цей обліковий запис?
 
-email_notifications.enable=Увімкнути сповіщення email
-email_notifications.onmention=Повідомлення email тільки коли згадують
-email_notifications.disable=Вимкнути email сповіщення
-email_notifications.submit=Налаштувати параметри email
+email_notifications.enable=Увімкнути email-сповіщення
+email_notifications.onmention=Email тільки коли згадують
+email_notifications.disable=Вимкнути email-сповіщення
+email_notifications.submit=Зберегти параметри email
 
 visibility=Видимість користувача
 visibility.public=Публічний
@@ -878,7 +894,7 @@ visibility.private=Приватний
 saved_successfully = Налаштування успішно збережено.
 comment_type_group_time_tracking = Облік часу
 location_placeholder = Поділіться з іншими, де приблизно ви знаходитесь
-biography_placeholder = Розкажіть трохи про себе! (Можете використати Markdown)
+biography_placeholder = Розкажіть трохи про себе! (Підтримується Markdown)
 hidden_comment_types = Приховані типи коментарів
 keep_activity_private = Приховати активність зі сторінки профілю
 blocked_users = Заблоковані користувачі
@@ -899,6 +915,8 @@ revoke_oauth2_grant_success = Доступ відкликано успішно.
 twofa_recovery_tip = Якщо ви втратите ваш пристрій, ви зможете використати одноразовий код відновлення, щоб знову отримати доступ до свого облікового запису.
 webauthn_delete_key_desc = Якщо ви видалите ключ безпеки, ви більше не зможете з ним зайти. Продовжити?
 change_password = Зміна пароля
+email_notifications.andyourown = І ваші власні сповіщення
+visibility.public_tooltip = Видимий(а) для всіх
 
 [repo]
 owner=Власник
@@ -1018,7 +1036,7 @@ migrate_items_milestones=Етапи
 migrate_items_labels=Мітки
 migrate_items_issues=Задачі
 migrate_items_pullrequests=Запити на злиття
-migrate_items_merge_requests=Запити на злиття
+migrate_items_merge_requests=Запити на об'єднання
 migrate_items_releases=Релізи
 migrate_repo=Перенести репозиторій
 migrate.clone_address=Міграція / клонувати з URL-адреси
@@ -1152,7 +1170,7 @@ editor.commit_empty_file_header=Закомітити порожній файл
 editor.commit_empty_file_text=Файл, в комміті порожній. Продовжити?
 editor.no_changes_to_show=Нема змін для показу.
 editor.fail_to_update_file_summary=Помилка:
-editor.push_rejected_summary=Повне повідомлення про відмову:
+editor.push_rejected_summary=Повне повідомлення про відхилення:
 editor.add_subdir=Додати каталог…
 editor.no_commit_to_branch=Не вдалося внести коміт безпосередньо до гілки, тому що:
 editor.user_no_push_to_branch=Користувач не може здійснити пуш до гілки
@@ -1497,8 +1515,8 @@ pulls.nothing_to_compare=Ці гілки однакові. Немає необх
 pulls.nothing_to_compare_and_allow_empty_pr=Одинакові гілки. Цей PR буде порожнім.
 pulls.has_pull_request=`Запит злиття для цих гілок вже існує: %[2]s#%[3]d`
 pulls.create=Створити запит на злиття
-pulls.title_desc_few=хоче злити %[1]d комітів з %[2]s в %[3]s
-pulls.merged_title_desc_few=злито %[1]d комітів з %[2]s до %[3]s %[4]s
+pulls.title_desc_few=хоче об'єднати %[1]d комітів з %[2]s в %[3]s
+pulls.merged_title_desc_few=об'єднав %[1]d комітів з %[2]s в %[3]s %[4]s
 pulls.change_target_branch_at=`змінена цільова гілка з %s на %s %s`
 pulls.tab_conversation=Обговорення
 pulls.tab_commits=Коміти
@@ -1546,13 +1564,13 @@ pulls.merge_commit_id=ID коміту злиття
 pulls.require_signed_wont_sign=Гілка вимагає підписаних комітів, але це злиття не буде підписано
 
 pulls.invalid_merge_option=Цей параметр злиття не можна використовувати для цього Pull Request'а.
-pulls.merge_conflict=Злиття не вдалося: Був конфлікт при злиття. Підказка: спробуйте іншу стратегію
+pulls.merge_conflict=Не вдалося об'єднати: при об'єднанні виник конфлікт. Підказка: спробуйте іншу стратегію
 pulls.merge_conflict_summary=Повідомлення про помилку
-pulls.rebase_conflict=Злиття не вдалося: відбувся конфлікт під час злиття: %[1]s. Підказка: спробуйте іншу стратегію
+pulls.rebase_conflict=Не вдалося об'єднати: виник конфлікт під час перебазування коміта: %[1]s. Підказка: спробуйте іншу стратегію
 pulls.rebase_conflict_summary=Повідомлення про помилку
-pulls.unrelated_histories=Помилка злиття: head та base злиття не мають спільної історії. Підказка: спробуйте іншу стратегію
-pulls.merge_out_of_date=Помилка злиття: base було оновлено, поки відбувалося злиття. Підказка: спробуйте знову.
-pulls.push_rejected_summary=Повне повідомлення про відмову
+pulls.unrelated_histories=Не вдалося об'єднати: head та base злиття не мають спільної історії. Підказка: спробуйте іншу стратегію
+pulls.merge_out_of_date=Не вдалося об'єднати: base було оновлено, поки відбувалося об'єднання. Підказка: спробуйте знову.
+pulls.push_rejected_summary=Повне повідомлення про відхилення
 pulls.open_unmerged_pull_exists=`Ви не можете знову відкрити, оскільки вже існує запит на злиття (%d) з того ж репозиторія з тією ж інформацією про злиття і в очікуванні.`
 pulls.status_checking=Деякі перевірки знаходяться на розгляді
 pulls.status_checks_success=Всі перевірки були успішними
@@ -1636,8 +1654,8 @@ activity.period.yearly=1 рік
 activity.overview=Огляд
 activity.active_prs_count_1=%d активний запит на злиття
 activity.active_prs_count_n=%d активних запитів на злиття
-activity.merged_prs_count_1=Злитий запит на злиття
-activity.merged_prs_count_n=Злиті запити на злиття
+activity.merged_prs_count_1=Об'єднаний запит на злиття
+activity.merged_prs_count_n=Об'єднані запити на злиття
 activity.opened_prs_count_1=Запропонований запит на злиття
 activity.opened_prs_count_n=Запропонованих запитів на злиття
 activity.title.user_1=%d користувачем
@@ -1933,7 +1951,7 @@ settings.protect_this_branch=Захистити цю гілку
 settings.protect_this_branch_desc=Запобігає видаленню гілки та обмежує виконання в ній push та злиття.
 settings.protect_disable_push=Заборонити Push
 settings.protect_disable_push_desc=Для цієї гілки буде заборонено виконання push.
-settings.protect_enable_push=Дозволити Push
+settings.protect_enable_push=Дозволити push
 settings.protect_enable_push_desc=Будь-хто із правом запису зможе виконувати push для цієї гілки (за виключенням force push).
 settings.protect_whitelist_committers=Білий список обмеження Push
 settings.protect_whitelist_committers_desc=Лише користувачі та команди з білого списку зможуть виконувати push в цій гілці (за виключеням force push).
@@ -1942,10 +1960,10 @@ settings.protect_whitelist_users=Користувачі, які можуть р
 settings.protect_whitelist_search_users=Пошук користувачів…
 settings.protect_whitelist_teams=Команди, учасники яких можуть робити push в цю гілку
 settings.protect_whitelist_search_teams=Пошук команд…
-settings.protect_merge_whitelist_committers=Обмежити право на прийняття Pull Request'ів в цю гілку списком
+settings.protect_merge_whitelist_committers=Обмежити право на об'єднання списком
 settings.protect_merge_whitelist_committers_desc=Ви можете додавати користувачів або цілі команди в 'білий' список цієї гілки. Тільки присутні в списку зможуть приймати запити на злиття. В іншому випадку будь-хто з правами запису до головного репозиторію буде володіти такою можливістю.
-settings.protect_merge_whitelist_users=Користувачі з правом на прийняття Pull Request'ів в цю гілку
-settings.protect_merge_whitelist_teams=Команди, яким дозволено злиття
+settings.protect_merge_whitelist_users=Користувачі з правом на об'єднання
+settings.protect_merge_whitelist_teams=Команди, яким дозволено об'єднання
 settings.protect_check_status_contexts=Увімкнути перевірку стану
 settings.protect_check_status_contexts_desc=Вимагати успішного проходження перевірок стану перед злиттям. Оберіть перевірки стану, які слід провести для гілок, перед їх об'єднанням з гілкою, що відповідає цьому правилу. Коли цей пункт увімкнено, коміти спершу надсилаються до іншої гілки, а потім зливаються або надсилаються безпосередньо до гілки, яка відповідає цьому правилу після успішного проходження перевірок стану. Якщо не вибрано контекст, останній коміт має успішно проходити перевірки, незалежно від контексту.
 settings.protect_check_status_contexts_list=Перевірки статусу знайдено для репозитарію за минулий тиждень
@@ -1970,7 +1988,7 @@ settings.block_on_official_review_requests_desc=Об’єднання немож
 settings.block_outdated_branch=Блокувати злиття, якщо запит на злиття застарів
 settings.block_outdated_branch_desc=Злиття буде неможливим, коли головна гілка позаду основної.
 settings.default_branch_desc=Головна гілка є 'базовою' для вашого репозиторія, на яку за замовчуванням спрямовані всі запити на злиття і яка є обличчям вашого репозиторія. Перше, що побачить відвідувач - це зміст головної гілки. Виберіть її з уже існуючих:
-settings.default_merge_style_desc=Стиль злиття за замовчуванням
+settings.default_merge_style_desc=Стиль об'єднання за замовчуванням
 settings.choose_branch=Оберіть гілку…
 settings.no_protected_branch=Немає захищених гілок.
 settings.edit_protected_branch=Редагувати
@@ -2063,7 +2081,7 @@ diff.load=Завантажити різницю
 diff.generated=згенерований
 diff.vendored=сторонній
 diff.comment.placeholder=Залишити коментар
-diff.comment.markdown_info=Стилізація з markdown підтримується.
+diff.comment.markdown_info=Підтримується розмітка Markdown.
 diff.comment.add_single_comment=Додати простий коментар
 diff.comment.add_review_comment=Додати коментар
 diff.comment.start_review=Розпочати рецензію
@@ -2092,7 +2110,7 @@ release.compare=Порівняти
 release.edit=Редагувати
 release.ahead.commits=%d коміт(ів)
 release.ahead.target=до %s з моменту цього випуску
-release.source_code=Код
+release.source_code=Вихідний код
 release.new_subheader=Публікація релізів допоможе вам організувати версію проєкту.
 release.edit_subheader=Публікація релізів допоможе вам організувати версію проєкту.
 release.tag_name=Назва тегу
@@ -2223,6 +2241,38 @@ settings.tracker_issue_style.regexp_pattern = Шаблон регулярног
 settings.tracker_issue_style.regexp = Регулярний вираз
 release.download_count_one = %s завантаження
 release.download_count_few = %s завантажень
+release.invalid_external_url = Неправильна зовнішня URL-адреса: «%s»
+issues.role.collaborator_helper = Цього користувача запрошено до співпраці над репозиторієм.
+settings.add_collaborator_owner = Неможливо додати власника в якості співавтора.
+settings.protect_status_check_patterns = Шаблони перевірки стану
+issues.role.collaborator = Співавтор
+pulls.auto_merge_cancel_schedule = Скасувати автоматичне об'єднання
+issues.comment_pull_merged_at = об'єднав коміт %[1]s в %[2]s %[3]s
+pulls.title_desc_one = хоче об'єднати %[1]d коміт з %[2]s в %[3]s
+settings.merge_style_desc = Стилі об'єднання
+pulls.auto_merge_when_succeed = Об'єднувати автоматично, якщо всі перевірки проходять успішно
+pulls.cmd_instruction_merge_title = Об'єднання
+settings.protect_enable_merge = Увімкнути об'єднання
+pulls.merged_success = Запит на злиття успішно об'єднано і закрито
+pulls.auto_merge_button_when_succeed = (Якщо перевірки проходять успішно)
+editor.commit_id_not_matching = Файл було змінено, поки ви його редагували. Зробіть коміт у нову гілку, а потім об'єднайте.
+settings.event_pull_request_merge = Об'єднання запиту на злиття
+pulls.auto_merge_canceled_schedule = Автоматичне об'єднання скасовано для цього запиту на злиття.
+pulls.auto_merge_not_scheduled = Цей запит на злиття не заплановано для автоматичного об'єднання.
+pulls.merged_title_desc_one = об'єднав %[1]d коміт з %[2]s в %[3]s %[4]s
+pulls.fast_forward_only_merge_pull_request = Тільки fast-forward
+pulls.merged_by = від %[3]s об'єднано %[1]s
+issues.comment_manually_pull_merged_at = вручну об'єднав коміт %[1]s в %[2]s %[3]s
+pulls.merged_by_fake = від %[2]s об'єднано %[1]s
+pulls.clear_merge_message = Очистити повідомлення про об'єднання
+pulls.cmd_instruction_merge_desc = Об'єднайте зміни й оновіть їх на Forgejo.
+pulls.is_ancestor = Цю гілку вже включено в цільову гілку. Нічого об'єднувати.
+pulls.has_merged = Помилка: запит на злиття вже об'єднано, неможливо об'єднати знову чи змінити цільову гілку.
+pulls.head_out_of_date = Не вдалося об'єднати: head було оновлено, поки відбувалося об'єднання. Підказка: спробуйте знову.
+no_eol.tooltip = У цьому файлі відсутній символ закінчення рядка (EOL) у кінці.
+settings.trust_model.committer.desc = Допустимі підписи будуть позначатися як «довірені», тільки якщо вони відповідають автору коміта, в іншому випадку вони позначатимуться як «невідповідні». Це змусить Forgejo бути автором підписаних комітів, а фактичного автора зазначати в трейлерах «Co-authored-by» і «Co-committed-by» в описі коміта. Типовий ключ Forgejo повинен відповідати користувачу в базі даних.
+pulls.clear_merge_message_hint = Очищення повідомлення про об'єднання видалить лише вміст повідомлення коміту і збереже згенеровані git-трейлери, такі як «Co-Authored-By…».
+branch.delete_branch_has_new_commits = Гілку «%s» не можна видалити, оскільки після об'єднання було додано нові коміти.
 
 [graphs]
 contributors.what = внески
@@ -2315,7 +2365,7 @@ teams.delete_team_desc=Видалення команди скасовує дос
 teams.delete_team_success=Команду було видалено.
 teams.read_permission_desc=Ця команда має доступ для читання: учасники можуть переглядати та клонувати репозиторії.
 teams.write_permission_desc=Ця команда надає доступ на запис: учасники можуть отримувати й виконувати push команди до репозитрію.
-teams.admin_permission_desc=Ця команда надає адміністраторський доступ: учасники можуть читати, виконувати push команди та додавати співробітників до репозиторію.
+teams.admin_permission_desc=Ця команда надає адміністраторський доступ: учасники можуть читати, виконувати push та додавати співавторів до її репозиторіїв.
 teams.create_repo_permission_desc=Крім того, ця команда надає дозвіл Створити репозиторій: учасники можуть створювати нові репозиторії в організації.
 teams.repositories=Репозиторії команди
 teams.search_repo_placeholder=Пошук репозиторію…
@@ -2333,6 +2383,7 @@ teams.all_repositories_helper=Команда має доступ до всіх 
 teams.all_repositories_read_permission_desc=Ця команда надає дозвіл Перегляд для всіх репозиторіїв: учасники можуть переглядати та клонувати їх.
 teams.all_repositories_write_permission_desc=Ця команда надає дозвіл Запис для всіх репозиторіїв: учасники можуть переглядати та виконувати push в репозиторіях.
 teams.all_repositories_admin_permission_desc=Ця команда надає дозвіл Адміністрування для всіх репозиторіїв: учасники можуть переглядати, виконувати push та додавати співробітників.
+code = Код
 
 [admin]
 dashboard=Панель управління
@@ -2351,7 +2402,7 @@ total=Разом: %d
 
 dashboard.statistic=Підсумок
 dashboard.operations=Технічне обслуговування
-dashboard.system_status=Статус системи
+dashboard.system_status=Стан системи
 dashboard.operation_name=Назва операції
 dashboard.operation_switch=Перемкнути
 dashboard.operation_run=Запустити
@@ -2787,7 +2838,7 @@ notices.operations = Дії
 packages.cleanup = Очистити недійсні дані
 packages.cleanup.success = Успішно очищено недійсні дані
 users.still_own_packages = Цей користувач досі володіє одним чи більше пакунками, спочатку видаліть ці пакунки.
-users.purge_help = Примусово видалити користувача і будь-які репозиторії, організації та пакунки, якими він володіє. Всі коментарі та недоліки, написані цим користувачем, також будуть видалені.
+users.purge_help = Примусово видалити користувача і будь-які репозиторії, організації та пакунки, якими він володіє. Всі коментарі та задачі, створені цим користувачем, також будуть видалені.
 dashboard.cleanup_packages = Очистити непридатні пакунки
 monitor.last_execution_result = Результат
 repos.lfs_size = Розмір LFS
@@ -2826,6 +2877,7 @@ review_dismissed_reason=Причина:
 create_branch=створив гілку %[3]s в %[4]s
 starred_repo=додав %[2]s у обране
 watched_repo=почав слідкувати за %[2]s
+auto_merge_pull_request = `автоматично об'єднав запит на злиття %[3]s#%[2]s`
 
 [tool]
 now=зараз
@@ -2890,8 +2942,8 @@ conan.details.repository=Репозиторій
 owner.settings.cleanuprules.enabled=Увімкнено
 about = Про цей пакунок
 empty = Поки що тут немає пакунків.
-empty.documentation = Для отримання додаткової інформації щодо реєстру пакунків, перегляньте документацію.
-registry.documentation = Для отримання додаткової інформації щодо реєстру %s, перегляньте документацію.
+empty.documentation = Докладніше про реєстр пакунків читайте в документації.
+registry.documentation = Докладніше про реєстр %s читайте в документації.
 settings.delete.notice = Ви збираєтеся видалити %s (%s). Цю операцію не можна скасувати, ви впевнені?
 details.author = Автор
 title = Пакунки
@@ -3008,6 +3060,11 @@ variables.id_not_exist = Змінної з ідентифікатором %d н
 variables.edit = Редагувати змінну
 runs.expire_log_message = Журнали очищено, тому що вони були занадто старі.
 runs.empty_commit_message = (порожнє повідомлення коміта)
+runners.status.unspecified = Невідомо
+runs.status_no_select = Усі стани
+runs.status = Стан
+runners.task_list.status = Стан
+runners.status = Стан
 
 
 
@@ -3054,7 +3111,7 @@ code_search_by_git_grep = Поточні результати пошуку ко
 package_kind = Шукати пакунки...
 project_kind = Шукати проєкти...
 branch_kind = Шукати гілки...
-issue_kind = Шукати недоліки...
+issue_kind = Шукати задачі...
 pull_kind = Шукати запити на злиття...
 runner_kind = Пошук раннерів...
 
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 0f2b99be32..a51beeb977 100644
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -174,10 +174,10 @@ footer.software=关于软件
 footer.links=链接
 
 [heatmap]
-number_of_contributions_in_the_last_12_months=一年内 %s 次贡献
-contributions_zero=目前还没有贡献
-less=显示更少
-more=显示更多
+number_of_contributions_in_the_last_12_months=过去的一年内有 %s 次贡献
+contributions_zero=没有贡献
+less=较少
+more=较多
 contributions_format = {year}{month}{day} 当日有 {contributions}
 contributions_few = 贡献
 contributions_one = 贡献
@@ -199,6 +199,12 @@ buttons.enable_monospace_font=启用等宽字体
 buttons.disable_monospace_font=禁用等宽字体
 buttons.unindent.tooltip = 解除一级嵌套条目
 buttons.indent.tooltip = 解除一级嵌套条目
+table_modal.header = 添加表格
+table_modal.placeholder.header = 标题
+table_modal.label.columns = 列数
+table_modal.label.rows = 行数
+buttons.new_table.tooltip = 添加表格
+table_modal.placeholder.content = 内容
 
 [filter]
 string.asc=A - Z
@@ -477,6 +483,7 @@ sign_in_openid = 继续使用 OpenID
 sign_up_button = 立即注册。
 hint_register = 需要账号？立即注册。
 unauthorized_credentials = 凭据不正确或已过期。请重试您的命令，或查看 %s 以获取更多信息
+use_onetime_code = 使用一次性代码
 
 [mail]
 view_it_on=在 %s 上查看
@@ -739,7 +746,7 @@ uid=UID
 webauthn=两步验证（安全密钥）
 
 public_profile=公开信息
-biography_placeholder=告诉我们一点您自己！ (您可以使用Markdown)
+biography_placeholder=向他人介绍一下你自己！（支持 Markdown）
 location_placeholder=与他人分享你的大概位置
 profile_desc=控制您的个人资料对其他用户的显示方式。您的主要电子邮件地址将用于通知、密码恢复和基于网页界面的 Git 操作。
 password_username_disabled=不允许非本地用户更改他们的用户名。更多详情请联系您的系统管理员。
@@ -784,7 +791,7 @@ keep_activity_private_popup=您的活动将只对您自己和本实例的管理
 
 lookup_avatar_by_mail=使用电子邮箱地址查找头像
 federated_avatar_lookup=查找联合头像
-enable_custom_avatar=启动自定义头像
+enable_custom_avatar=使用自定义头像
 choose_new_avatar=选择新的头像
 update_avatar=更新头像
 delete_current_avatar=删除当前头像
@@ -1628,7 +1635,7 @@ issues.author=作者
 issues.author_helper=此用户是作者。
 issues.role.owner=管理员
 issues.role.owner_helper=该用户是该仓库的所有者。
-issues.role.member=普通成员
+issues.role.member=成员
 issues.role.member_helper=该用户是拥有该仓库的组织成员。
 issues.role.collaborator=协作者
 issues.role.collaborator_helper=该用户已被邀请在仓库上进行协作。
@@ -2579,10 +2586,10 @@ diff.too_many_files=某些文件未显示，因为此 diff 中更改的文件太
 diff.show_more=显示更多
 diff.load=加载差异
 diff.generated=自动生成的
-diff.vendored=vendored
+diff.vendored=Vendored
 diff.comment.add_line_comment=添加行内评论
 diff.comment.placeholder=留下评论
-diff.comment.markdown_info=支持使用Markdown格式。
+diff.comment.markdown_info=支持使用 Markdown 格式。
 diff.comment.add_single_comment=添加单条评论
 diff.comment.add_review_comment=添加评论
 diff.comment.start_review=开始评审
@@ -2921,7 +2928,7 @@ members.private=隐藏
 members.private_helper=显示
 members.member_role=成员角色：
 members.owner=管理员
-members.member=普通成员
+members.member=成员
 members.remove=移除成员
 members.remove.detail=从 %[2]s 中移除 %[1]s 吗？
 members.leave=离开组织
@@ -3840,7 +3847,7 @@ status.cancelled=已取消
 status.skipped=已忽略
 status.blocked=阻塞中
 
-runners=Runners
+runners=运行器
 runners.runner_manage_panel=管理 Runners
 runners.new=创建 Runner
 runners.new_notice=如何启动一个运行器
@@ -3851,7 +3858,7 @@ runners.owner_type=类型
 runners.description=组织描述
 runners.labels=标签
 runners.last_online=上次在线时间
-runners.runner_title=Runner
+runners.runner_title=运行器
 runners.task_list=最近在此runner上的任务
 runners.task_list.no_tasks=还没有任务。
 runners.task_list.run=执行

From 7da6778ce17bc2cceeabf3aed5e7714774163647 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Thu, 7 Nov 2024 07:52:50 +0000
Subject: [PATCH 328/443] Update dependency eslint-plugin-playwright to v2.0.1
 (forgejo) (#5837) Co-authored-by: Renovate Bot
  Co-committed-by: Renovate Bot
 

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 561e4acf9e..2c5cc23f27 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -77,7 +77,7 @@
         "eslint-plugin-import-x": "4.4.0",
         "eslint-plugin-no-jquery": "3.0.2",
         "eslint-plugin-no-use-extend-native": "0.7.2",
-        "eslint-plugin-playwright": "2.0.0",
+        "eslint-plugin-playwright": "2.0.1",
         "eslint-plugin-regexp": "2.6.0",
         "eslint-plugin-sonarjs": "2.0.4",
         "eslint-plugin-unicorn": "56.0.0",
@@ -8558,9 +8558,9 @@
       }
     },
     "node_modules/eslint-plugin-playwright": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-2.0.0.tgz",
-      "integrity": "sha512-nPa44nSp48mp/U+GSneabrhlyIyGvrcv+Z14u6sgno+jX8N0bH+ooSLEC1L6dvMDSHs7tj+kMIbls3l8gCJJSg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-2.0.1.tgz",
+      "integrity": "sha512-f4a73xgCOK5Ug/5dtC82BVvND62lLqlMqgGkZn42teyvk6ccSyybHZXRHkpE7vKZSCjV57bnbR+3ucwItOhXlA==",
       "dev": true,
       "license": "MIT",
       "workspaces": [
diff --git a/package.json b/package.json
index 290db61201..82050bbd84 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "eslint-plugin-import-x": "4.4.0",
     "eslint-plugin-no-jquery": "3.0.2",
     "eslint-plugin-no-use-extend-native": "0.7.2",
-    "eslint-plugin-playwright": "2.0.0",
+    "eslint-plugin-playwright": "2.0.1",
     "eslint-plugin-regexp": "2.6.0",
     "eslint-plugin-sonarjs": "2.0.4",
     "eslint-plugin-unicorn": "56.0.0",

From db899c19d88866df984d27cac70b7d63a9fc5a6c Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Thu, 7 Nov 2024 10:38:01 +0100
Subject: [PATCH 329/443] fix: issue labels are not set after deleting one
 label

Because issue.isLabelsLoaded = false is missing, LoadLabels is a noop
and the issue.Labels is nil.
---
 models/issues/issue_label.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/models/issues/issue_label.go b/models/issues/issue_label.go
index 2f0e2897a9..90e7f9c625 100644
--- a/models/issues/issue_label.go
+++ b/models/issues/issue_label.go
@@ -205,6 +205,7 @@ func DeleteIssueLabel(ctx context.Context, issue *Issue, label *Label, doer *use
 		return err
 	}
 
+	issue.isLabelsLoaded = false
 	issue.Labels = nil
 	return issue.LoadLabels(ctx)
 }

From f06bdb0552e4925742c95006c9ce13bae734f036 Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Thu, 7 Nov 2024 10:39:46 +0100
Subject: [PATCH 330/443] chore(refactor): split ReloadLabels out of LoadLabels
 in issue model

Functions modifying the labels in the database (DeleteIssueLabel,
NewIssueLabels, NewIssueLabel, ReplaceIssueLabels) need to force
reload them. Instead of:

	issue.isLabelsLoaded = false
	issue.Labels = nil
	if err = issue.LoadLabels(ctx); err != nil {
		return err
	}

They can now use:

	if err = issue.ReloadLabels(ctx); err != nil {
		return err
	}
---
 models/issues/issue_label.go      |  32 ++++-----
 models/issues/issue_label_test.go | 108 ++++++++++++++++++++++++++++++
 2 files changed, 124 insertions(+), 16 deletions(-)

diff --git a/models/issues/issue_label.go b/models/issues/issue_label.go
index 90e7f9c625..04e1fa3d7d 100644
--- a/models/issues/issue_label.go
+++ b/models/issues/issue_label.go
@@ -111,9 +111,7 @@ func NewIssueLabel(ctx context.Context, issue *Issue, label *Label, doer *user_m
 		return err
 	}
 
-	issue.isLabelsLoaded = false
-	issue.Labels = nil
-	if err = issue.LoadLabels(ctx); err != nil {
+	if err = issue.ReloadLabels(ctx); err != nil {
 		return err
 	}
 
@@ -161,10 +159,7 @@ func NewIssueLabels(ctx context.Context, issue *Issue, labels []*Label, doer *us
 		return err
 	}
 
-	// reload all labels
-	issue.isLabelsLoaded = false
-	issue.Labels = nil
-	if err = issue.LoadLabels(ctx); err != nil {
+	if err = issue.ReloadLabels(ctx); err != nil {
 		return err
 	}
 
@@ -205,9 +200,7 @@ func DeleteIssueLabel(ctx context.Context, issue *Issue, label *Label, doer *use
 		return err
 	}
 
-	issue.isLabelsLoaded = false
-	issue.Labels = nil
-	return issue.LoadLabels(ctx)
+	return issue.ReloadLabels(ctx)
 }
 
 // DeleteLabelsByRepoID  deletes labels of some repository
@@ -327,14 +320,23 @@ func FixIssueLabelWithOutsideLabels(ctx context.Context) (int64, error) {
 	return res.RowsAffected()
 }
 
-// LoadLabels loads labels
+// LoadLabels only if they are not already set
 func (issue *Issue) LoadLabels(ctx context.Context) (err error) {
-	if !issue.isLabelsLoaded && issue.Labels == nil && issue.ID != 0 {
+	if !issue.isLabelsLoaded && issue.Labels == nil {
+		if err := issue.ReloadLabels(ctx); err != nil {
+			return err
+		}
+		issue.isLabelsLoaded = true
+	}
+	return nil
+}
+
+func (issue *Issue) ReloadLabels(ctx context.Context) (err error) {
+	if issue.ID != 0 {
 		issue.Labels, err = GetLabelsByIssueID(ctx, issue.ID)
 		if err != nil {
 			return fmt.Errorf("getLabelsByIssueID [%d]: %w", issue.ID, err)
 		}
-		issue.isLabelsLoaded = true
 	}
 	return nil
 }
@@ -497,9 +499,7 @@ func ReplaceIssueLabels(ctx context.Context, issue *Issue, labels []*Label, doer
 		}
 	}
 
-	issue.isLabelsLoaded = false
-	issue.Labels = nil
-	if err = issue.LoadLabels(ctx); err != nil {
+	if err = issue.ReloadLabels(ctx); err != nil {
 		return err
 	}
 
diff --git a/models/issues/issue_label_test.go b/models/issues/issue_label_test.go
index b6b39d683d..67f4874c8f 100644
--- a/models/issues/issue_label_test.go
+++ b/models/issues/issue_label_test.go
@@ -15,6 +15,114 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func TestIssueNewIssueLabels(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
+	label1 := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 1})
+	label2 := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 4})
+	doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+
+	label3 := &issues_model.Label{RepoID: 1, Name: "label3", Color: "#123"}
+	require.NoError(t, issues_model.NewLabel(db.DefaultContext, label3))
+
+	// label1 is already set, do nothing
+	// label3 is new, add it
+	require.NoError(t, issues_model.NewIssueLabels(db.DefaultContext, issue, []*issues_model.Label{label1, label3}, doer))
+
+	assert.Len(t, issue.Labels, 3)
+	// check that the pre-existing label1 is still present
+	assert.Equal(t, label1.ID, issue.Labels[0].ID)
+	// check that new label3 was added
+	assert.Equal(t, label3.ID, issue.Labels[1].ID)
+	// check that pre-existing label2 was not removed
+	assert.Equal(t, label2.ID, issue.Labels[2].ID)
+}
+
+func TestIssueNewIssueLabel(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 3})
+	doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+
+	label := &issues_model.Label{RepoID: 1, Name: "label3", Color: "#123"}
+	require.NoError(t, issues_model.NewLabel(db.DefaultContext, label))
+
+	require.NoError(t, issues_model.NewIssueLabel(db.DefaultContext, issue, label, doer))
+
+	assert.Len(t, issue.Labels, 1)
+	assert.Equal(t, label.ID, issue.Labels[0].ID)
+}
+
+func TestIssueReplaceIssueLabels(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
+	label1 := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 1})
+	label2 := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 4})
+	doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+
+	label3 := &issues_model.Label{RepoID: 1, Name: "label3", Color: "#123"}
+	require.NoError(t, issues_model.NewLabel(db.DefaultContext, label3))
+
+	issue.LoadLabels(db.DefaultContext)
+	assert.Len(t, issue.Labels, 2)
+	assert.Equal(t, label1.ID, issue.Labels[0].ID)
+	assert.Equal(t, label2.ID, issue.Labels[1].ID)
+
+	// label1 is already set, do nothing
+	// label3 is new, add it
+	// label2 is not in the list but already set, remove it
+	require.NoError(t, issues_model.ReplaceIssueLabels(db.DefaultContext, issue, []*issues_model.Label{label1, label3}, doer))
+
+	assert.Len(t, issue.Labels, 2)
+	assert.Equal(t, label1.ID, issue.Labels[0].ID)
+	assert.Equal(t, label3.ID, issue.Labels[1].ID)
+}
+
+func TestIssueDeleteIssueLabel(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
+	label1 := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 1})
+	label2 := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 4})
+	doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+
+	issue.LoadLabels(db.DefaultContext)
+	assert.Len(t, issue.Labels, 2)
+	assert.Equal(t, label1.ID, issue.Labels[0].ID)
+	assert.Equal(t, label2.ID, issue.Labels[1].ID)
+
+	require.NoError(t, issues_model.DeleteIssueLabel(db.DefaultContext, issue, label2, doer))
+
+	assert.Len(t, issue.Labels, 1)
+	assert.Equal(t, label1.ID, issue.Labels[0].ID)
+}
+
+func TestIssueLoadLabels(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
+	label1 := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 1})
+	label2 := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 4})
+
+	assert.Empty(t, issue.Labels)
+	issue.LoadLabels(db.DefaultContext)
+	assert.Len(t, issue.Labels, 2)
+	assert.Equal(t, label1.ID, issue.Labels[0].ID)
+	assert.Equal(t, label2.ID, issue.Labels[1].ID)
+
+	unittest.AssertSuccessfulDelete(t, &issues_model.IssueLabel{IssueID: issue.ID, LabelID: label2.ID})
+
+	// the database change is not noticed because the labels are cached
+	issue.LoadLabels(db.DefaultContext)
+	assert.Len(t, issue.Labels, 2)
+
+	issue.ReloadLabels(db.DefaultContext)
+	assert.Len(t, issue.Labels, 1)
+	assert.Equal(t, label1.ID, issue.Labels[0].ID)
+}
+
 func TestNewIssueLabelsScope(t *testing.T) {
 	require.NoError(t, unittest.PrepareTestDatabase())
 

From 3c4153b19584b50af10ede28577f717462484cdf Mon Sep 17 00:00:00 2001
From: wxiaoguang 
Date: Fri, 1 Nov 2024 23:18:29 +0800
Subject: [PATCH 331/443] [PORT] Refactor tests to prevent from unnecessary
 preparations (gitea#32398)

Some preparations are only used by a few tests, so to make the tests fast, they should only be prepared when they are used.

By the way, this PR splits PrepareTestEnv into small functions to make it simple.

---

Conflict resolution: Mostly magical and just re-pasting the code into
the right places.
Done differently: use `require.NoError` instead of `assert.NoError`.

(cherry picked from commit ec2d1593c269e06655525deb96f74b8094221b6f)
---
 .deadcode-out                                 |  3 +
 modules/testlogger/testlogger.go              |  6 +-
 modules/util/util.go                          | 19 +++++
 modules/util/util_test.go                     | 13 ++++
 .../integration/api_actions_artifact_test.go  | 25 ++++---
 .../api_actions_artifact_v4_test.go           | 14 ++--
 tests/test_utils.go                           | 75 +++++++++----------
 7 files changed, 96 insertions(+), 59 deletions(-)

diff --git a/.deadcode-out b/.deadcode-out
index 8c3e3090d2..c82a229317 100644
--- a/.deadcode-out
+++ b/.deadcode-out
@@ -247,6 +247,9 @@ code.gitea.io/gitea/modules/translation
 	MockLocale.TrSize
 	MockLocale.PrettyNumber
 
+code.gitea.io/gitea/modules/util
+	OptionalArg
+
 code.gitea.io/gitea/modules/util/filebuffer
 	CreateFromReader
 
diff --git a/modules/testlogger/testlogger.go b/modules/testlogger/testlogger.go
index 7897cc6b07..b83cb323c9 100644
--- a/modules/testlogger/testlogger.go
+++ b/modules/testlogger/testlogger.go
@@ -18,6 +18,7 @@ import (
 
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/queue"
+	"code.gitea.io/gitea/modules/util"
 )
 
 var (
@@ -445,10 +446,7 @@ func (w *testLoggerWriterCloser) Reset() error {
 func PrintCurrentTest(t testing.TB, skip ...int) func() {
 	t.Helper()
 	start := time.Now()
-	actualSkip := 1
-	if len(skip) > 0 {
-		actualSkip = skip[0] + 1
-	}
+	actualSkip := util.OptionalArg(skip) + 1
 	_, filename, line, _ := runtime.Caller(actualSkip)
 
 	if log.CanColorStdout {
diff --git a/modules/util/util.go b/modules/util/util.go
index dcd7cf4f29..88ac07567b 100644
--- a/modules/util/util.go
+++ b/modules/util/util.go
@@ -234,6 +234,25 @@ func IfZero[T comparable](v, def T) T {
 	return v
 }
 
+// OptionalArg helps the "optional argument" in Golang:
+//
+//	func foo(optArg ...int) { return OptionalArg(optArg) }
+//		calling `foo()` gets zero value 0, calling `foo(100)` gets 100
+//	func bar(optArg ...int) { return OptionalArg(optArg, 42) }
+//		calling `bar()` gets default value 42, calling `bar(100)` gets 100
+//
+// Passing more than 1 item to `optArg` or `defaultValue` is undefined behavior.
+// At the moment only the first item is used.
+func OptionalArg[T any](optArg []T, defaultValue ...T) (ret T) {
+	if len(optArg) >= 1 {
+		return optArg[0]
+	}
+	if len(defaultValue) >= 1 {
+		return defaultValue[0]
+	}
+	return ret
+}
+
 func ReserveLineBreakForTextarea(input string) string {
 	// Since the content is from a form which is a textarea, the line endings are \r\n.
 	// It's a standard behavior of HTML.
diff --git a/modules/util/util_test.go b/modules/util/util_test.go
index 549b53f5a7..7344c8fbb7 100644
--- a/modules/util/util_test.go
+++ b/modules/util/util_test.go
@@ -275,3 +275,16 @@ func TestGeneratingEd25519Keypair(t *testing.T) {
 	assert.EqualValues(t, testPublicKey, string(publicKey))
 	assert.EqualValues(t, testPrivateKey, string(privateKey))
 }
+
+func TestOptionalArg(t *testing.T) {
+	foo := func(other any, optArg ...int) int {
+		return util.OptionalArg(optArg)
+	}
+	bar := func(other any, optArg ...int) int {
+		return util.OptionalArg(optArg, 42)
+	}
+	assert.Equal(t, 0, foo(nil))
+	assert.Equal(t, 100, foo(nil, 100))
+	assert.Equal(t, 42, bar(nil))
+	assert.Equal(t, 100, bar(nil, 100))
+}
diff --git a/tests/integration/api_actions_artifact_test.go b/tests/integration/api_actions_artifact_test.go
index 2e35d4390a..5b300b96b1 100644
--- a/tests/integration/api_actions_artifact_test.go
+++ b/tests/integration/api_actions_artifact_test.go
@@ -23,8 +23,15 @@ type getUploadArtifactRequest struct {
 	RetentionDays int64
 }
 
+func prepareTestEnvActionsArtifacts(t *testing.T) func() {
+	t.Helper()
+	f := tests.PrepareTestEnv(t, 1)
+	tests.PrepareArtifactsStorage(t)
+	return f
+}
+
 func TestActionsArtifactUploadSingleFile(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
+	defer prepareTestEnvActionsArtifacts(t)()
 
 	// acquire artifact upload url
 	req := NewRequestWithJSON(t, "POST", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts", getUploadArtifactRequest{
@@ -58,7 +65,7 @@ func TestActionsArtifactUploadSingleFile(t *testing.T) {
 }
 
 func TestActionsArtifactUploadInvalidHash(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
+	defer prepareTestEnvActionsArtifacts(t)()
 
 	// artifact id 54321 not exist
 	url := "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts/8e5b948a454515dbabfc7eb718ddddddd/upload?itemPath=artifact/abc.txt"
@@ -73,7 +80,7 @@ func TestActionsArtifactUploadInvalidHash(t *testing.T) {
 }
 
 func TestActionsArtifactConfirmUploadWithoutName(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
+	defer prepareTestEnvActionsArtifacts(t)()
 
 	req := NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts").
 		AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a")
@@ -82,7 +89,7 @@ func TestActionsArtifactConfirmUploadWithoutName(t *testing.T) {
 }
 
 func TestActionsArtifactUploadWithoutToken(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
+	defer prepareTestEnvActionsArtifacts(t)()
 
 	req := NewRequestWithJSON(t, "POST", "/api/actions_pipeline/_apis/pipelines/workflows/1/artifacts", nil)
 	MakeRequest(t, req, http.StatusUnauthorized)
@@ -108,7 +115,7 @@ type (
 )
 
 func TestActionsArtifactDownload(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
+	defer prepareTestEnvActionsArtifacts(t)()
 
 	req := NewRequest(t, "GET", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts").
 		AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a")
@@ -152,7 +159,7 @@ func TestActionsArtifactDownload(t *testing.T) {
 }
 
 func TestActionsArtifactUploadMultipleFile(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
+	defer prepareTestEnvActionsArtifacts(t)()
 
 	const testArtifactName = "multi-files"
 
@@ -208,7 +215,7 @@ func TestActionsArtifactUploadMultipleFile(t *testing.T) {
 }
 
 func TestActionsArtifactDownloadMultiFiles(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
+	defer prepareTestEnvActionsArtifacts(t)()
 
 	const testArtifactName = "multi-file-download"
 
@@ -263,7 +270,7 @@ func TestActionsArtifactDownloadMultiFiles(t *testing.T) {
 }
 
 func TestActionsArtifactUploadWithRetentionDays(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
+	defer prepareTestEnvActionsArtifacts(t)()
 
 	// acquire artifact upload url
 	req := NewRequestWithJSON(t, "POST", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts", getUploadArtifactRequest{
@@ -299,7 +306,7 @@ func TestActionsArtifactUploadWithRetentionDays(t *testing.T) {
 }
 
 func TestActionsArtifactOverwrite(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
+	defer prepareTestEnvActionsArtifacts(t)()
 
 	{
 		// download old artifact uploaded by tests above, it should 1024 A
diff --git a/tests/integration/api_actions_artifact_v4_test.go b/tests/integration/api_actions_artifact_v4_test.go
index bf28f23536..43df1aeee0 100644
--- a/tests/integration/api_actions_artifact_v4_test.go
+++ b/tests/integration/api_actions_artifact_v4_test.go
@@ -80,13 +80,13 @@ func uploadArtifact(t *testing.T, body string) string {
 }
 
 func TestActionsArtifactV4UploadSingleFile(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
+	defer prepareTestEnvActionsArtifacts(t)()
 	body := strings.Repeat("A", 1024)
 	uploadArtifact(t, body)
 }
 
 func TestActionsArtifactV4UploadSingleFileWrongChecksum(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
+	defer prepareTestEnvActionsArtifacts(t)()
 
 	token, err := actions_service.CreateAuthorizationToken(48, 792, 193)
 	require.NoError(t, err)
@@ -130,7 +130,7 @@ func TestActionsArtifactV4UploadSingleFileWrongChecksum(t *testing.T) {
 }
 
 func TestActionsArtifactV4UploadSingleFileWithRetentionDays(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
+	defer prepareTestEnvActionsArtifacts(t)()
 
 	token, err := actions_service.CreateAuthorizationToken(48, 792, 193)
 	require.NoError(t, err)
@@ -178,7 +178,7 @@ func TestActionsArtifactV4UploadSingleFileWithRetentionDays(t *testing.T) {
 }
 
 func TestActionsArtifactV4UploadSingleFileWithPotentialHarmfulBlockID(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
+	defer prepareTestEnvActionsArtifacts(t)()
 
 	token, err := actions_service.CreateAuthorizationToken(48, 792, 193)
 	require.NoError(t, err)
@@ -241,7 +241,7 @@ func TestActionsArtifactV4UploadSingleFileWithPotentialHarmfulBlockID(t *testing
 }
 
 func TestActionsArtifactV4UploadSingleFileWithChunksOutOfOrder(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
+	defer prepareTestEnvActionsArtifacts(t)()
 
 	token, err := actions_service.CreateAuthorizationToken(48, 792, 193)
 	require.NoError(t, err)
@@ -306,7 +306,7 @@ func TestActionsArtifactV4UploadSingleFileWithChunksOutOfOrder(t *testing.T) {
 }
 
 func TestActionsArtifactV4DownloadSingle(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
+	defer prepareTestEnvActionsArtifacts(t)()
 
 	token, err := actions_service.CreateAuthorizationToken(48, 792, 193)
 	require.NoError(t, err)
@@ -386,7 +386,7 @@ func TestActionsArtifactV4DownloadRange(t *testing.T) {
 }
 
 func TestActionsArtifactV4Delete(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
+	defer prepareTestEnvActionsArtifacts(t)()
 
 	token, err := actions_service.CreateAuthorizationToken(48, 792, 193)
 	require.NoError(t, err)
diff --git a/tests/test_utils.go b/tests/test_utils.go
index 89016f9f64..d6516dd99a 100644
--- a/tests/test_utils.go
+++ b/tests/test_utils.go
@@ -224,37 +224,7 @@ func cancelProcesses(t testing.TB, delay time.Duration) {
 	t.Logf("PrepareTestEnv: all processes cancelled within %s", time.Since(start))
 }
 
-func PrepareArtifactsStorage(t testing.TB) {
-	// prepare actions artifacts directory and files
-	require.NoError(t, storage.Clean(storage.ActionsArtifacts))
-
-	s, err := storage.NewStorage(setting.LocalStorageType, &setting.Storage{
-		Path: filepath.Join(filepath.Dir(setting.AppPath), "tests", "testdata", "data", "artifacts"),
-	})
-	require.NoError(t, err)
-	require.NoError(t, s.IterateObjects("", func(p string, obj storage.Object) error {
-		_, err = storage.Copy(storage.ActionsArtifacts, p, s, p)
-		return err
-	}))
-}
-
-func PrepareTestEnv(t testing.TB, skip ...int) func() {
-	t.Helper()
-	ourSkip := 1
-	if len(skip) > 0 {
-		ourSkip += skip[0]
-	}
-	deferFn := PrintCurrentTest(t, ourSkip)
-
-	// kill all background processes to prevent them from interfering with the fixture loading
-	// see https://codeberg.org/forgejo/forgejo/issues/2962
-	cancelProcesses(t, 30*time.Second)
-	t.Cleanup(func() { cancelProcesses(t, 0) }) // cancel remaining processes in a non-blocking way
-
-	// load database fixtures
-	require.NoError(t, unittest.LoadFixtures())
-
-	// load git repo fixtures
+func PrepareGitRepoDirectory(t testing.TB) {
 	require.NoError(t, util.RemoveAll(setting.RepoRootPath))
 	require.NoError(t, unittest.CopyDir(path.Join(filepath.Dir(setting.AppPath), "tests/gitea-repositories-meta"), setting.RepoRootPath))
 	ownerDirs, err := os.ReadDir(setting.RepoRootPath)
@@ -274,14 +244,28 @@ func PrepareTestEnv(t testing.TB, skip ...int) func() {
 			_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "objects", "info"), 0o755)
 			_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "refs", "heads"), 0o755)
 			_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "refs", "tag"), 0o755)
+			_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "refs", "pull"), 0o755)
 		}
 	}
+}
 
-	// Initialize actions artifact data
-	PrepareArtifactsStorage(t)
+func PrepareArtifactsStorage(t testing.TB) {
+	// prepare actions artifacts directory and files
+	require.NoError(t, storage.Clean(storage.ActionsArtifacts))
 
+	s, err := storage.NewStorage(setting.LocalStorageType, &setting.Storage{
+		Path: filepath.Join(filepath.Dir(setting.AppPath), "tests", "testdata", "data", "artifacts"),
+	})
+	require.NoError(t, err)
+	require.NoError(t, s.IterateObjects("", func(p string, obj storage.Object) error {
+		_, err = storage.Copy(storage.ActionsArtifacts, p, s, p)
+		return err
+	}))
+}
+
+func PrepareLFSStorage(t testing.TB) {
 	// load LFS object fixtures
-	// (LFS storage can be on any of several backends, including remote servers, so we init it with the storage API)
+	// (LFS storage can be on any of several backends, including remote servers, so init it with the storage API)
 	lfsFixtures, err := storage.NewStorage(setting.LocalStorageType, &setting.Storage{
 		Path: filepath.Join(filepath.Dir(setting.AppPath), "tests/gitea-lfs-meta"),
 	})
@@ -291,7 +275,9 @@ func PrepareTestEnv(t testing.TB, skip ...int) func() {
 		_, err := storage.Copy(storage.LFS, path, lfsFixtures, path)
 		return err
 	}))
+}
 
+func PrepareCleanPackageData(t testing.TB) {
 	// clear all package data
 	require.NoError(t, db.TruncateBeans(db.DefaultContext,
 		&packages_model.Package{},
@@ -303,17 +289,28 @@ func PrepareTestEnv(t testing.TB, skip ...int) func() {
 		&packages_model.PackageCleanupRule{},
 	))
 	require.NoError(t, storage.Clean(storage.Packages))
+}
 
+func PrepareTestEnv(t testing.TB, skip ...int) func() {
+	t.Helper()
+	deferFn := PrintCurrentTest(t, util.OptionalArg(skip)+1)
+
+	cancelProcesses(t, 30*time.Second)
+	t.Cleanup(func() { cancelProcesses(t, 0) }) // cancel remaining processes in a non-blocking way
+
+	// load database fixtures
+	require.NoError(t, unittest.LoadFixtures())
+
+	// do not add more Prepare* functions here, only call necessary ones in the related test functions
+	PrepareGitRepoDirectory(t)
+	PrepareLFSStorage(t)
+	PrepareCleanPackageData(t)
 	return deferFn
 }
 
 func PrintCurrentTest(t testing.TB, skip ...int) func() {
 	t.Helper()
-	actualSkip := 1
-	if len(skip) > 0 {
-		actualSkip = skip[0] + 1
-	}
-	return testlogger.PrintCurrentTest(t, actualSkip)
+	return testlogger.PrintCurrentTest(t, util.OptionalArg(skip)+1)
 }
 
 // Printf takes a format and args and prints the string to os.Stdout

From 3a3416c0699db0e5ffc14cbdd94f081d2c1e36c0 Mon Sep 17 00:00:00 2001
From: Anbraten 
Date: Fri, 8 Nov 2024 09:55:54 +0100
Subject: [PATCH 332/443] Migrate playwright to typescript

---
 playwright.config.ts                             |  6 +++---
 tests/e2e/README.md                              |  8 ++++----
 .../{actions.test.e2e.js => actions.test.e2e.ts} |  4 +---
 tests/e2e/changes.go                             |  2 +-
 ...st.e2e.js => dashboard-ci-status.test.e2e.ts} |  4 +---
 tests/e2e/e2e_test.go                            |  2 +-
 .../{example.test.e2e.js => example.test.e2e.ts} |  4 +---
 .../{explore.test.e2e.js => explore.test.e2e.ts} |  3 +--
 ...ent.test.e2e.js => issue-comment.test.e2e.ts} |  4 +---
 ...bar.test.e2e.js => issue-sidebar.test.e2e.ts} |  4 +---
 ...r.test.e2e.js => markdown-editor.test.e2e.ts} |  4 +---
 .../{markup.test.e2e.js => markup.test.e2e.ts}   |  4 +---
 ...ings.test.e2e.js => org-settings.test.e2e.ts} |  6 ++----
 ...s.test.e2e.js => profile_actions.test.e2e.ts} |  4 +---
 ...est.e2e.js => reaction-selectors.test.e2e.ts} |  4 +---
 .../{release.test.e2e.js => release.test.e2e.ts} |  6 ++----
 ...po-code.test.e2e.js => repo-code.test.e2e.ts} |  4 +---
 ....test.e2e.js => repo-commitgraph.test.e2e.ts} |  4 +---
 ...rate.test.e2e.js => repo-migrate.test.e2e.ts} |  4 +---
 ...ngs.test.e2e.js => repo-settings.test.e2e.ts} |  6 ++----
 ...po-wiki.test.e2e.js => repo-wiki.test.e2e.ts} |  4 +---
 ....e2e.js => right-settings-button.test.e2e.ts} |  4 +---
 tests/e2e/shared/{forms.js => forms.ts}          |  5 ++---
 tests/e2e/{utils_e2e.js => utils_e2e.ts}         | 16 ++++++++--------
 ...webauthn.test.e2e.js => webauthn.test.e2e.ts} |  5 ++---
 25 files changed, 42 insertions(+), 79 deletions(-)
 rename tests/e2e/{actions.test.e2e.js => actions.test.e2e.ts} (99%)
 rename tests/e2e/{dashboard-ci-status.test.e2e.js => dashboard-ci-status.test.e2e.ts} (97%)
 rename tests/e2e/{example.test.e2e.js => example.test.e2e.ts} (96%)
 rename tests/e2e/{explore.test.e2e.js => explore.test.e2e.ts} (96%)
 rename tests/e2e/{issue-comment.test.e2e.js => issue-comment.test.e2e.ts} (99%)
 rename tests/e2e/{issue-sidebar.test.e2e.js => issue-sidebar.test.e2e.ts} (99%)
 rename tests/e2e/{markdown-editor.test.e2e.js => markdown-editor.test.e2e.ts} (99%)
 rename tests/e2e/{markup.test.e2e.js => markup.test.e2e.ts} (92%)
 rename tests/e2e/{org-settings.test.e2e.js => org-settings.test.e2e.ts} (89%)
 rename tests/e2e/{profile_actions.test.e2e.js => profile_actions.test.e2e.ts} (98%)
 rename tests/e2e/{reaction-selectors.test.e2e.js => reaction-selectors.test.e2e.ts} (99%)
 rename tests/e2e/{release.test.e2e.js => release.test.e2e.ts} (97%)
 rename tests/e2e/{repo-code.test.e2e.js => repo-code.test.e2e.ts} (99%)
 rename tests/e2e/{repo-commitgraph.test.e2e.js => repo-commitgraph.test.e2e.ts} (98%)
 rename tests/e2e/{repo-migrate.test.e2e.js => repo-migrate.test.e2e.ts} (98%)
 rename tests/e2e/{repo-settings.test.e2e.js => repo-settings.test.e2e.ts} (95%)
 rename tests/e2e/{repo-wiki.test.e2e.js => repo-wiki.test.e2e.ts} (94%)
 rename tests/e2e/{right-settings-button.test.e2e.js => right-settings-button.test.e2e.ts} (99%)
 rename tests/e2e/shared/{forms.js => forms.ts} (92%)
 rename tests/e2e/{utils_e2e.js => utils_e2e.ts} (80%)
 rename tests/e2e/{webauthn.test.e2e.js => webauthn.test.e2e.ts} (94%)

diff --git a/playwright.config.ts b/playwright.config.ts
index 194f7f7d36..625dc3bc69 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -1,4 +1,4 @@
-import {devices} from '@playwright/test';
+import {devices, type PlaywrightTestConfig} from '@playwright/test';
 
 const BASE_URL = process.env.GITEA_URL?.replace?.(/\/$/g, '') || 'http://localhost:3000';
 
@@ -8,7 +8,7 @@ const BASE_URL = process.env.GITEA_URL?.replace?.(/\/$/g, '') || 'http://localho
  */
 export default {
   testDir: './tests/e2e/',
-  testMatch: /.*\.test\.e2e\.js/, // Match any .test.e2e.js files
+  testMatch: /.*\.test\.e2e\.ts/, // Match any .test.e2e.js files
 
   // you can adjust this value locally to match your machine's power,
   // or pass `--workers x` to playwright
@@ -99,4 +99,4 @@ export default {
   outputDir: 'tests/e2e/test-artifacts/',
   /* Folder for test artifacts such as screenshots, videos, traces, etc. */
   snapshotDir: 'tests/e2e/test-snapshots/',
-};
+} satisfies PlaywrightTestConfig;
diff --git a/tests/e2e/README.md b/tests/e2e/README.md
index 36b9a187c3..d20f2cf633 100644
--- a/tests/e2e/README.md
+++ b/tests/e2e/README.md
@@ -77,7 +77,7 @@ and playwright to perform tests on it.
 > (e.g. when only creating new content),
 > or that they restore the initial state for the next browser run.
 
-#### With the playwright UI: 
+#### With the playwright UI:
 
 Playwright ships with an integrated UI mode which allows you to
 run individual tests and to debug them by seeing detailed traces of what playwright does.
@@ -90,7 +90,7 @@ npx playwright test --ui
 #### Running individual tests
 
 ```
-npx playwright test actions.test.e2e.js:9
+npx playwright test actions.test.e2e.ts:9
 ```
 
 First, specify the complete test filename,
@@ -145,7 +145,7 @@ TEST_PGSQL_HOST=localhost:5432 TEST_PGSQL_DBNAME=test TEST_PGSQL_USERNAME=postgr
 
 ### Running individual tests
 
-Example command to run `example.test.e2e.js` test file:
+Example command to run `example.test.e2e.ts` test file:
 
 > **Note**
 > Unlike integration tests, this filtering is at the file level, not function
@@ -212,7 +212,7 @@ Feel free to improve the logic used there if you need more advanced functionalit
 If you can, perform automated accessibility testing using
 [AxeCore](https://github.com/dequelabs/axe-core-npm/blob/develop/packages/playwright/README.md).
 
-Take a look at `shared/forms.js` and some other places for inspiration.
+Take a look at `shared/forms.ts` and some other places for inspiration.
 
 ### List related files coverage
 
diff --git a/tests/e2e/actions.test.e2e.js b/tests/e2e/actions.test.e2e.ts
similarity index 99%
rename from tests/e2e/actions.test.e2e.js
rename to tests/e2e/actions.test.e2e.ts
index 01ddb7b971..5e3ae7e3ff 100644
--- a/tests/e2e/actions.test.e2e.js
+++ b/tests/e2e/actions.test.e2e.ts
@@ -1,5 +1,3 @@
-// @ts-check
-
 // @watch start
 // templates/repo/actions/**
 // web_src/css/actions.css
@@ -12,7 +10,7 @@
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test, login_user, load_logged_in_context} from './utils_e2e.js';
+import {test, login_user, load_logged_in_context} from './utils_e2e.ts';
 
 test.beforeAll(async ({browser}, workerInfo) => {
   await login_user(browser, workerInfo, 'user2');
diff --git a/tests/e2e/changes.go b/tests/e2e/changes.go
index acc1a796a4..1a314727d6 100644
--- a/tests/e2e/changes.go
+++ b/tests/e2e/changes.go
@@ -29,7 +29,7 @@ func initChangedFiles() {
 	globalPatterns := []string{
 		// meta and config
 		"Makefile",
-		"playwright.config.js",
+		"playwright.config.ts",
 		".forgejo/workflows/testing.yml",
 		"tests/e2e/*.go",
 		"tests/e2e/shared/*",
diff --git a/tests/e2e/dashboard-ci-status.test.e2e.js b/tests/e2e/dashboard-ci-status.test.e2e.ts
similarity index 97%
rename from tests/e2e/dashboard-ci-status.test.e2e.js
rename to tests/e2e/dashboard-ci-status.test.e2e.ts
index 289430055c..a5bdc7ade9 100644
--- a/tests/e2e/dashboard-ci-status.test.e2e.js
+++ b/tests/e2e/dashboard-ci-status.test.e2e.ts
@@ -1,11 +1,9 @@
-// @ts-check
-
 // @watch start
 // web_src/js/components/DashboardRepoList.vue
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test, login_user, load_logged_in_context} from './utils_e2e.js';
+import {test, login_user, load_logged_in_context} from './utils_e2e.ts';
 
 test.beforeAll(async ({browser}, workerInfo) => {
   await login_user(browser, workerInfo, 'user2');
diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
index 3e1bcefd66..b8c89625c0 100644
--- a/tests/e2e/e2e_test.go
+++ b/tests/e2e/e2e_test.go
@@ -79,7 +79,7 @@ func TestMain(m *testing.M) {
 // TestE2e should be the only test e2e necessary. It will collect all "*.test.e2e.js" files in this directory and build a test for each.
 func TestE2e(t *testing.T) {
 	// Find the paths of all e2e test files in test directory.
-	searchGlob := filepath.Join(filepath.Dir(setting.AppPath), "tests", "e2e", "*.test.e2e.js")
+	searchGlob := filepath.Join(filepath.Dir(setting.AppPath), "tests", "e2e", "*.test.e2e.ts")
 	paths, err := filepath.Glob(searchGlob)
 	if err != nil {
 		t.Fatal(err)
diff --git a/tests/e2e/example.test.e2e.js b/tests/e2e/example.test.e2e.ts
similarity index 96%
rename from tests/e2e/example.test.e2e.js
rename to tests/e2e/example.test.e2e.ts
index a413a218c6..90fd9169a4 100644
--- a/tests/e2e/example.test.e2e.js
+++ b/tests/e2e/example.test.e2e.ts
@@ -1,5 +1,3 @@
-// @ts-check
-
 // @watch start
 // templates/user/auth/**
 // web_src/js/features/user-**
@@ -7,7 +5,7 @@
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test, login_user, save_visual} from './utils_e2e.js';
+import {test, login_user, save_visual} from './utils_e2e.ts';
 
 test.beforeAll(async ({browser}, workerInfo) => {
   await login_user(browser, workerInfo, 'user2');
diff --git a/tests/e2e/explore.test.e2e.js b/tests/e2e/explore.test.e2e.ts
similarity index 96%
rename from tests/e2e/explore.test.e2e.js
rename to tests/e2e/explore.test.e2e.ts
index eb0c723f36..44c9b21f58 100644
--- a/tests/e2e/explore.test.e2e.js
+++ b/tests/e2e/explore.test.e2e.ts
@@ -1,4 +1,3 @@
-// @ts-check
 // document is a global in evaluate, so it's safe to ignore here
 // eslint playwright/no-conditional-in-test: 0
 
@@ -8,7 +7,7 @@
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test} from './utils_e2e.js';
+import {test} from './utils_e2e.ts';
 
 test('Explore view taborder', async ({page}) => {
   await page.goto('/explore/repos');
diff --git a/tests/e2e/issue-comment.test.e2e.js b/tests/e2e/issue-comment.test.e2e.ts
similarity index 99%
rename from tests/e2e/issue-comment.test.e2e.js
rename to tests/e2e/issue-comment.test.e2e.ts
index 8a1e48d75f..7b8326b832 100644
--- a/tests/e2e/issue-comment.test.e2e.js
+++ b/tests/e2e/issue-comment.test.e2e.ts
@@ -1,5 +1,3 @@
-// @ts-check
-
 // @watch start
 // web_src/js/features/comp/**
 // web_src/js/features/repo-**
@@ -7,7 +5,7 @@
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test, login_user, login} from './utils_e2e.js';
+import {test, login_user, login} from './utils_e2e.ts';
 
 test.beforeAll(async ({browser}, workerInfo) => {
   await login_user(browser, workerInfo, 'user2');
diff --git a/tests/e2e/issue-sidebar.test.e2e.js b/tests/e2e/issue-sidebar.test.e2e.ts
similarity index 99%
rename from tests/e2e/issue-sidebar.test.e2e.js
rename to tests/e2e/issue-sidebar.test.e2e.ts
index 8b5fa59331..31962bf3b4 100644
--- a/tests/e2e/issue-sidebar.test.e2e.js
+++ b/tests/e2e/issue-sidebar.test.e2e.ts
@@ -1,5 +1,3 @@
-// @ts-check
-
 // @watch start
 // templates/repo/issue/view_content/**
 // web_src/css/repo/issue-**
@@ -7,7 +5,7 @@
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test, login_user, login} from './utils_e2e.js';
+import {test, login_user, login} from './utils_e2e.ts';
 
 test.beforeAll(async ({browser}, workerInfo) => {
   await login_user(browser, workerInfo, 'user2');
diff --git a/tests/e2e/markdown-editor.test.e2e.js b/tests/e2e/markdown-editor.test.e2e.ts
similarity index 99%
rename from tests/e2e/markdown-editor.test.e2e.js
rename to tests/e2e/markdown-editor.test.e2e.ts
index 36b35d7e8e..5db242bb36 100644
--- a/tests/e2e/markdown-editor.test.e2e.js
+++ b/tests/e2e/markdown-editor.test.e2e.ts
@@ -1,5 +1,3 @@
-// @ts-check
-
 // @watch start
 // web_src/js/features/comp/ComboMarkdownEditor.js
 // web_src/css/editor/combomarkdowneditor.css
@@ -7,7 +5,7 @@
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test, load_logged_in_context, login_user} from './utils_e2e.js';
+import {test, load_logged_in_context, login_user} from './utils_e2e.ts';
 
 test.beforeAll(async ({browser}, workerInfo) => {
   await login_user(browser, workerInfo, 'user2');
diff --git a/tests/e2e/markup.test.e2e.js b/tests/e2e/markup.test.e2e.ts
similarity index 92%
rename from tests/e2e/markup.test.e2e.js
rename to tests/e2e/markup.test.e2e.ts
index f7ec31709d..2cf32669e4 100644
--- a/tests/e2e/markup.test.e2e.js
+++ b/tests/e2e/markup.test.e2e.ts
@@ -1,11 +1,9 @@
-// @ts-check
-
 // @watch start
 // web_src/css/markup/**
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test} from './utils_e2e.js';
+import {test} from './utils_e2e.ts';
 
 test('markup with #xyz-mode-only', async ({page}) => {
   const response = await page.goto('/user2/repo1/issues/1');
diff --git a/tests/e2e/org-settings.test.e2e.js b/tests/e2e/org-settings.test.e2e.ts
similarity index 89%
rename from tests/e2e/org-settings.test.e2e.js
rename to tests/e2e/org-settings.test.e2e.ts
index 21f34c123d..b645d94161 100644
--- a/tests/e2e/org-settings.test.e2e.js
+++ b/tests/e2e/org-settings.test.e2e.ts
@@ -1,5 +1,3 @@
-// @ts-check
-
 // @watch start
 // templates/org/team/new.tmpl
 // web_src/css/form.css
@@ -7,8 +5,8 @@
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test, login_user, login} from './utils_e2e.js';
-import {validate_form} from './shared/forms.js';
+import {test, login_user, login} from './utils_e2e.ts';
+import {validate_form} from './shared/forms.ts';
 
 test.beforeAll(async ({browser}, workerInfo) => {
   await login_user(browser, workerInfo, 'user2');
diff --git a/tests/e2e/profile_actions.test.e2e.js b/tests/e2e/profile_actions.test.e2e.ts
similarity index 98%
rename from tests/e2e/profile_actions.test.e2e.js
rename to tests/e2e/profile_actions.test.e2e.ts
index d168037041..efb4dd2f49 100644
--- a/tests/e2e/profile_actions.test.e2e.js
+++ b/tests/e2e/profile_actions.test.e2e.ts
@@ -1,5 +1,3 @@
-// @ts-check
-
 // @watch start
 // routers/web/user/**
 // templates/shared/user/**
@@ -7,7 +5,7 @@
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test, login_user, load_logged_in_context} from './utils_e2e.js';
+import {test, login_user, load_logged_in_context} from './utils_e2e.ts';
 
 test('Follow actions', async ({browser}, workerInfo) => {
   await login_user(browser, workerInfo, 'user2');
diff --git a/tests/e2e/reaction-selectors.test.e2e.js b/tests/e2e/reaction-selectors.test.e2e.ts
similarity index 99%
rename from tests/e2e/reaction-selectors.test.e2e.js
rename to tests/e2e/reaction-selectors.test.e2e.ts
index 184f25fe18..a52b47e036 100644
--- a/tests/e2e/reaction-selectors.test.e2e.js
+++ b/tests/e2e/reaction-selectors.test.e2e.ts
@@ -1,12 +1,10 @@
-// @ts-check
-
 // @watch start
 // web_src/js/features/comp/ReactionSelector.js
 // routers/web/repo/issue.go
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test, login_user, load_logged_in_context} from './utils_e2e.js';
+import {test, login_user, load_logged_in_context} from './utils_e2e.ts';
 
 test.beforeAll(async ({browser}, workerInfo) => {
   await login_user(browser, workerInfo, 'user2');
diff --git a/tests/e2e/release.test.e2e.js b/tests/e2e/release.test.e2e.ts
similarity index 97%
rename from tests/e2e/release.test.e2e.js
rename to tests/e2e/release.test.e2e.ts
index 76c7ac0212..373f23dfa7 100644
--- a/tests/e2e/release.test.e2e.js
+++ b/tests/e2e/release.test.e2e.ts
@@ -1,5 +1,3 @@
-// @ts-check
-
 // @watch start
 // models/repo/attachment.go
 // modules/structs/attachment.go
@@ -11,8 +9,8 @@
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test, login_user, save_visual, load_logged_in_context} from './utils_e2e.js';
-import {validate_form} from './shared/forms.js';
+import {test, login_user, save_visual, load_logged_in_context} from './utils_e2e.ts';
+import {validate_form} from './shared/forms.ts';
 
 test.beforeAll(async ({browser}, workerInfo) => {
   await login_user(browser, workerInfo, 'user2');
diff --git a/tests/e2e/repo-code.test.e2e.js b/tests/e2e/repo-code.test.e2e.ts
similarity index 99%
rename from tests/e2e/repo-code.test.e2e.js
rename to tests/e2e/repo-code.test.e2e.ts
index fdb92762ff..5207a6389c 100644
--- a/tests/e2e/repo-code.test.e2e.js
+++ b/tests/e2e/repo-code.test.e2e.ts
@@ -1,5 +1,3 @@
-// @ts-check
-
 // @watch start
 // web_src/js/features/repo-code.js
 // web_src/css/repo.css
@@ -7,7 +5,7 @@
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test, login_user, load_logged_in_context} from './utils_e2e.js';
+import {test, login_user, load_logged_in_context} from './utils_e2e.ts';
 
 test.beforeAll(async ({browser}, workerInfo) => {
   await login_user(browser, workerInfo, 'user2');
diff --git a/tests/e2e/repo-commitgraph.test.e2e.js b/tests/e2e/repo-commitgraph.test.e2e.ts
similarity index 98%
rename from tests/e2e/repo-commitgraph.test.e2e.js
rename to tests/e2e/repo-commitgraph.test.e2e.ts
index f06c68a55d..2a6fb1e6d7 100644
--- a/tests/e2e/repo-commitgraph.test.e2e.js
+++ b/tests/e2e/repo-commitgraph.test.e2e.ts
@@ -1,5 +1,3 @@
-// @ts-check
-
 // @watch start
 // templates/repo/graph.tmpl
 // web_src/css/features/gitgraph.css
@@ -7,7 +5,7 @@
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test, login_user, load_logged_in_context} from './utils_e2e.js';
+import {test, login_user, load_logged_in_context} from './utils_e2e.ts';
 
 test.beforeAll(async ({browser}, workerInfo) => {
   await login_user(browser, workerInfo, 'user2');
diff --git a/tests/e2e/repo-migrate.test.e2e.js b/tests/e2e/repo-migrate.test.e2e.ts
similarity index 98%
rename from tests/e2e/repo-migrate.test.e2e.js
rename to tests/e2e/repo-migrate.test.e2e.ts
index 2ad4400340..c4d1604a6f 100644
--- a/tests/e2e/repo-migrate.test.e2e.js
+++ b/tests/e2e/repo-migrate.test.e2e.ts
@@ -1,11 +1,9 @@
-// @ts-check
-
 // @watch start
 // web_src/js/features/repo-migrate.js
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test, login_user, load_logged_in_context} from './utils_e2e.js';
+import {test, login_user, load_logged_in_context} from './utils_e2e.ts';
 
 test.beforeAll(({browser}, workerInfo) => login_user(browser, workerInfo, 'user2'));
 
diff --git a/tests/e2e/repo-settings.test.e2e.js b/tests/e2e/repo-settings.test.e2e.ts
similarity index 95%
rename from tests/e2e/repo-settings.test.e2e.js
rename to tests/e2e/repo-settings.test.e2e.ts
index b4fdc1ae6c..8bd7299182 100644
--- a/tests/e2e/repo-settings.test.e2e.js
+++ b/tests/e2e/repo-settings.test.e2e.ts
@@ -1,5 +1,3 @@
-// @ts-check
-
 // @watch start
 // templates/webhook/shared-settings.tmpl
 // templates/repo/settings/**
@@ -9,8 +7,8 @@
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test, login_user, login} from './utils_e2e.js';
-import {validate_form} from './shared/forms.js';
+import {test, login_user, login} from './utils_e2e.ts';
+import {validate_form} from './shared/forms.ts';
 
 test.beforeAll(async ({browser}, workerInfo) => {
   await login_user(browser, workerInfo, 'user2');
diff --git a/tests/e2e/repo-wiki.test.e2e.js b/tests/e2e/repo-wiki.test.e2e.ts
similarity index 94%
rename from tests/e2e/repo-wiki.test.e2e.js
rename to tests/e2e/repo-wiki.test.e2e.ts
index eb6c033748..5b681c583c 100644
--- a/tests/e2e/repo-wiki.test.e2e.js
+++ b/tests/e2e/repo-wiki.test.e2e.ts
@@ -1,12 +1,10 @@
-// @ts-check
-
 // @watch start
 // templates/repo/wiki/**
 // web_src/css/repo**
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test} from './utils_e2e.js';
+import {test} from './utils_e2e.ts';
 
 test(`Search for long titles and test for no overflow`, async ({page}, workerInfo) => {
   test.skip(workerInfo.project.name === 'Mobile Safari', 'Fails as always, see https://codeberg.org/forgejo/forgejo/pulls/5326#issuecomment-2313275');
diff --git a/tests/e2e/right-settings-button.test.e2e.js b/tests/e2e/right-settings-button.test.e2e.ts
similarity index 99%
rename from tests/e2e/right-settings-button.test.e2e.js
rename to tests/e2e/right-settings-button.test.e2e.ts
index 87e10c040c..bfb1800a27 100644
--- a/tests/e2e/right-settings-button.test.e2e.js
+++ b/tests/e2e/right-settings-button.test.e2e.ts
@@ -1,5 +1,3 @@
-// @ts-check
-
 // @watch start
 // templates/org/**
 // templates/repo/**
@@ -7,7 +5,7 @@
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test, login_user, load_logged_in_context} from './utils_e2e.js';
+import {test, login_user, load_logged_in_context} from './utils_e2e.ts';
 
 test.beforeAll(async ({browser}, workerInfo) => {
   await login_user(browser, workerInfo, 'user2');
diff --git a/tests/e2e/shared/forms.js b/tests/e2e/shared/forms.ts
similarity index 92%
rename from tests/e2e/shared/forms.js
rename to tests/e2e/shared/forms.ts
index 5775c40826..52432ccbe8 100644
--- a/tests/e2e/shared/forms.js
+++ b/tests/e2e/shared/forms.ts
@@ -1,8 +1,7 @@
-import {expect} from '@playwright/test';
+import {expect, type Page} from '@playwright/test';
 import {AxeBuilder} from '@axe-core/playwright';
 
-export async function validate_form({page}, scope) {
-  scope ??= 'form';
+export async function validate_form({page}: {page: Page}, scope: 'form' | 'fieldset' = 'form') {
   const accessibilityScanResults = await new AxeBuilder({page})
     // disable checking for link style - should be fixed, but not now
     .disableRules('link-in-text-block')
diff --git a/tests/e2e/utils_e2e.js b/tests/e2e/utils_e2e.ts
similarity index 80%
rename from tests/e2e/utils_e2e.js
rename to tests/e2e/utils_e2e.ts
index 7cfd7388ca..050847c5ed 100644
--- a/tests/e2e/utils_e2e.js
+++ b/tests/e2e/utils_e2e.ts
@@ -1,4 +1,4 @@
-import {expect, test as baseTest} from '@playwright/test';
+import {expect, test as baseTest, type Browser, type BrowserContextOptions, type APIRequestContext, type TestInfo, type Page} from '@playwright/test';
 
 export const test = baseTest.extend({
   context: async ({browser}, use) => {
@@ -6,7 +6,7 @@ export const test = baseTest.extend({
   },
 });
 
-async function test_context(browser, options) {
+async function test_context(browser: Browser, options?: BrowserContextOptions) {
   const context = await browser.newContext(options);
 
   context.on('page', (page) => {
@@ -21,7 +21,7 @@ const LOGIN_PASSWORD = 'password';
 
 // log in user and store session info. This should generally be
 //  run in test.beforeAll(), then the session can be loaded in tests.
-export async function login_user(browser, workerInfo, user) {
+export async function login_user(browser: Browser, workerInfo: TestInfo, user: string) {
   test.setTimeout(60000);
   // Set up a new context
   const context = await test_context(browser);
@@ -47,7 +47,7 @@ export async function login_user(browser, workerInfo, user) {
   return context;
 }
 
-export async function load_logged_in_context(browser, workerInfo, user) {
+export async function load_logged_in_context(browser: Browser, workerInfo: TestInfo, user: string) {
   let context;
   try {
     context = await test_context(browser, {storageState: `${ARTIFACTS_PATH}/state-${user}-${workerInfo.workerIndex}.json`});
@@ -59,12 +59,12 @@ export async function load_logged_in_context(browser, workerInfo, user) {
   return context;
 }
 
-export async function login({browser}, workerInfo) {
+export async function login({browser}: {browser: Browser}, workerInfo: TestInfo) {
   const context = await load_logged_in_context(browser, workerInfo, 'user2');
-  return await context.newPage();
+  return await context?.newPage();
 }
 
-export async function save_visual(page) {
+export async function save_visual(page: Page) {
   // Optionally include visual testing
   if (process.env.VISUAL_TEST) {
     await page.waitForLoadState('networkidle');
@@ -83,7 +83,7 @@ export async function save_visual(page) {
 
 // Create a temporary user and login to that user and store session info.
 // This should ideally run on a per test basis.
-export async function create_temp_user(browser, workerInfo, request) {
+export async function create_temp_user(browser: Browser, workerInfo: TestInfo, request: APIRequestContext) {
   const username = globalThis.crypto.randomUUID();
   const newUser = await request.post(`/api/v1/admin/users`, {
     headers: {
diff --git a/tests/e2e/webauthn.test.e2e.js b/tests/e2e/webauthn.test.e2e.ts
similarity index 94%
rename from tests/e2e/webauthn.test.e2e.js
rename to tests/e2e/webauthn.test.e2e.ts
index 7168de223a..38e6b27821 100644
--- a/tests/e2e/webauthn.test.e2e.js
+++ b/tests/e2e/webauthn.test.e2e.ts
@@ -1,6 +1,5 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
-// @ts-check
 
 // @watch start
 // templates/user/auth/**
@@ -9,7 +8,7 @@
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test, create_temp_user} from './utils_e2e.js';
+import {test, create_temp_user} from './utils_e2e.ts';
 
 test('WebAuthn register & login flow', async ({browser, request}, workerInfo) => {
   test.skip(workerInfo.project.name !== 'chromium', 'Uses Chrome protocol');
@@ -31,7 +30,7 @@ test('WebAuthn register & login flow', async ({browser, request}, workerInfo) =>
       transport: 'usb',
       automaticPresenceSimulation: true,
       isUserVerified: true,
-      backupEligibility: true,
+      backupEligibility: true, // TODO: this doesn't seem to be available?!
     },
   });
 

From 4f336e589d2f8185e8325728c3a35e071f6330a9 Mon Sep 17 00:00:00 2001
From: Michael Kriese 
Date: Fri, 8 Nov 2024 12:17:00 +0100
Subject: [PATCH 333/443] chore(renovate): group forgejo go-chi packages

---
 renovate.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/renovate.json b/renovate.json
index 28cb82e2df..cd927797f5 100644
--- a/renovate.json
+++ b/renovate.json
@@ -83,6 +83,12 @@
       "matchUpdateTypes": ["minor", "patch"],
       "groupName": "postcss"
     },
+    {
+      "description": "Group Forgejo go-chi packages",
+      "matchUpdateTypes": ["minor", "patch", "digest"],
+      "matchPackageNames": ["code.forgejo.org/go-chi/**"],
+      "groupName": "forgejo go-chi packages"
+    },
     {
       "description": "Split minor and patch updates",
       "matchPackageNames": [

From 669b4b46e6b620edf10b7330492898eb1277f0c8 Mon Sep 17 00:00:00 2001
From: Michael Kriese 
Date: Fri, 8 Nov 2024 12:18:29 +0100
Subject: [PATCH 334/443] chore(renovate): pin to single actions runner

---
 .forgejo/workflows/renovate.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml
index 1f29156069..0da82d9154 100644
--- a/.forgejo/workflows/renovate.yml
+++ b/.forgejo/workflows/renovate.yml
@@ -21,7 +21,7 @@ jobs:
   renovate:
     if: ${{ secrets.RENOVATE_TOKEN != '' }}
 
-    runs-on: docker
+    runs-on: docker-runner-one
     container:
       image: code.forgejo.org/forgejo-contrib/renovate:39.5.0
 

From 2eeb2fcd359cd9a210d95c647ec4bb2fed7f13e0 Mon Sep 17 00:00:00 2001
From: Michael Kriese 
Date: Fri, 8 Nov 2024 13:05:43 +0100
Subject: [PATCH 335/443] chore(renovate): only run if renovate workflow
 changed

---
 .forgejo/workflows/renovate.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml
index 0da82d9154..468d107325 100644
--- a/.forgejo/workflows/renovate.yml
+++ b/.forgejo/workflows/renovate.yml
@@ -8,7 +8,9 @@ name: renovate
 on:
   push:
     branches:
-      - 'renovate/**' # self-test updates
+      - renovate/** # self-test updates
+    paths:
+      - .forgejo/workflows/renovate.yml
   schedule:
     - cron: '0 0/2 * * *'
   workflow_dispatch:

From d2a3eefcd0c1339de37bec275f8d8e0dd614036d Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Fri, 8 Nov 2024 17:43:48 +0000
Subject: [PATCH 336/443] Update module code.forgejo.org/go-chi/binding to v1
 (forgejo) (#5862)

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5862
Reviewed-by: Michael Kriese 
Co-authored-by: Renovate Bot 
Co-committed-by: Renovate Bot 
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 513f119014..3171b0cfdc 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
 	code.forgejo.org/f3/gof3/v3 v3.7.0
 	code.forgejo.org/forgejo-contrib/go-libravatar v0.0.0-20191008002943-06d1c002b251
 	code.forgejo.org/forgejo/reply v1.0.2
-	code.forgejo.org/go-chi/binding v0.0.0-20241105210225-1f8bf5136720
+	code.forgejo.org/go-chi/binding v1.0.0
 	code.forgejo.org/go-chi/cache v0.0.0-20240912103640-dcb08fba860d
 	code.forgejo.org/go-chi/captcha v0.0.0-20240905153133-df43b9250ed5
 	code.forgejo.org/go-chi/session v0.0.0-20241017103059-2a992261fc26
diff --git a/go.sum b/go.sum
index c2af9b3c36..3e6bb14ae4 100644
--- a/go.sum
+++ b/go.sum
@@ -10,8 +10,8 @@ code.forgejo.org/forgejo/archiver/v3 v3.5.1 h1:UmmbA7D5550uf71SQjarmrn6yKwOGxtEj
 code.forgejo.org/forgejo/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4=
 code.forgejo.org/forgejo/reply v1.0.2 h1:dMhQCHV6/O3L5CLWNTol+dNzDAuyCK88z4J/lCdgFuQ=
 code.forgejo.org/forgejo/reply v1.0.2/go.mod h1:RyZUfzQLc+fuLIGjTSQWDAJWPiL4WtKXB/FifT5fM7U=
-code.forgejo.org/go-chi/binding v0.0.0-20241105210225-1f8bf5136720 h1:DDdvrdov1a6HK0xiJIUTfGh1RpKP0prkHi2guxhDKIU=
-code.forgejo.org/go-chi/binding v0.0.0-20241105210225-1f8bf5136720/go.mod h1:fWwqaHj0H1/KeCpBqdvKunflq8pYfciEHI5v3UUeE2E=
+code.forgejo.org/go-chi/binding v1.0.0 h1:EIDJtk9brK7WsT7rvS/D4cxX8XlnhY3LMy8ex1jeHu0=
+code.forgejo.org/go-chi/binding v1.0.0/go.mod h1:fWwqaHj0H1/KeCpBqdvKunflq8pYfciEHI5v3UUeE2E=
 code.forgejo.org/go-chi/cache v0.0.0-20240912103640-dcb08fba860d h1:nOu/2GX571t4intmtfvpctS148OqsBYrGUySVm93ifc=
 code.forgejo.org/go-chi/cache v0.0.0-20240912103640-dcb08fba860d/go.mod h1:OVlZ/TqDYJ+RUJ+R+J+OLxtlyjo3pbjBeK7LAWAB+Vk=
 code.forgejo.org/go-chi/captcha v0.0.0-20240905153133-df43b9250ed5 h1:A7P1liXCpJBHEJ5KIDsF0ujnQ8FQ/aX1UixTW0vGrDQ=

From bf69683df6bb1eb894320f7250e3d3b6e664d168 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Fri, 8 Nov 2024 21:12:20 +0000
Subject: [PATCH 337/443] Update module code.forgejo.org/go-chi/cache to v1
 (forgejo) (#5863)

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5863
Reviewed-by: Michael Kriese 
Co-authored-by: Renovate Bot 
Co-committed-by: Renovate Bot 
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 3171b0cfdc..88d9caae90 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
 	code.forgejo.org/forgejo-contrib/go-libravatar v0.0.0-20191008002943-06d1c002b251
 	code.forgejo.org/forgejo/reply v1.0.2
 	code.forgejo.org/go-chi/binding v1.0.0
-	code.forgejo.org/go-chi/cache v0.0.0-20240912103640-dcb08fba860d
+	code.forgejo.org/go-chi/cache v1.0.0
 	code.forgejo.org/go-chi/captcha v0.0.0-20240905153133-df43b9250ed5
 	code.forgejo.org/go-chi/session v0.0.0-20241017103059-2a992261fc26
 	code.gitea.io/actions-proto-go v0.4.0
diff --git a/go.sum b/go.sum
index 3e6bb14ae4..d722e955ef 100644
--- a/go.sum
+++ b/go.sum
@@ -12,8 +12,8 @@ code.forgejo.org/forgejo/reply v1.0.2 h1:dMhQCHV6/O3L5CLWNTol+dNzDAuyCK88z4J/lCd
 code.forgejo.org/forgejo/reply v1.0.2/go.mod h1:RyZUfzQLc+fuLIGjTSQWDAJWPiL4WtKXB/FifT5fM7U=
 code.forgejo.org/go-chi/binding v1.0.0 h1:EIDJtk9brK7WsT7rvS/D4cxX8XlnhY3LMy8ex1jeHu0=
 code.forgejo.org/go-chi/binding v1.0.0/go.mod h1:fWwqaHj0H1/KeCpBqdvKunflq8pYfciEHI5v3UUeE2E=
-code.forgejo.org/go-chi/cache v0.0.0-20240912103640-dcb08fba860d h1:nOu/2GX571t4intmtfvpctS148OqsBYrGUySVm93ifc=
-code.forgejo.org/go-chi/cache v0.0.0-20240912103640-dcb08fba860d/go.mod h1:OVlZ/TqDYJ+RUJ+R+J+OLxtlyjo3pbjBeK7LAWAB+Vk=
+code.forgejo.org/go-chi/cache v1.0.0 h1:akLfGxNlHcacmtutovNtYFSTMsbdcp5MGjAEsP4pxnE=
+code.forgejo.org/go-chi/cache v1.0.0/go.mod h1:OVlZ/TqDYJ+RUJ+R+J+OLxtlyjo3pbjBeK7LAWAB+Vk=
 code.forgejo.org/go-chi/captcha v0.0.0-20240905153133-df43b9250ed5 h1:A7P1liXCpJBHEJ5KIDsF0ujnQ8FQ/aX1UixTW0vGrDQ=
 code.forgejo.org/go-chi/captcha v0.0.0-20240905153133-df43b9250ed5/go.mod h1:YLOsiln/arX3egGtxG4QNp49G2CIqP9pqD2VL56obLc=
 code.forgejo.org/go-chi/session v0.0.0-20241017103059-2a992261fc26 h1:6XCLWu8A0nPM862Uh68kQmxsBsaQNfPPFwYjzG8M8QE=

From 2541a943ce01636203e8e456e0a2308b24c4ba4a Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Sat, 9 Nov 2024 00:07:18 +0100
Subject: [PATCH 338/443] bug: require.Eventually must not test with assert

Otherwise it fails the test instead of retrying if the condition fails
at least once.
---
 tests/integration/actions_trigger_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/actions_trigger_test.go b/tests/integration/actions_trigger_test.go
index 25dcacde34..9cf2d4305f 100644
--- a/tests/integration/actions_trigger_test.go
+++ b/tests/integration/actions_trigger_test.go
@@ -321,7 +321,7 @@ jobs:
 				require.Eventually(t, func() bool {
 					actionRuns = make([]*actions_model.ActionRun, 0)
 					require.NoError(t, db.GetEngine(db.DefaultContext).Where("repo_id=?", baseRepo.ID).Find(&actionRuns))
-					return assert.Len(t, actionRuns, count)
+					return len(actionRuns) == count
 				}, 30*time.Second, 1*time.Second)
 
 				// verify the expected  ActionRuns were created

From 5ab832ba8779b8718cd9513cedc109fe5f2508a6 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Fri, 8 Nov 2024 23:37:13 +0000
Subject: [PATCH 339/443] Update module code.forgejo.org/go-chi/session to v1
 (forgejo) (#5865)

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5865
Reviewed-by: Michael Kriese 
Co-authored-by: Renovate Bot 
Co-committed-by: Renovate Bot 
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 88d9caae90..583892d428 100644
--- a/go.mod
+++ b/go.mod
@@ -9,7 +9,7 @@ require (
 	code.forgejo.org/go-chi/binding v1.0.0
 	code.forgejo.org/go-chi/cache v1.0.0
 	code.forgejo.org/go-chi/captcha v0.0.0-20240905153133-df43b9250ed5
-	code.forgejo.org/go-chi/session v0.0.0-20241017103059-2a992261fc26
+	code.forgejo.org/go-chi/session v1.0.0
 	code.gitea.io/actions-proto-go v0.4.0
 	code.gitea.io/gitea-vet v0.2.3
 	code.gitea.io/sdk/gitea v0.17.1
diff --git a/go.sum b/go.sum
index d722e955ef..f1e833caa4 100644
--- a/go.sum
+++ b/go.sum
@@ -16,8 +16,8 @@ code.forgejo.org/go-chi/cache v1.0.0 h1:akLfGxNlHcacmtutovNtYFSTMsbdcp5MGjAEsP4p
 code.forgejo.org/go-chi/cache v1.0.0/go.mod h1:OVlZ/TqDYJ+RUJ+R+J+OLxtlyjo3pbjBeK7LAWAB+Vk=
 code.forgejo.org/go-chi/captcha v0.0.0-20240905153133-df43b9250ed5 h1:A7P1liXCpJBHEJ5KIDsF0ujnQ8FQ/aX1UixTW0vGrDQ=
 code.forgejo.org/go-chi/captcha v0.0.0-20240905153133-df43b9250ed5/go.mod h1:YLOsiln/arX3egGtxG4QNp49G2CIqP9pqD2VL56obLc=
-code.forgejo.org/go-chi/session v0.0.0-20241017103059-2a992261fc26 h1:6XCLWu8A0nPM862Uh68kQmxsBsaQNfPPFwYjzG8M8QE=
-code.forgejo.org/go-chi/session v0.0.0-20241017103059-2a992261fc26/go.mod h1:lS76JFHZqGXYJTBHqwZ910UG046hIXAaYIN6J0Lf8sI=
+code.forgejo.org/go-chi/session v1.0.0 h1:1hjLWHpXkb4vs/g9rk/unhRL4AoKEqVUPJ+opI8UO3Y=
+code.forgejo.org/go-chi/session v1.0.0/go.mod h1:lS76JFHZqGXYJTBHqwZ910UG046hIXAaYIN6J0Lf8sI=
 code.gitea.io/actions-proto-go v0.4.0 h1:OsPBPhodXuQnsspG1sQ4eRE1PeoZyofd7+i73zCwnsU=
 code.gitea.io/actions-proto-go v0.4.0/go.mod h1:mn7Wkqz6JbnTOHQpot3yDeHx+O5C9EGhMEE+htvHBas=
 code.gitea.io/gitea-vet v0.2.3 h1:gdFmm6WOTM65rE8FUBTRzeQZYzXePKSSB1+r574hWwI=

From 2efc1f56863b82ac805a549d1f81deb31a6356b0 Mon Sep 17 00:00:00 2001
From: Lunny Xiao 
Date: Mon, 15 Apr 2024 22:11:07 +0800
Subject: [PATCH 340/443] [PORT] Fix code owners will not be mentioned when a
 pull request comes from a forked repository (gitea#30476)

Fix #30277
Caused by #29783

---

- Resolves #5842
- Regression from #2855

(cherry picked from commit c63060b130d34e3f03f28f4dccbf04d381a95c17)
---
 services/issue/pull.go                |  8 ++++----
 tests/integration/pull_review_test.go | 12 ++++++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/services/issue/pull.go b/services/issue/pull.go
index c5a12ce7c4..896802108d 100644
--- a/services/issue/pull.go
+++ b/services/issue/pull.go
@@ -51,14 +51,14 @@ func PullRequestCodeOwnersReview(ctx context.Context, issue *issues_model.Issue,
 		return nil, err
 	}
 
-	if pr.HeadRepo.IsFork {
-		return nil, nil
-	}
-
 	if err := pr.LoadBaseRepo(ctx); err != nil {
 		return nil, err
 	}
 
+	if pr.BaseRepo.IsFork {
+		return nil, nil
+	}
+
 	repo, err := gitrepo.OpenRepository(ctx, pr.BaseRepo)
 	if err != nil {
 		return nil, err
diff --git a/tests/integration/pull_review_test.go b/tests/integration/pull_review_test.go
index d15a7bd130..fc3e9be4a0 100644
--- a/tests/integration/pull_review_test.go
+++ b/tests/integration/pull_review_test.go
@@ -397,10 +397,18 @@ func TestPullView_CodeOwner(t *testing.T) {
 			require.NoError(t, err)
 
 			session := loginUser(t, "user5")
-			testPullCreate(t, session, "user5", "test_codeowner_fork", false, forkedRepo.DefaultBranch, "codeowner-basebranch-forked", "Test Pull Request2")
 
-			pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadBranch: "codeowner-basebranch-forked"})
+			// create a pull request on the forked repository, code reviewers should not be mentioned
+			testPullCreateDirectly(t, session, "user5", "test_codeowner_fork", forkedRepo.DefaultBranch, "", "", "codeowner-basebranch-forked", "Test Pull Request on Forked Repository")
+
+			pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: forkedRepo.ID, HeadBranch: "codeowner-basebranch-forked"})
 			unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 8})
+
+			// create a pull request to base repository, code reviewers should be mentioned
+			testPullCreateDirectly(t, session, repo.OwnerName, repo.Name, repo.DefaultBranch, forkedRepo.OwnerName, forkedRepo.Name, "codeowner-basebranch-forked", "Test Pull Request3")
+
+			pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: forkedRepo.ID, HeadBranch: "codeowner-basebranch-forked"})
+			unittest.AssertExistsIf(t, true, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 8})
 		})
 	})
 }

From dffee135f829a19f456d1e7419dd38000610f5e3 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Sat, 9 Nov 2024 07:28:23 +0000
Subject: [PATCH 341/443] Update module code.forgejo.org/go-chi/captcha to v1
 (forgejo) (#5864)

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5864
Reviewed-by: Michael Kriese 
Co-authored-by: Renovate Bot 
Co-committed-by: Renovate Bot 
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 583892d428..edd8108f6f 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@ require (
 	code.forgejo.org/forgejo/reply v1.0.2
 	code.forgejo.org/go-chi/binding v1.0.0
 	code.forgejo.org/go-chi/cache v1.0.0
-	code.forgejo.org/go-chi/captcha v0.0.0-20240905153133-df43b9250ed5
+	code.forgejo.org/go-chi/captcha v1.0.0
 	code.forgejo.org/go-chi/session v1.0.0
 	code.gitea.io/actions-proto-go v0.4.0
 	code.gitea.io/gitea-vet v0.2.3
diff --git a/go.sum b/go.sum
index f1e833caa4..78a867b0cc 100644
--- a/go.sum
+++ b/go.sum
@@ -14,8 +14,8 @@ code.forgejo.org/go-chi/binding v1.0.0 h1:EIDJtk9brK7WsT7rvS/D4cxX8XlnhY3LMy8ex1
 code.forgejo.org/go-chi/binding v1.0.0/go.mod h1:fWwqaHj0H1/KeCpBqdvKunflq8pYfciEHI5v3UUeE2E=
 code.forgejo.org/go-chi/cache v1.0.0 h1:akLfGxNlHcacmtutovNtYFSTMsbdcp5MGjAEsP4pxnE=
 code.forgejo.org/go-chi/cache v1.0.0/go.mod h1:OVlZ/TqDYJ+RUJ+R+J+OLxtlyjo3pbjBeK7LAWAB+Vk=
-code.forgejo.org/go-chi/captcha v0.0.0-20240905153133-df43b9250ed5 h1:A7P1liXCpJBHEJ5KIDsF0ujnQ8FQ/aX1UixTW0vGrDQ=
-code.forgejo.org/go-chi/captcha v0.0.0-20240905153133-df43b9250ed5/go.mod h1:YLOsiln/arX3egGtxG4QNp49G2CIqP9pqD2VL56obLc=
+code.forgejo.org/go-chi/captcha v1.0.0 h1:ZKVznXrPfruc1RMavCFBEINGxB3RAYr4I+WQAK8+eP0=
+code.forgejo.org/go-chi/captcha v1.0.0/go.mod h1:YLOsiln/arX3egGtxG4QNp49G2CIqP9pqD2VL56obLc=
 code.forgejo.org/go-chi/session v1.0.0 h1:1hjLWHpXkb4vs/g9rk/unhRL4AoKEqVUPJ+opI8UO3Y=
 code.forgejo.org/go-chi/session v1.0.0/go.mod h1:lS76JFHZqGXYJTBHqwZ910UG046hIXAaYIN6J0Lf8sI=
 code.gitea.io/actions-proto-go v0.4.0 h1:OsPBPhodXuQnsspG1sQ4eRE1PeoZyofd7+i73zCwnsU=

From 39f4018d87bc37c70f4fcd295af3b12555341231 Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Sat, 9 Nov 2024 18:16:38 +0100
Subject: [PATCH 342/443] fix(ci): slow runners may need more than 50 minutes
 for a test

---
 .forgejo/workflows/testing.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml
index 30d765ab30..03ebf0e983 100644
--- a/.forgejo/workflows/testing.yml
+++ b/.forgejo/workflows/testing.yml
@@ -82,7 +82,7 @@ jobs:
       - uses: ./.forgejo/workflows-composite/build-backend
       - run: |
           su forgejo -c 'make test-backend test-check'
-        timeout-minutes: 50
+        timeout-minutes: 120
         env:
           RACE_ENABLED: 'true'
           TAGS: bindata
@@ -116,7 +116,7 @@ jobs:
           separator: '\n'
       - run: |
           su forgejo -c 'make generate test-e2e-sqlite'
-        timeout-minutes: 40
+        timeout-minutes: 120
         env:
           USE_REPO_TEST_DIR: 1
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
@@ -156,7 +156,7 @@ jobs:
       - uses: ./.forgejo/workflows-composite/build-backend
       - run: |
           su forgejo -c 'make test-remote-cacher test-check'
-        timeout-minutes: 50
+        timeout-minutes: 120
         env:
           RACE_ENABLED: 'true'
           TAGS: bindata
@@ -187,7 +187,7 @@ jobs:
       - uses: ./.forgejo/workflows-composite/build-backend
       - run: |
           su forgejo -c 'make test-mysql-migration test-mysql'
-        timeout-minutes: 50
+        timeout-minutes: 120
         env:
           USE_REPO_TEST_DIR: 1
   test-pgsql:
@@ -219,7 +219,7 @@ jobs:
       - uses: ./.forgejo/workflows-composite/build-backend
       - run: |
           su forgejo -c 'make test-pgsql-migration test-pgsql'
-        timeout-minutes: 50
+        timeout-minutes: 120
         env:
           RACE_ENABLED: true
           USE_REPO_TEST_DIR: 1
@@ -240,7 +240,7 @@ jobs:
       - uses: ./.forgejo/workflows-composite/build-backend
       - run: |
           su forgejo -c 'make test-sqlite-migration test-sqlite'
-        timeout-minutes: 50
+        timeout-minutes: 120
         env:
           TAGS: sqlite sqlite_unlock_notify
           RACE_ENABLED: true

From 536e1923b483fdb643be2f52f0fa68c1c2a02ffc Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Sat, 9 Nov 2024 00:48:49 +0100
Subject: [PATCH 343/443] chore: add extra integration test

---
 tests/integration/codeowner_test.go | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/tests/integration/codeowner_test.go b/tests/integration/codeowner_test.go
index 71661bc56b..b324711cb5 100644
--- a/tests/integration/codeowner_test.go
+++ b/tests/integration/codeowner_test.go
@@ -6,6 +6,7 @@ package integration
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"net/url"
 	"os"
 	"path"
@@ -136,5 +137,27 @@ func TestCodeOwner(t *testing.T) {
 			unittest.AssertExistsIf(t, true, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 4})
 			unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 5})
 		})
+		t.Run("From a forked repository", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			session := loginUser(t, "user1")
+
+			r := fmt.Sprintf("%suser1/repo1.git", u.String())
+			remoteURL, _ := url.Parse(r)
+			remoteURL.User = url.UserPassword("user1", userPassword)
+			doGitAddRemote(dstPath, "forked-2", remoteURL)(t)
+
+			err := git.NewCommand(git.DefaultContext, "push", "forked-2", "HEAD:branch").Run(&git.RunOpts{Dir: dstPath})
+			require.NoError(t, err)
+
+			req := NewRequestWithValues(t, "POST", repo.FullName()+"/compare/main...user1/repo1:branch", map[string]string{
+				"_csrf": GetCSRF(t, session, repo.FullName()+"/compare/main...user1/repo1:branch"),
+				"title": "pull request",
+			})
+			session.MakeRequest(t, req, http.StatusOK)
+
+			pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadBranch: "branch"})
+			unittest.AssertExistsIf(t, true, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 4})
+		})
 	})
 }

From e58d5d46c1a411d79a1b889ab58c82fd6c975260 Mon Sep 17 00:00:00 2001
From: Ragnar Groot Koerkamp 
Date: Sat, 9 Nov 2024 21:14:31 +0100
Subject: [PATCH 344/443] [THEME] Copy ansi terminal colours from gitea to
 forgejo themes

---
 web_src/css/themes/theme-forgejo-dark.css  | 17 +++++++++++++++++
 web_src/css/themes/theme-forgejo-light.css | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/web_src/css/themes/theme-forgejo-dark.css b/web_src/css/themes/theme-forgejo-dark.css
index 9622add8e5..bc321f38a8 100644
--- a/web_src/css/themes/theme-forgejo-dark.css
+++ b/web_src/css/themes/theme-forgejo-dark.css
@@ -140,6 +140,23 @@
   --color-pink-dark-2: #b11d5f;
   --color-brown-dark-2: #a47252;
   --color-black-dark-2: #111827;
+  /* ansi colors used for actions console and console files */
+  --color-ansi-black: #1d2328;
+  --color-ansi-red: #cc4848;
+  --color-ansi-green: #87ab63;
+  --color-ansi-yellow: #cc9903;
+  --color-ansi-blue: #3a8ac6;
+  --color-ansi-magenta: #d22e8b;
+  --color-ansi-cyan: #00918a;
+  --color-ansi-white: var(--color-console-fg-subtle);
+  --color-ansi-bright-black: #424851;
+  --color-ansi-bright-red: #d15a5a;
+  --color-ansi-bright-green: #93b373;
+  --color-ansi-bright-yellow: #eaaf03;
+  --color-ansi-bright-blue: #4e96cc;
+  --color-ansi-bright-magenta: #d74397;
+  --color-ansi-bright-cyan: #00b6ad;
+  --color-ansi-bright-white: var(--color-console-fg);
   /* other colors */
   --color-gold: #b1983b;
   --color-white: #ffffff;
diff --git a/web_src/css/themes/theme-forgejo-light.css b/web_src/css/themes/theme-forgejo-light.css
index 201818964b..fa89cc2ec8 100644
--- a/web_src/css/themes/theme-forgejo-light.css
+++ b/web_src/css/themes/theme-forgejo-light.css
@@ -157,6 +157,23 @@
   --color-pink-dark-2: #b11d5f;
   --color-brown-dark-2: #835b42;
   --color-black-dark-2: #000000;
+  /* ansi colors used for actions console and console files */
+  --color-ansi-black: #1f2326;
+  --color-ansi-red: #cc4848;
+  --color-ansi-green: #87ab63;
+  --color-ansi-yellow: #cc9903;
+  --color-ansi-blue: #3a8ac6;
+  --color-ansi-magenta: #d22e8b;
+  --color-ansi-cyan: #00918a;
+  --color-ansi-white: var(--color-console-fg-subtle);
+  --color-ansi-bright-black: #46494d;
+  --color-ansi-bright-red: #d15a5a;
+  --color-ansi-bright-green: #93b373;
+  --color-ansi-bright-yellow: #eaaf03;
+  --color-ansi-bright-blue: #4e96cc;
+  --color-ansi-bright-magenta: #d74397;
+  --color-ansi-bright-cyan: #00b6ad;
+  --color-ansi-bright-white: var(--color-console-fg);
   /* other colors */
   --color-gold: #b1983b;
   --color-white: #ffffff;

From 506ed7f43faa57a184d900ac515caba00a951e92 Mon Sep 17 00:00:00 2001
From: MrSmoer 
Date: Thu, 7 Nov 2024 01:08:40 +0100
Subject: [PATCH 345/443] fix: Move "forgot_password"-link to fix login tab
 order

Previously hitting tab in the username field set the focus to the "forgot password" link. Only on the next hit the password field was selected.
This is an issue for some password managers (keepassdx android keyboard) and not as nice for accessibility.
Now the forgot link is below the sign up link at the bottom of the page.
Using "tabindex" didn't work properly with the templating engine because many elements get assigned a tabindex of "0" by default disrupting the tab selection sequence.
---
 templates/user/auth/signin_inner.tmpl | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl
index d4ba664e37..56532f4b98 100644
--- a/templates/user/auth/signin_inner.tmpl
+++ b/templates/user/auth/signin_inner.tmpl
@@ -17,9 +17,8 @@
 				
 			

 			{{if or (not .DisablePassword) .LinkAccountMode}}
-			

+			

 				
-				{{ctx.Locale.Tr "auth.forgot_password"}}
 				
 			

 			{{end}}
@@ -52,11 +51,15 @@
 

 	{{template "user/auth/webauthn_error" .}}
 
-	{{if .ShowRegistrationButton}}
 		

+			{{if .ShowRegistrationButton}}
 			

 				{{ctx.Locale.Tr "auth.hint_register" (printf "%s/user/sign_up" AppSubUrl)}}
+				

+			

+			{{end}}
+			

+				{{ctx.Locale.Tr "auth.forgot_password"}}
 			

 		

-	{{end}}
 


From 8587d4997909a9a6ff52bf0f7fc9c6f945db5246 Mon Sep 17 00:00:00 2001
From: MrSmoer 
Date: Sat, 9 Nov 2024 23:23:59 +0100
Subject: [PATCH 346/443] Remove unused css class
 "form-field-content-aside-label"

This css class was used to display the "forgot password"-link right and above the password field.
cd75519a0b moves this link, so this class is now unused
---
 web_src/css/form.css | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/web_src/css/form.css b/web_src/css/form.css
index a8867009bc..fb9364db45 100644
--- a/web_src/css/form.css
+++ b/web_src/css/form.css
@@ -500,20 +500,6 @@ textarea:focus,
   }
 }
 
-/* form fields with additional content besides their label, used on login form
- * use like 
 */
-.form-field-content-aside-label {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-}
-.form-field-content-aside-label > *:nth-child(2) {
-  text-align: right;
-  margin-bottom: 4px;
-}
-.form-field-content-aside-label input {
-  grid-column: span 2;
-}
-
 .ui.form .field > .selection.dropdown {
   min-width: 14em; /* matches the default min width */
 }

From 71d3e4c3178d47d1ca6aea9d23a1a4daf7db4d16 Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Sun, 10 Nov 2024 00:03:52 +0000
Subject: [PATCH 347/443] Update module golang.org/x/crypto to v0.29.0

---
 go.mod |  8 ++++----
 go.sum | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/go.mod b/go.mod
index edd8108f6f..4065ed25e3 100644
--- a/go.mod
+++ b/go.mod
@@ -100,12 +100,12 @@ require (
 	github.com/yuin/goldmark v1.7.8
 	github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
 	go.uber.org/mock v0.4.0
-	golang.org/x/crypto v0.28.0
+	golang.org/x/crypto v0.29.0
 	golang.org/x/image v0.21.0
 	golang.org/x/net v0.30.0
 	golang.org/x/oauth2 v0.23.0
-	golang.org/x/sys v0.26.0
-	golang.org/x/text v0.19.0
+	golang.org/x/sys v0.27.0
+	golang.org/x/text v0.20.0
 	golang.org/x/tools v0.26.0
 	google.golang.org/grpc v1.67.1
 	google.golang.org/protobuf v1.35.1
@@ -281,7 +281,7 @@ require (
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
 	golang.org/x/mod v0.21.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sync v0.9.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
diff --git a/go.sum b/go.sum
index 78a867b0cc..726b603059 100644
--- a/go.sum
+++ b/go.sum
@@ -733,8 +733,8 @@ golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2Uz
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
-golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
-golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
+golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
+golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
 golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA=
 golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
 golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s=
@@ -771,8 +771,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
+golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -801,8 +801,8 @@ golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
-golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
+golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
@@ -812,8 +812,8 @@ golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
-golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
-golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
+golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU=
+golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -825,8 +825,8 @@ golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
-golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
+golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

From 5932b86af4a2c8466a0d28e12c17cfdc79bc4617 Mon Sep 17 00:00:00 2001
From: Otto Richter 
Date: Sun, 10 Nov 2024 01:08:56 +0100
Subject: [PATCH 348/443] fix(ui): Details icon in repo settings sidebar

Consistent classes between both details/summary constructs in the sidebar, ensuring they have the same style.
---
 templates/repo/settings/navbar.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl
index df5ba3aba6..0f6cb74d8c 100644
--- a/templates/repo/settings/navbar.tmpl
+++ b/templates/repo/settings/navbar.tmpl
@@ -5,7 +5,7 @@
 			{{ctx.Locale.Tr "repo.settings.options"}}
 		
 		

-			{{ctx.Locale.Tr "repo.settings.units.units"}}
+			{{ctx.Locale.Tr "repo.settings.units.units"}}
 			

 				
 					{{ctx.Locale.Tr "repo.settings.units.overview"}}

From 2483dbc694f2cdc7e29ac7c32909041fb638bd33 Mon Sep 17 00:00:00 2001
From: Otto Richter 
Date: Sun, 10 Nov 2024 02:16:21 +0100
Subject: [PATCH 349/443] chore(ci): Enforce test label with CI check

Re-add the test after bugfixes have been deployed to Codeberg
---
 .forgejo/workflows/merge-requirements.yml | 44 +++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 .forgejo/workflows/merge-requirements.yml

diff --git a/.forgejo/workflows/merge-requirements.yml b/.forgejo/workflows/merge-requirements.yml
new file mode 100644
index 0000000000..d9650b66a7
--- /dev/null
+++ b/.forgejo/workflows/merge-requirements.yml
@@ -0,0 +1,44 @@
+# Copyright 2024 The Forgejo Authors
+# SPDX-License-Identifier: MIT
+
+name: requirements
+
+on:
+  pull_request:
+    types:
+      - labeled
+      - edited
+      - opened
+      - synchronize
+
+jobs:
+  merge-conditions:
+    runs-on: docker
+    container:
+      image: 'code.forgejo.org/oci/node:20-bookworm'
+    steps:
+      - name: Debug output
+        run: |
+          cat <<'EOF'
+          ${{ toJSON(github.event) }}
+          EOF
+      - name: Missing test label
+        if: >
+          !(
+            contains(toJSON(github.event.pull_request.labels), 'test/present')
+            || contains(toJSON(github.event.pull_request.labels), 'test/not-needed')
+            || contains(toJSON(github.event.pull_request.labels), 'test/manual')
+          )
+        run: |
+          echo "Test label must be set to either 'present', 'not-needed' or 'manual'."
+          exit 1
+      - name: Missing manual test instructions
+        if: >
+          (
+            contains(toJSON(github.event.pull_request.labels), 'test/manual')
+            && !contains(toJSON(github.event.pull_request.body), '# Test')
+          )
+        run: |
+          echo "Manual test label is set. The PR description needs to contain test steps introduced by a heading like:"
+          echo "# Testing"
+          exit 1

From 11667f07c5af1cd7132bd9a991a26979dc60143b Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Sun, 10 Nov 2024 02:21:28 +0100
Subject: [PATCH 350/443] chore: lazy-loaded version of goccy/go-json

- This uses a forked version of https://github.com/goccy/go-json, that
has [this pull request](https://github.com/goccy/go-json/pull/490)
applied. It reduces the heap memory usage by 8MiB (idle heap usage from
startup: 40126.59kB -> 32073.56kB). This should be generally safe to
replace as goccy/go-json doesn't see frequent updates and the other user
of this fork is grafana which is another big Go project.
- The only user of this library is minio, but having a configuration
with minio is not a common setup, AFAIK, so this is essentialy wasted
memory for most Forgejo instances. Having it lazy-loaded solves that
problem.
---
 go.mod | 2 ++
 go.sum | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/go.mod b/go.mod
index 4065ed25e3..b03faf3142 100644
--- a/go.mod
+++ b/go.mod
@@ -296,3 +296,5 @@ replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142
 replace github.com/nektos/act => code.forgejo.org/forgejo/act v1.21.5
 
 replace github.com/mholt/archiver/v3 => code.forgejo.org/forgejo/archiver/v3 v3.5.1
+
+replace github.com/goccy/go-json => github.com/grafana/go-json v0.0.0-20241106155216-71a03f133f5c
diff --git a/go.sum b/go.sum
index 726b603059..1b773a5338 100644
--- a/go.sum
+++ b/go.sum
@@ -307,8 +307,6 @@ github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJA
 github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
 github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
-github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
-github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f h1:3BSP1Tbs2djlpprl7wCLuiqMaUh5SJkkzI2gDs+FgLs=
 github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f/go.mod h1:Pcatq5tYkCW2Q6yrR2VRHlbHpZ/R4/7qyL1TCF7vl14=
@@ -383,6 +381,8 @@ github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kX
 github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
 github.com/gorilla/sessions v1.4.0 h1:kpIYOp/oi6MG/p5PgxApU8srsSw9tuFbt46Lt7auzqQ=
 github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik=
+github.com/grafana/go-json v0.0.0-20241106155216-71a03f133f5c h1:yKBKEC347YZpgii1KazRCfxHsTaxMqWZzoivM1OTT50=
+github.com/grafana/go-json v0.0.0-20241106155216-71a03f133f5c/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/h2non/gock v1.2.0 h1:K6ol8rfrRkUOefooBC8elXoaNGYkpp7y2qcxGG6BzUE=
 github.com/h2non/gock v1.2.0/go.mod h1:tNhoxHYW2W42cYkYb1WqzdbYIieALC99kpYr7rH/BQk=
 github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=

From b4623519331fe88db0d996f228297050b8cf98ec Mon Sep 17 00:00:00 2001
From: Renovate Bot 
Date: Sun, 10 Nov 2024 02:13:04 +0000
Subject: [PATCH 351/443] Update module golang.org/x/net to v0.31.0

---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 4065ed25e3..77cecc774a 100644
--- a/go.mod
+++ b/go.mod
@@ -102,7 +102,7 @@ require (
 	go.uber.org/mock v0.4.0
 	golang.org/x/crypto v0.29.0
 	golang.org/x/image v0.21.0
-	golang.org/x/net v0.30.0
+	golang.org/x/net v0.31.0
 	golang.org/x/oauth2 v0.23.0
 	golang.org/x/sys v0.27.0
 	golang.org/x/text v0.20.0
diff --git a/go.sum b/go.sum
index 726b603059..e22bd0c4ee 100644
--- a/go.sum
+++ b/go.sum
@@ -760,8 +760,8 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
-golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
+golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
+golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
 golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
 golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

From a26557482121ff163942bb1a0a8be0c7093f14a8 Mon Sep 17 00:00:00 2001
From: Shiny Nematoda 
Date: Fri, 1 Nov 2024 13:06:02 +0000
Subject: [PATCH 352/443] enh(search): improve issue search

- new sort by relevency option for issue search
- rework bleve fuzzy search to consider each term rather than matching the entire phrase
---
 modules/indexer/internal/bleve/query.go       |  9 +++++
 modules/indexer/issues/bleve/bleve.go         | 33 ++++++++++---------
 modules/indexer/issues/dboptions.go           |  4 ++-
 .../issues/elasticsearch/elasticsearch.go     |  2 +-
 modules/indexer/issues/indexer.go             |  1 +
 modules/indexer/issues/internal/model.go      |  1 +
 .../indexer/issues/meilisearch/meilisearch.go | 18 ++++++----
 modules/templates/util_string.go              |  4 +++
 options/locale/locale_en-US.ini               |  1 +
 templates/repo/issue/filter_list.tmpl         | 14 ++++----
 10 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/modules/indexer/internal/bleve/query.go b/modules/indexer/internal/bleve/query.go
index 90626da4f1..0cfda2d0f8 100644
--- a/modules/indexer/internal/bleve/query.go
+++ b/modules/indexer/internal/bleve/query.go
@@ -19,6 +19,15 @@ func NumericEqualityQuery(value int64, field string) *query.NumericRangeQuery {
 	return q
 }
 
+// MatchQuery generates a match query for the given phrase, field and analyzer
+func MatchQuery(matchTerm, field, analyzer string, fuzziness int) *query.MatchQuery {
+	q := bleve.NewMatchQuery(matchTerm)
+	q.FieldVal = field
+	q.Analyzer = analyzer
+	q.Fuzziness = fuzziness
+	return q
+}
+
 // MatchPhraseQuery generates a match phrase query for the given phrase, field and analyzer
 func MatchPhraseQuery(matchPhrase, field, analyzer string, fuzziness int) *query.MatchPhraseQuery {
 	q := bleve.NewMatchPhraseQuery(matchPhrase)
diff --git a/modules/indexer/issues/bleve/bleve.go b/modules/indexer/issues/bleve/bleve.go
index b20fcc6f80..5552a9deb0 100644
--- a/modules/indexer/issues/bleve/bleve.go
+++ b/modules/indexer/issues/bleve/bleve.go
@@ -35,13 +35,7 @@ func addUnicodeNormalizeTokenFilter(m *mapping.IndexMappingImpl) error {
 	})
 }
 
-const (
-	maxBatchSize = 16
-	// fuzzyDenominator determines the levenshtein distance per each character of a keyword
-	fuzzyDenominator = 4
-	// see https://github.com/blevesearch/bleve/issues/1563#issuecomment-786822311
-	maxFuzziness = 2
-)
+const maxBatchSize = 16
 
 // IndexerData an update to the issue indexer
 type IndexerData internal.IndexerData
@@ -162,16 +156,25 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 	var queries []query.Query
 
 	if options.Keyword != "" {
-		fuzziness := 0
 		if options.IsFuzzyKeyword {
-			fuzziness = min(maxFuzziness, len(options.Keyword)/fuzzyDenominator)
+			fuzziness := 1
+			if kl := len(options.Keyword); kl > 3 {
+				fuzziness = 2
+			} else if kl < 2 {
+				fuzziness = 0
+			}
+			queries = append(queries, bleve.NewDisjunctionQuery([]query.Query{
+				inner_bleve.MatchQuery(options.Keyword, "title", issueIndexerAnalyzer, fuzziness),
+				inner_bleve.MatchQuery(options.Keyword, "content", issueIndexerAnalyzer, fuzziness),
+				inner_bleve.MatchQuery(options.Keyword, "comments", issueIndexerAnalyzer, fuzziness),
+			}...))
+		} else {
+			queries = append(queries, bleve.NewDisjunctionQuery([]query.Query{
+				inner_bleve.MatchPhraseQuery(options.Keyword, "title", issueIndexerAnalyzer, 0),
+				inner_bleve.MatchPhraseQuery(options.Keyword, "content", issueIndexerAnalyzer, 0),
+				inner_bleve.MatchPhraseQuery(options.Keyword, "comments", issueIndexerAnalyzer, 0),
+			}...))
 		}
-
-		queries = append(queries, bleve.NewDisjunctionQuery([]query.Query{
-			inner_bleve.MatchPhraseQuery(options.Keyword, "title", issueIndexerAnalyzer, fuzziness),
-			inner_bleve.MatchPhraseQuery(options.Keyword, "content", issueIndexerAnalyzer, fuzziness),
-			inner_bleve.MatchPhraseQuery(options.Keyword, "comments", issueIndexerAnalyzer, fuzziness),
-		}...))
 	}
 
 	if len(options.RepoIDs) > 0 || options.AllPublic {
diff --git a/modules/indexer/issues/dboptions.go b/modules/indexer/issues/dboptions.go
index c1f454eeee..e34ef607c2 100644
--- a/modules/indexer/issues/dboptions.go
+++ b/modules/indexer/issues/dboptions.go
@@ -78,7 +78,9 @@ func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOp
 	searchOpt.Paginator = opts.Paginator
 
 	switch opts.SortType {
-	case "", "latest":
+	case "", "relevance":
+		searchOpt.SortBy = SortByScore
+	case "latest":
 		searchOpt.SortBy = SortByCreatedDesc
 	case "oldest":
 		searchOpt.SortBy = SortByCreatedAsc
diff --git a/modules/indexer/issues/elasticsearch/elasticsearch.go b/modules/indexer/issues/elasticsearch/elasticsearch.go
index 42e709a5e8..24e1ac8855 100644
--- a/modules/indexer/issues/elasticsearch/elasticsearch.go
+++ b/modules/indexer/issues/elasticsearch/elasticsearch.go
@@ -236,7 +236,7 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 	}
 
 	if options.SortBy == "" {
-		options.SortBy = internal.SortByCreatedAsc
+		options.SortBy = internal.SortByScore
 	}
 	sortBy := []elastic.Sorter{
 		parseSortBy(options.SortBy),
diff --git a/modules/indexer/issues/indexer.go b/modules/indexer/issues/indexer.go
index d7310529fc..7edcb3aa6f 100644
--- a/modules/indexer/issues/indexer.go
+++ b/modules/indexer/issues/indexer.go
@@ -269,6 +269,7 @@ func IsAvailable(ctx context.Context) bool {
 type SearchOptions = internal.SearchOptions
 
 const (
+	SortByScore        = internal.SortByScore
 	SortByCreatedDesc  = internal.SortByCreatedDesc
 	SortByUpdatedDesc  = internal.SortByUpdatedDesc
 	SortByCommentsDesc = internal.SortByCommentsDesc
diff --git a/modules/indexer/issues/internal/model.go b/modules/indexer/issues/internal/model.go
index 2dfee8b72e..dda2b7a5c1 100644
--- a/modules/indexer/issues/internal/model.go
+++ b/modules/indexer/issues/internal/model.go
@@ -127,6 +127,7 @@ func (o *SearchOptions) Copy(edit ...func(options *SearchOptions)) *SearchOption
 type SortBy string
 
 const (
+	SortByScore        SortBy = "-_score"
 	SortByCreatedDesc  SortBy = "-created_unix"
 	SortByUpdatedDesc  SortBy = "-updated_unix"
 	SortByCommentsDesc SortBy = "-comment_count"
diff --git a/modules/indexer/issues/meilisearch/meilisearch.go b/modules/indexer/issues/meilisearch/meilisearch.go
index 7d18444e6c..7c291198f1 100644
--- a/modules/indexer/issues/meilisearch/meilisearch.go
+++ b/modules/indexer/issues/meilisearch/meilisearch.go
@@ -208,12 +208,18 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 		query.And(inner_meilisearch.NewFilterLte("updated_unix", options.UpdatedBeforeUnix.Value()))
 	}
 
-	if options.SortBy == "" {
-		options.SortBy = internal.SortByCreatedAsc
-	}
-	sortBy := []string{
-		parseSortBy(options.SortBy),
-		"id:desc",
+	var sortBy []string
+	switch options.SortBy {
+	// sort by relevancy (no explicit sorting)
+	case internal.SortByScore:
+		fallthrough
+	case "":
+		sortBy = []string{}
+	default:
+		sortBy = []string{
+			parseSortBy(options.SortBy),
+			"id:desc",
+		}
 	}
 
 	skip, limit := indexer_internal.ParsePaginator(options.Paginator, maxTotalHits)
diff --git a/modules/templates/util_string.go b/modules/templates/util_string.go
index f23b74786a..685759dcbc 100644
--- a/modules/templates/util_string.go
+++ b/modules/templates/util_string.go
@@ -19,6 +19,10 @@ func NewStringUtils() *StringUtils {
 	return &stringUtils
 }
 
+func (su *StringUtils) Make(arr ...string) []string {
+	return arr
+}
+
 func (su *StringUtils) HasPrefix(s any, prefix string) bool {
 	switch v := s.(type) {
 	case string:
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 8299ba83bb..52d5b2e0a8 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1586,6 +1586,7 @@ issues.filter_type.mentioning_you = Mentioning you
 issues.filter_type.review_requested = Review requested
 issues.filter_type.reviewed_by_you = Reviewed by you
 issues.filter_sort = Sort
+issues.filter_sort.relevance = Relevance
 issues.filter_sort.latest = Newest
 issues.filter_sort.oldest = Oldest
 issues.filter_sort.recentupdate = Recently updated
diff --git a/templates/repo/issue/filter_list.tmpl b/templates/repo/issue/filter_list.tmpl
index 09f87b582f..f774d517ea 100644
--- a/templates/repo/issue/filter_list.tmpl
+++ b/templates/repo/issue/filter_list.tmpl
@@ -146,13 +146,11 @@
 	
 	{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 	

-		{{ctx.Locale.Tr "repo.issues.filter_sort.latest"}}
-		{{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}}
-		{{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}}
-		{{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}}
-		{{ctx.Locale.Tr "repo.issues.filter_sort.mostcomment"}}
-		{{ctx.Locale.Tr "repo.issues.filter_sort.leastcomment"}}
-		{{ctx.Locale.Tr "repo.issues.filter_sort.nearduedate"}}
-		{{ctx.Locale.Tr "repo.issues.filter_sort.farduedate"}}
+		{{ctx.Locale.Tr "repo.issues.filter_sort.relevance"}}
+		{{$o := .}}
+		{{range $opt := StringUtils.Make "latest" "oldest" "recentupdate" "mostcomment" "leastcomment" "nearduedate" "farduedate"}}
+			{{$text := ctx.Locale.Tr (printf "repo.issues.filter_sort.%s" $opt)}}
+			{{$text}}
+		{{end}}
 	

 


From b6e6a2c36ec23958f288da05eef5b0da1369b2e8 Mon Sep 17 00:00:00 2001
From: Shiny Nematoda 
Date: Tue, 5 Nov 2024 14:42:36 +0000
Subject: [PATCH 353/443] test: add for issue indexer sort by score

---
 .../indexer/issues/internal/tests/tests.go    | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/modules/indexer/issues/internal/tests/tests.go b/modules/indexer/issues/internal/tests/tests.go
index a93b2913e9..e8e6a4e7d1 100644
--- a/modules/indexer/issues/internal/tests/tests.go
+++ b/modules/indexer/issues/internal/tests/tests.go
@@ -126,6 +126,7 @@ var cases = []*testIndexerCase{
 		},
 		SearchOptions: &internal.SearchOptions{
 			Keyword: "hello",
+			SortBy:  internal.SortByCreatedDesc,
 		},
 		ExpectedIDs:   []int64{1002, 1001, 1000},
 		ExpectedTotal: 3,
@@ -139,6 +140,7 @@ var cases = []*testIndexerCase{
 		},
 		SearchOptions: &internal.SearchOptions{
 			Keyword:        "hello world",
+			SortBy:         internal.SortByCreatedDesc,
 			IsFuzzyKeyword: true,
 		},
 		ExpectedIDs:   []int64{1002, 1001, 1000},
@@ -157,6 +159,7 @@ var cases = []*testIndexerCase{
 		},
 		SearchOptions: &internal.SearchOptions{
 			Keyword: "hello",
+			SortBy:  internal.SortByCreatedDesc,
 			RepoIDs: []int64{1, 4},
 		},
 		ExpectedIDs:   []int64{1006, 1002, 1001},
@@ -175,6 +178,7 @@ var cases = []*testIndexerCase{
 		},
 		SearchOptions: &internal.SearchOptions{
 			Keyword:   "hello",
+			SortBy:    internal.SortByCreatedDesc,
 			RepoIDs:   []int64{1, 4},
 			AllPublic: true,
 		},
@@ -597,6 +601,22 @@ var cases = []*testIndexerCase{
 			}
 		},
 	},
+	{
+		Name: "SortByScore",
+		SearchOptions: &internal.SearchOptions{
+			Paginator: &db.ListOptionsAll,
+			SortBy:    internal.SortByScore,
+		},
+		Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) {
+			assert.Equal(t, len(data), len(result.Hits))
+			assert.Equal(t, len(data), int(result.Total))
+			for i, v := range result.Hits {
+				if i < len(result.Hits)-1 {
+					assert.GreaterOrEqual(t, v.Score, result.Hits[i+1].Score)
+				}
+			}
+		},
+	},
 	{
 		Name: "SortByCreatedAsc",
 		SearchOptions: &internal.SearchOptions{

From 493175e6fdeec5679dfe874d02c797b52a6d6848 Mon Sep 17 00:00:00 2001
From: Earl Warren 
Date: Sun, 10 Nov 2024 11:34:13 +0100
Subject: [PATCH 354/443] fix(ci): only trigger end-to-end tests when the label
 is set

Use event.label instead of event.pull_request.labels.*.name

Prior to Forgejo v9.0.2 it was not set and that was the only workaround.
---
 .forgejo/workflows/cascade-setup-end-to-end.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.forgejo/workflows/cascade-setup-end-to-end.yml b/.forgejo/workflows/cascade-setup-end-to-end.yml
index 404bbe8fa6..3d5237cd00 100644
--- a/.forgejo/workflows/cascade-setup-end-to-end.yml
+++ b/.forgejo/workflows/cascade-setup-end-to-end.yml
@@ -12,8 +12,10 @@
 #    whatever is in the default branch instead
 #
 #  - after it is merged, double check it works by setting the
-#    run-end-to-end-test on a pull request (any pull request will doe
+#    run-end-to-end-test on a pull request (any pull request will do)
 #
+name: end-to-end
+
 on:
   push:
     branches:
@@ -33,10 +35,9 @@ jobs:
         run: |
           echo github.event.pull_request.head.repo.fork = ${{ github.event.pull_request.head.repo.fork }}
           echo github.event.action = ${{ github.event.action }}
-          echo github.event.pull_request.merged = ${{ github.event.pull_request.merged }}
-          echo github.event.pull_request.labels.*.name
+          echo github.event.label
           cat <<'EOF'
-          ${{ toJSON(github.event.pull_request.labels.*.name) }}
+          ${{ toJSON(github.event.label) }}
           EOF
           cat <<'EOF'
           ${{ toJSON(github.event) }}
@@ -47,7 +48,7 @@ jobs:
       !startsWith(vars.ROLE, 'forgejo-') && (
         github.event_name == 'push' ||
         (
-          github.event.action == 'label_updated' && contains(github.event.pull_request.labels.*.name, 'run-end-to-end-tests')
+          github.event.action == 'label_updated' && github.event.label.name == 'run-end-to-end-tests'
         )
       )
     runs-on: docker

From cdf3636ae70847aea9756af27a126aa32a081e8b Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Sun, 10 Nov 2024 17:19:46 +0100
Subject: [PATCH 355/443] chore: simplify CopyDir

Use the standard library function [`os.CopyFS`](https://pkg.go.dev/os#CopyFS) to copy directories.
This also should be slightly faster.
---
 models/unittest/fscopy.go | 91 +--------------------------------------
 1 file changed, 2 insertions(+), 89 deletions(-)

diff --git a/models/unittest/fscopy.go b/models/unittest/fscopy.go
index 74b12d5057..5cd871ced6 100644
--- a/models/unittest/fscopy.go
+++ b/models/unittest/fscopy.go
@@ -4,99 +4,12 @@
 package unittest
 
 import (
-	"errors"
-	"io"
 	"os"
-	"path"
-	"strings"
-
-	"code.gitea.io/gitea/modules/util"
 )
 
-// Copy copies file from source to target path.
-func Copy(src, dest string) error {
-	// Gather file information to set back later.
-	si, err := os.Lstat(src)
-	if err != nil {
-		return err
-	}
-
-	// Handle symbolic link.
-	if si.Mode()&os.ModeSymlink != 0 {
-		target, err := os.Readlink(src)
-		if err != nil {
-			return err
-		}
-		// NOTE: os.Chmod and os.Chtimes don't recognize symbolic link,
-		// which will lead "no such file or directory" error.
-		return os.Symlink(target, dest)
-	}
-
-	sr, err := os.Open(src)
-	if err != nil {
-		return err
-	}
-	defer sr.Close()
-
-	dw, err := os.Create(dest)
-	if err != nil {
-		return err
-	}
-	defer dw.Close()
-
-	if _, err = io.Copy(dw, sr); err != nil {
-		return err
-	}
-
-	// Set back file information.
-	if err = os.Chtimes(dest, si.ModTime(), si.ModTime()); err != nil {
-		return err
-	}
-	return os.Chmod(dest, si.Mode())
-}
-
 // CopyDir copy files recursively from source to target directory.
 //
-// The filter accepts a function that process the path info.
-// and should return true for need to filter.
-//
 // It returns error when error occurs in underlying functions.
-func CopyDir(srcPath, destPath string, filters ...func(filePath string) bool) error {
-	// Check if target directory exists.
-	if _, err := os.Stat(destPath); !errors.Is(err, os.ErrNotExist) {
-		return util.NewAlreadyExistErrorf("file or directory already exists: %s", destPath)
-	}
-
-	err := os.MkdirAll(destPath, os.ModePerm)
-	if err != nil {
-		return err
-	}
-
-	// Gather directory info.
-	infos, err := util.StatDir(srcPath, true)
-	if err != nil {
-		return err
-	}
-
-	var filter func(filePath string) bool
-	if len(filters) > 0 {
-		filter = filters[0]
-	}
-
-	for _, info := range infos {
-		if filter != nil && filter(info) {
-			continue
-		}
-
-		curPath := path.Join(destPath, info)
-		if strings.HasSuffix(info, "/") {
-			err = os.MkdirAll(curPath, os.ModePerm)
-		} else {
-			err = Copy(path.Join(srcPath, info), curPath)
-		}
-		if err != nil {
-			return err
-		}
-	}
-	return nil
+func CopyDir(srcPath, destPath string) error {
+	return os.CopyFS(destPath, os.DirFS(srcPath))
 }

From f352d6db813cfa8bd086b5d12aa5ab75dc29dea6 Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Sun, 10 Nov 2024 19:41:04 +0100
Subject: [PATCH 356/443] chore: improve database docker instructions

- Do not require minio for mariadb docker.
- Do not require elasticsearch for mysql.
- Fix postgress password parameter.
- Add the multistatement query for mysql (this is not optimal but adding
Makefile code doesn't seem to work really well either)
---
 Makefile                    | 1 +
 tests/e2e/README.md         | 7 +++----
 tests/integration/README.md | 9 ++++-----
 tests/pgsql.ini.tmpl        | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index a95a951792..6a8ff8d88e 100644
--- a/Makefile
+++ b/Makefile
@@ -660,6 +660,7 @@ generate-ini-pgsql:
 		-e 's|{{REPO_TEST_DIR}}|${REPO_TEST_DIR}|g' \
 		-e 's|{{TEST_LOGGER}}|$(or $(TEST_LOGGER),test$(COMMA)file)|g' \
 		-e 's|{{TEST_TYPE}}|$(or $(TEST_TYPE),integration)|g' \
+		-e 's|{{TEST_STORAGE_TYPE}}|$(or $(TEST_STORAGE_TYPE),minio)|g' \
 			tests/pgsql.ini.tmpl > tests/pgsql.ini
 
 .PHONY: test-pgsql
diff --git a/tests/e2e/README.md b/tests/e2e/README.md
index 36b9a187c3..4f93cfb64a 100644
--- a/tests/e2e/README.md
+++ b/tests/e2e/README.md
@@ -126,17 +126,16 @@ You can also perform e2e tests using MariaDB/MySQL or PostgreSQL if you want.
 
 Setup a MySQL database inside docker
 ```
-docker run -e "MYSQL_DATABASE=test" -e "MYSQL_ALLOW_EMPTY_PASSWORD=yes" -p 3306:3306 --rm --name mysql mysql:latest #(just ctrl-c to stop db and clean the container)
-docker run -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" --rm --name elasticsearch elasticsearch:7.6.0 #(in a second terminal, just ctrl-c to stop db and clean the container)
+docker run -e "MYSQL_DATABASE=test" -e "MYSQL_ALLOW_EMPTY_PASSWORD=yes" -p 3306:3306 --rm --name mysql mysql:latest #(Ctrl-c to stop the database)
 ```
 Start tests based on the database container
 ```
-TEST_MYSQL_HOST=localhost:3306 TEST_MYSQL_DBNAME=test TEST_MYSQL_USERNAME=root TEST_MYSQL_PASSWORD='' make test-e2e-mysql
+TEST_MYSQL_HOST=localhost:3306 TEST_MYSQL_DBNAME=test?multiStatements=true TEST_MYSQL_USERNAME=root TEST_MYSQL_PASSWORD='' make test-e2e-mysql
 ```
 
 Setup a pgsql database inside docker
 ```
-docker run -e "POSTGRES_DB=test" -p 5432:5432 --rm --name pgsql postgres:latest #(just ctrl-c to stop db and clean the container)
+docker run -e POSTGRES_DB=test -e POSTGRES_PASSWORD=password -p 5432:5432 --rm --name pgsql postgres:latest #(Ctrl-c to stop the database)
 ```
 Start tests based on the database container
 ```
diff --git a/tests/integration/README.md b/tests/integration/README.md
index f0fbf94df9..d83685388e 100644
--- a/tests/integration/README.md
+++ b/tests/integration/README.md
@@ -61,22 +61,21 @@ make test-sqlite
 ### Run MySQL integration tests
 Setup a MySQL database inside docker
 ```
-docker run -e "MYSQL_DATABASE=test" -e "MYSQL_ALLOW_EMPTY_PASSWORD=yes" -p 3306:3306 --rm --name mysql mysql:latest #(just ctrl-c to stop db and clean the container)
-docker run -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" --rm --name elasticsearch elasticsearch:7.6.0 #(in a second terminal, just ctrl-c to stop db and clean the container)
+docker run -e MYSQL_DATABASE=test -e MYSQL_ALLOW_EMPTY_PASSWORD=yes -p 3306:3306 --rm --name mysql mysql:latest #(Ctrl-c to stop the database)
 ```
 Start tests based on the database container
 ```
-TEST_MYSQL_HOST=localhost:3306 TEST_MYSQL_DBNAME=test TEST_MYSQL_USERNAME=root TEST_MYSQL_PASSWORD='' make test-mysql
+TEST_MYSQL_HOST=localhost:3306 TEST_MYSQL_DBNAME=test?multiStatements=true TEST_MYSQL_USERNAME=root TEST_MYSQL_PASSWORD='' make test-mysql
 ```
 
 ### Run pgsql integration tests
 Setup a pgsql database inside docker
 ```
-docker run -e "POSTGRES_DB=test" -p 5432:5432 --rm --name pgsql postgres:latest #(just ctrl-c to stop db and clean the container)
+docker run -e "POSTGRES_DB=test" -e POSTGRES_PASSWORD=postgres -p 5432:5432 --rm --name pgsql postgres:latest #(Ctrl-c to stop the database)
 ```
 Start tests based on the database container
 ```
-TEST_PGSQL_HOST=localhost:5432 TEST_PGSQL_DBNAME=test TEST_PGSQL_USERNAME=postgres TEST_PGSQL_PASSWORD=postgres make test-pgsql
+TEST_STORAGE_TYPE=local TEST_PGSQL_HOST=localhost:5432 TEST_PGSQL_DBNAME=test TEST_PGSQL_USERNAME=postgres TEST_PGSQL_PASSWORD=postgres make test-pgsql
 ```
 
 ### Running individual tests
diff --git a/tests/pgsql.ini.tmpl b/tests/pgsql.ini.tmpl
index b58d753b6c..01d018c5b7 100644
--- a/tests/pgsql.ini.tmpl
+++ b/tests/pgsql.ini.tmpl
@@ -112,7 +112,7 @@ MINIO_BASE_PATH = avatars/
 MINIO_BASE_PATH = repo-avatars/
 
 [storage]
-STORAGE_TYPE = minio
+STORAGE_TYPE = {{TEST_STORAGE_TYPE}}
 SERVE_DIRECT = false
 MINIO_ENDPOINT = minio:9000
 MINIO_ACCESS_KEY_ID = 123456

From 582ab21bc34b25752639e064ab722fc58cc0becd Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Sun, 10 Nov 2024 18:25:41 +0100
Subject: [PATCH 357/443] chore: improve test quality

- Merge tests together.
- Remove unecessary usage of `onGiteaRun`.
- Make proper use of `unittest`.
- Make proper use of `test.MockVariable`.
- I have not checked all of the testing files yet.
---
 .../integration/actions_commit_status_test.go |   3 +-
 tests/integration/api_admin_org_test.go       |  83 +++--
 tests/integration/api_branch_test.go          |  33 +-
 tests/integration/api_fork_test.go            |  30 +-
 tests/integration/api_nodeinfo_test.go        |  34 +--
 tests/integration/api_org_test.go             | 288 +++++++++---------
 tests/integration/last_updated_time_test.go   |  73 +++--
 tests/integration/pull_commit_test.go         |  31 +-
 tests/integration/pull_review_test.go         |  33 +-
 tests/integration/rename_branch_test.go       |   2 -
 tests/integration/repo_collaborator_test.go   |  32 +-
 tests/integration/repo_migration_ui_test.go   |  26 +-
 tests/integration/repo_tag_test.go            |  94 ++----
 tests/integration/repo_view_test.go           |  40 ++-
 tests/integration/repofiles_change_test.go    | 269 +++++++---------
 tests/integration/user_avatar_test.go         | 101 +++---
 .../integration/user_profile_activity_test.go |  99 +++---
 .../integration/user_profile_follows_test.go  | 133 ++++----
 18 files changed, 620 insertions(+), 784 deletions(-)

diff --git a/tests/integration/actions_commit_status_test.go b/tests/integration/actions_commit_status_test.go
index 7be40eb0fa..0dae5db344 100644
--- a/tests/integration/actions_commit_status_test.go
+++ b/tests/integration/actions_commit_status_test.go
@@ -14,6 +14,7 @@ import (
 	"code.gitea.io/gitea/models/unittest"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/test"
 	"code.gitea.io/gitea/services/actions"
 	"code.gitea.io/gitea/services/automerge"
 
@@ -23,7 +24,7 @@ import (
 
 func TestActionsAutomerge(t *testing.T) {
 	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		assert.True(t, setting.Actions.Enabled, "Actions should be enabled")
+		defer test.MockVariableValue(&setting.Actions.Enabled, true)()
 
 		ctx := db.DefaultContext
 
diff --git a/tests/integration/api_admin_org_test.go b/tests/integration/api_admin_org_test.go
index a29d0ba1d7..823ef2f136 100644
--- a/tests/integration/api_admin_org_test.go
+++ b/tests/integration/api_admin_org_test.go
@@ -5,7 +5,6 @@ package integration
 
 import (
 	"net/http"
-	"net/url"
 	"strings"
 	"testing"
 
@@ -19,57 +18,55 @@ import (
 )
 
 func TestAPIAdminOrgCreate(t *testing.T) {
-	onGiteaRun(t, func(*testing.T, *url.URL) {
-		session := loginUser(t, "user1")
-		token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteAdmin)
+	defer tests.PrepareTestEnv(t)()
+	session := loginUser(t, "user1")
+	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteAdmin)
 
-		org := api.CreateOrgOption{
-			UserName:    "user2_org",
-			FullName:    "User2's organization",
-			Description: "This organization created by admin for user2",
-			Website:     "https://try.gitea.io",
-			Location:    "Shanghai",
-			Visibility:  "private",
-		}
-		req := NewRequestWithJSON(t, "POST", "/api/v1/admin/users/user2/orgs", &org).
-			AddTokenAuth(token)
-		resp := MakeRequest(t, req, http.StatusCreated)
+	org := api.CreateOrgOption{
+		UserName:    "user2_org",
+		FullName:    "User2's organization",
+		Description: "This organization created by admin for user2",
+		Website:     "https://try.gitea.io",
+		Location:    "Shanghai",
+		Visibility:  "private",
+	}
+	req := NewRequestWithJSON(t, "POST", "/api/v1/admin/users/user2/orgs", &org).
+		AddTokenAuth(token)
+	resp := MakeRequest(t, req, http.StatusCreated)
 
-		var apiOrg api.Organization
-		DecodeJSON(t, resp, &apiOrg)
+	var apiOrg api.Organization
+	DecodeJSON(t, resp, &apiOrg)
 
-		assert.Equal(t, org.UserName, apiOrg.Name)
-		assert.Equal(t, org.FullName, apiOrg.FullName)
-		assert.Equal(t, org.Description, apiOrg.Description)
-		assert.Equal(t, org.Website, apiOrg.Website)
-		assert.Equal(t, org.Location, apiOrg.Location)
-		assert.Equal(t, org.Visibility, apiOrg.Visibility)
+	assert.Equal(t, org.UserName, apiOrg.Name)
+	assert.Equal(t, org.FullName, apiOrg.FullName)
+	assert.Equal(t, org.Description, apiOrg.Description)
+	assert.Equal(t, org.Website, apiOrg.Website)
+	assert.Equal(t, org.Location, apiOrg.Location)
+	assert.Equal(t, org.Visibility, apiOrg.Visibility)
 
-		unittest.AssertExistsAndLoadBean(t, &user_model.User{
-			Name:      org.UserName,
-			LowerName: strings.ToLower(org.UserName),
-			FullName:  org.FullName,
-		})
+	unittest.AssertExistsAndLoadBean(t, &user_model.User{
+		Name:      org.UserName,
+		LowerName: strings.ToLower(org.UserName),
+		FullName:  org.FullName,
 	})
 }
 
 func TestAPIAdminOrgCreateBadVisibility(t *testing.T) {
-	onGiteaRun(t, func(*testing.T, *url.URL) {
-		session := loginUser(t, "user1")
-		token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteAdmin)
+	defer tests.PrepareTestEnv(t)()
+	session := loginUser(t, "user1")
+	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteAdmin)
 
-		org := api.CreateOrgOption{
-			UserName:    "user2_org",
-			FullName:    "User2's organization",
-			Description: "This organization created by admin for user2",
-			Website:     "https://try.gitea.io",
-			Location:    "Shanghai",
-			Visibility:  "notvalid",
-		}
-		req := NewRequestWithJSON(t, "POST", "/api/v1/admin/users/user2/orgs", &org).
-			AddTokenAuth(token)
-		MakeRequest(t, req, http.StatusUnprocessableEntity)
-	})
+	org := api.CreateOrgOption{
+		UserName:    "user2_org",
+		FullName:    "User2's organization",
+		Description: "This organization created by admin for user2",
+		Website:     "https://try.gitea.io",
+		Location:    "Shanghai",
+		Visibility:  "notvalid",
+	}
+	req := NewRequestWithJSON(t, "POST", "/api/v1/admin/users/user2/orgs", &org).
+		AddTokenAuth(token)
+	MakeRequest(t, req, http.StatusUnprocessableEntity)
 }
 
 func TestAPIAdminOrgCreateNotAdmin(t *testing.T) {
diff --git a/tests/integration/api_branch_test.go b/tests/integration/api_branch_test.go
index 63159f3c41..41b2c2efd1 100644
--- a/tests/integration/api_branch_test.go
+++ b/tests/integration/api_branch_test.go
@@ -9,14 +9,13 @@ import (
 	"testing"
 
 	auth_model "code.gitea.io/gitea/models/auth"
-	"code.gitea.io/gitea/models/db"
 	git_model "code.gitea.io/gitea/models/git"
+	"code.gitea.io/gitea/models/unittest"
 	"code.gitea.io/gitea/modules/git"
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/tests"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func testAPIGetBranch(t *testing.T, branchName string, exists bool) {
@@ -234,35 +233,17 @@ func TestAPIBranchProtection(t *testing.T) {
 }
 
 func TestAPICreateBranchWithSyncBranches(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
-
-	branches, err := db.Find[git_model.Branch](db.DefaultContext, git_model.FindBranchOptions{
-		RepoID: 1,
-	})
-	require.NoError(t, err)
-	assert.Len(t, branches, 4)
-
-	// make a broke repository with no branch on database
-	_, err = db.DeleteByBean(db.DefaultContext, git_model.Branch{RepoID: 1})
-	require.NoError(t, err)
-
 	onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
+		unittest.AssertCount(t, &git_model.Branch{RepoID: 1}, 4)
+
+		// make a broke repository with no branch on database
+		unittest.AssertSuccessfulDelete(t, &git_model.Branch{RepoID: 1})
+
 		ctx := NewAPITestContext(t, "user2", "repo1", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
 		giteaURL.Path = ctx.GitPath()
 
 		testAPICreateBranch(t, ctx.Session, "user2", "repo1", "", "new_branch", http.StatusCreated)
-	})
 
-	branches, err = db.Find[git_model.Branch](db.DefaultContext, git_model.FindBranchOptions{
-		RepoID: 1,
+		unittest.AssertExistsIf(t, true, &git_model.Branch{RepoID: 1, Name: "new_branch"})
 	})
-	require.NoError(t, err)
-	assert.Len(t, branches, 5)
-
-	branches, err = db.Find[git_model.Branch](db.DefaultContext, git_model.FindBranchOptions{
-		RepoID:  1,
-		Keyword: "new_branch",
-	})
-	require.NoError(t, err)
-	assert.Len(t, branches, 1)
 }
diff --git a/tests/integration/api_fork_test.go b/tests/integration/api_fork_test.go
index b80b4c6645..6a6b05f700 100644
--- a/tests/integration/api_fork_test.go
+++ b/tests/integration/api_fork_test.go
@@ -7,7 +7,6 @@ package integration
 import (
 	"fmt"
 	"net/http"
-	"net/url"
 	"testing"
 
 	auth_model "code.gitea.io/gitea/models/auth"
@@ -86,25 +85,24 @@ func TestCreateForkNoLogin(t *testing.T) {
 }
 
 func TestAPIDisabledForkRepo(t *testing.T) {
-	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		defer test.MockVariableValue(&setting.Repository.DisableForks, true)()
-		defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())()
+	defer test.MockVariableValue(&setting.Repository.DisableForks, true)()
+	defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())()
+	defer tests.PrepareTestEnv(t)()
 
-		t.Run("fork listing", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
+	t.Run("fork listing", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
 
-			req := NewRequest(t, "GET", "/api/v1/repos/user2/repo1/forks")
-			MakeRequest(t, req, http.StatusNotFound)
-		})
+		req := NewRequest(t, "GET", "/api/v1/repos/user2/repo1/forks")
+		MakeRequest(t, req, http.StatusNotFound)
+	})
 
-		t.Run("forking", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
+	t.Run("forking", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
 
-			session := loginUser(t, "user5")
-			token := getTokenForLoggedInUser(t, session)
+		session := loginUser(t, "user5")
+		token := getTokenForLoggedInUser(t, session)
 
-			req := NewRequestWithJSON(t, "POST", "/api/v1/repos/user2/repo1/forks", &api.CreateForkOption{}).AddTokenAuth(token)
-			session.MakeRequest(t, req, http.StatusNotFound)
-		})
+		req := NewRequestWithJSON(t, "POST", "/api/v1/repos/user2/repo1/forks", &api.CreateForkOption{}).AddTokenAuth(token)
+		session.MakeRequest(t, req, http.StatusNotFound)
 	})
 }
diff --git a/tests/integration/api_nodeinfo_test.go b/tests/integration/api_nodeinfo_test.go
index 33d06ed1b4..d000083717 100644
--- a/tests/integration/api_nodeinfo_test.go
+++ b/tests/integration/api_nodeinfo_test.go
@@ -5,35 +5,31 @@ package integration
 
 import (
 	"net/http"
-	"net/url"
 	"testing"
 
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
+	"code.gitea.io/gitea/modules/test"
 	"code.gitea.io/gitea/routers"
+	"code.gitea.io/gitea/tests"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestNodeinfo(t *testing.T) {
-	setting.Federation.Enabled = true
-	testWebRoutes = routers.NormalRoutes()
-	defer func() {
-		setting.Federation.Enabled = false
-		testWebRoutes = routers.NormalRoutes()
-	}()
+	defer test.MockVariableValue(&setting.Federation.Enabled, true)()
+	defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())()
+	defer tests.PrepareTestEnv(t)()
 
-	onGiteaRun(t, func(*testing.T, *url.URL) {
-		req := NewRequest(t, "GET", "/api/v1/nodeinfo")
-		resp := MakeRequest(t, req, http.StatusOK)
-		VerifyJSONSchema(t, resp, "nodeinfo_2.1.json")
+	req := NewRequest(t, "GET", "/api/v1/nodeinfo")
+	resp := MakeRequest(t, req, http.StatusOK)
+	VerifyJSONSchema(t, resp, "nodeinfo_2.1.json")
 
-		var nodeinfo api.NodeInfo
-		DecodeJSON(t, resp, &nodeinfo)
-		assert.True(t, nodeinfo.OpenRegistrations)
-		assert.Equal(t, "forgejo", nodeinfo.Software.Name)
-		assert.Equal(t, 29, nodeinfo.Usage.Users.Total)
-		assert.Equal(t, 22, nodeinfo.Usage.LocalPosts)
-		assert.Equal(t, 4, nodeinfo.Usage.LocalComments)
-	})
+	var nodeinfo api.NodeInfo
+	DecodeJSON(t, resp, &nodeinfo)
+	assert.True(t, nodeinfo.OpenRegistrations)
+	assert.Equal(t, "forgejo", nodeinfo.Software.Name)
+	assert.Equal(t, 29, nodeinfo.Usage.Users.Total)
+	assert.Equal(t, 22, nodeinfo.Usage.LocalPosts)
+	assert.Equal(t, 4, nodeinfo.Usage.LocalComments)
 }
diff --git a/tests/integration/api_org_test.go b/tests/integration/api_org_test.go
index 70d3a446f7..3a7c81ca3a 100644
--- a/tests/integration/api_org_test.go
+++ b/tests/integration/api_org_test.go
@@ -6,7 +6,6 @@ package integration
 import (
 	"fmt"
 	"net/http"
-	"net/url"
 	"strings"
 	"testing"
 
@@ -19,150 +18,144 @@ import (
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
+	"code.gitea.io/gitea/modules/test"
 	"code.gitea.io/gitea/tests"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestAPIOrgCreate(t *testing.T) {
-	onGiteaRun(t, func(*testing.T, *url.URL) {
-		token := getUserToken(t, "user1", auth_model.AccessTokenScopeWriteOrganization)
+	defer tests.PrepareTestEnv(t)()
+	token := getUserToken(t, "user1", auth_model.AccessTokenScopeWriteOrganization)
 
-		org := api.CreateOrgOption{
-			UserName:    "user1_org",
-			FullName:    "User1's organization",
-			Description: "This organization created by user1",
-			Website:     "https://try.gitea.io",
-			Location:    "Shanghai",
-			Visibility:  "limited",
-		}
-		req := NewRequestWithJSON(t, "POST", "/api/v1/orgs", &org).
-			AddTokenAuth(token)
-		resp := MakeRequest(t, req, http.StatusCreated)
+	org := api.CreateOrgOption{
+		UserName:    "user1_org",
+		FullName:    "User1's organization",
+		Description: "This organization created by user1",
+		Website:     "https://try.gitea.io",
+		Location:    "Shanghai",
+		Visibility:  "limited",
+	}
+	req := NewRequestWithJSON(t, "POST", "/api/v1/orgs", &org).
+		AddTokenAuth(token)
+	resp := MakeRequest(t, req, http.StatusCreated)
 
-		var apiOrg api.Organization
-		DecodeJSON(t, resp, &apiOrg)
+	var apiOrg api.Organization
+	DecodeJSON(t, resp, &apiOrg)
 
-		assert.Equal(t, org.UserName, apiOrg.Name)
-		assert.Equal(t, org.FullName, apiOrg.FullName)
-		assert.Equal(t, org.Description, apiOrg.Description)
-		assert.Equal(t, org.Website, apiOrg.Website)
-		assert.Equal(t, org.Location, apiOrg.Location)
-		assert.Equal(t, org.Visibility, apiOrg.Visibility)
+	assert.Equal(t, org.UserName, apiOrg.Name)
+	assert.Equal(t, org.FullName, apiOrg.FullName)
+	assert.Equal(t, org.Description, apiOrg.Description)
+	assert.Equal(t, org.Website, apiOrg.Website)
+	assert.Equal(t, org.Location, apiOrg.Location)
+	assert.Equal(t, org.Visibility, apiOrg.Visibility)
 
-		unittest.AssertExistsAndLoadBean(t, &user_model.User{
-			Name:      org.UserName,
-			LowerName: strings.ToLower(org.UserName),
-			FullName:  org.FullName,
-		})
-
-		// Check owner team permission
-		ownerTeam, _ := org_model.GetOwnerTeam(db.DefaultContext, apiOrg.ID)
-
-		for _, ut := range unit_model.AllRepoUnitTypes {
-			up := perm.AccessModeOwner
-			if ut == unit_model.TypeExternalTracker || ut == unit_model.TypeExternalWiki {
-				up = perm.AccessModeRead
-			}
-			unittest.AssertExistsAndLoadBean(t, &org_model.TeamUnit{
-				OrgID:      apiOrg.ID,
-				TeamID:     ownerTeam.ID,
-				Type:       ut,
-				AccessMode: up,
-			})
-		}
-
-		req = NewRequestf(t, "GET", "/api/v1/orgs/%s", org.UserName).
-			AddTokenAuth(token)
-		resp = MakeRequest(t, req, http.StatusOK)
-		DecodeJSON(t, resp, &apiOrg)
-		assert.EqualValues(t, org.UserName, apiOrg.Name)
-
-		req = NewRequestf(t, "GET", "/api/v1/orgs/%s/repos", org.UserName).
-			AddTokenAuth(token)
-		resp = MakeRequest(t, req, http.StatusOK)
-
-		var repos []*api.Repository
-		DecodeJSON(t, resp, &repos)
-		for _, repo := range repos {
-			assert.False(t, repo.Private)
-		}
-
-		req = NewRequestf(t, "GET", "/api/v1/orgs/%s/members", org.UserName).
-			AddTokenAuth(token)
-		resp = MakeRequest(t, req, http.StatusOK)
-
-		// user1 on this org is public
-		var users []*api.User
-		DecodeJSON(t, resp, &users)
-		assert.Len(t, users, 1)
-		assert.EqualValues(t, "user1", users[0].UserName)
+	unittest.AssertExistsAndLoadBean(t, &user_model.User{
+		Name:      org.UserName,
+		LowerName: strings.ToLower(org.UserName),
+		FullName:  org.FullName,
 	})
+
+	// Check owner team permission
+	ownerTeam, _ := org_model.GetOwnerTeam(db.DefaultContext, apiOrg.ID)
+
+	for _, ut := range unit_model.AllRepoUnitTypes {
+		up := perm.AccessModeOwner
+		if ut == unit_model.TypeExternalTracker || ut == unit_model.TypeExternalWiki {
+			up = perm.AccessModeRead
+		}
+		unittest.AssertExistsAndLoadBean(t, &org_model.TeamUnit{
+			OrgID:      apiOrg.ID,
+			TeamID:     ownerTeam.ID,
+			Type:       ut,
+			AccessMode: up,
+		})
+	}
+
+	req = NewRequestf(t, "GET", "/api/v1/orgs/%s", org.UserName).
+		AddTokenAuth(token)
+	resp = MakeRequest(t, req, http.StatusOK)
+	DecodeJSON(t, resp, &apiOrg)
+	assert.EqualValues(t, org.UserName, apiOrg.Name)
+
+	req = NewRequestf(t, "GET", "/api/v1/orgs/%s/repos", org.UserName).
+		AddTokenAuth(token)
+	resp = MakeRequest(t, req, http.StatusOK)
+
+	var repos []*api.Repository
+	DecodeJSON(t, resp, &repos)
+	for _, repo := range repos {
+		assert.False(t, repo.Private)
+	}
+
+	req = NewRequestf(t, "GET", "/api/v1/orgs/%s/members", org.UserName).
+		AddTokenAuth(token)
+	resp = MakeRequest(t, req, http.StatusOK)
+
+	// user1 on this org is public
+	var users []*api.User
+	DecodeJSON(t, resp, &users)
+	assert.Len(t, users, 1)
+	assert.EqualValues(t, "user1", users[0].UserName)
 }
 
 func TestAPIOrgEdit(t *testing.T) {
-	onGiteaRun(t, func(*testing.T, *url.URL) {
-		session := loginUser(t, "user1")
+	defer tests.PrepareTestEnv(t)()
+	session := loginUser(t, "user1")
 
-		token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteOrganization)
-		org := api.EditOrgOption{
-			FullName:    "Org3 organization new full name",
-			Description: "A new description",
-			Website:     "https://try.gitea.io/new",
-			Location:    "Beijing",
-			Visibility:  "private",
-		}
-		req := NewRequestWithJSON(t, "PATCH", "/api/v1/orgs/org3", &org).
-			AddTokenAuth(token)
-		resp := MakeRequest(t, req, http.StatusOK)
+	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteOrganization)
+	org := api.EditOrgOption{
+		FullName:    "Org3 organization new full name",
+		Description: "A new description",
+		Website:     "https://try.gitea.io/new",
+		Location:    "Beijing",
+		Visibility:  "private",
+	}
+	req := NewRequestWithJSON(t, "PATCH", "/api/v1/orgs/org3", &org).
+		AddTokenAuth(token)
+	resp := MakeRequest(t, req, http.StatusOK)
 
-		var apiOrg api.Organization
-		DecodeJSON(t, resp, &apiOrg)
+	var apiOrg api.Organization
+	DecodeJSON(t, resp, &apiOrg)
 
-		assert.Equal(t, "org3", apiOrg.Name)
-		assert.Equal(t, org.FullName, apiOrg.FullName)
-		assert.Equal(t, org.Description, apiOrg.Description)
-		assert.Equal(t, org.Website, apiOrg.Website)
-		assert.Equal(t, org.Location, apiOrg.Location)
-		assert.Equal(t, org.Visibility, apiOrg.Visibility)
-	})
+	assert.Equal(t, "org3", apiOrg.Name)
+	assert.Equal(t, org.FullName, apiOrg.FullName)
+	assert.Equal(t, org.Description, apiOrg.Description)
+	assert.Equal(t, org.Website, apiOrg.Website)
+	assert.Equal(t, org.Location, apiOrg.Location)
+	assert.Equal(t, org.Visibility, apiOrg.Visibility)
 }
 
 func TestAPIOrgEditBadVisibility(t *testing.T) {
-	onGiteaRun(t, func(*testing.T, *url.URL) {
-		session := loginUser(t, "user1")
+	defer tests.PrepareTestEnv(t)()
+	session := loginUser(t, "user1")
 
-		token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteOrganization)
-		org := api.EditOrgOption{
-			FullName:    "Org3 organization new full name",
-			Description: "A new description",
-			Website:     "https://try.gitea.io/new",
-			Location:    "Beijing",
-			Visibility:  "badvisibility",
-		}
-		req := NewRequestWithJSON(t, "PATCH", "/api/v1/orgs/org3", &org).
-			AddTokenAuth(token)
-		MakeRequest(t, req, http.StatusUnprocessableEntity)
-	})
+	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteOrganization)
+	org := api.EditOrgOption{
+		FullName:    "Org3 organization new full name",
+		Description: "A new description",
+		Website:     "https://try.gitea.io/new",
+		Location:    "Beijing",
+		Visibility:  "badvisibility",
+	}
+	req := NewRequestWithJSON(t, "PATCH", "/api/v1/orgs/org3", &org).
+		AddTokenAuth(token)
+	MakeRequest(t, req, http.StatusUnprocessableEntity)
 }
 
 func TestAPIOrgDeny(t *testing.T) {
-	onGiteaRun(t, func(*testing.T, *url.URL) {
-		setting.Service.RequireSignInView = true
-		defer func() {
-			setting.Service.RequireSignInView = false
-		}()
+	defer tests.PrepareTestEnv(t)()
+	defer test.MockVariableValue(&setting.Service.RequireSignInView, true)()
 
-		orgName := "user1_org"
-		req := NewRequestf(t, "GET", "/api/v1/orgs/%s", orgName)
-		MakeRequest(t, req, http.StatusNotFound)
+	orgName := "user1_org"
+	req := NewRequestf(t, "GET", "/api/v1/orgs/%s", orgName)
+	MakeRequest(t, req, http.StatusNotFound)
 
-		req = NewRequestf(t, "GET", "/api/v1/orgs/%s/repos", orgName)
-		MakeRequest(t, req, http.StatusNotFound)
+	req = NewRequestf(t, "GET", "/api/v1/orgs/%s/repos", orgName)
+	MakeRequest(t, req, http.StatusNotFound)
 
-		req = NewRequestf(t, "GET", "/api/v1/orgs/%s/members", orgName)
-		MakeRequest(t, req, http.StatusNotFound)
-	})
+	req = NewRequestf(t, "GET", "/api/v1/orgs/%s/members", orgName)
+	MakeRequest(t, req, http.StatusNotFound)
 }
 
 func TestAPIGetAll(t *testing.T) {
@@ -192,37 +185,36 @@ func TestAPIGetAll(t *testing.T) {
 }
 
 func TestAPIOrgSearchEmptyTeam(t *testing.T) {
-	onGiteaRun(t, func(*testing.T, *url.URL) {
-		token := getUserToken(t, "user1", auth_model.AccessTokenScopeWriteOrganization)
-		orgName := "org_with_empty_team"
+	defer tests.PrepareTestEnv(t)()
+	token := getUserToken(t, "user1", auth_model.AccessTokenScopeWriteOrganization)
+	orgName := "org_with_empty_team"
 
-		// create org
-		req := NewRequestWithJSON(t, "POST", "/api/v1/orgs", &api.CreateOrgOption{
-			UserName: orgName,
-		}).AddTokenAuth(token)
-		MakeRequest(t, req, http.StatusCreated)
+	// create org
+	req := NewRequestWithJSON(t, "POST", "/api/v1/orgs", &api.CreateOrgOption{
+		UserName: orgName,
+	}).AddTokenAuth(token)
+	MakeRequest(t, req, http.StatusCreated)
 
-		// create team with no member
-		req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/orgs/%s/teams", orgName), &api.CreateTeamOption{
-			Name:                    "Empty",
-			IncludesAllRepositories: true,
-			Permission:              "read",
-			Units:                   []string{"repo.code", "repo.issues", "repo.ext_issues", "repo.wiki", "repo.pulls"},
-		}).AddTokenAuth(token)
-		MakeRequest(t, req, http.StatusCreated)
+	// create team with no member
+	req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/orgs/%s/teams", orgName), &api.CreateTeamOption{
+		Name:                    "Empty",
+		IncludesAllRepositories: true,
+		Permission:              "read",
+		Units:                   []string{"repo.code", "repo.issues", "repo.ext_issues", "repo.wiki", "repo.pulls"},
+	}).AddTokenAuth(token)
+	MakeRequest(t, req, http.StatusCreated)
 
-		// case-insensitive search for teams that have no members
-		req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/orgs/%s/teams/search?q=%s", orgName, "empty")).
-			AddTokenAuth(token)
-		resp := MakeRequest(t, req, http.StatusOK)
-		data := struct {
-			Ok   bool
-			Data []*api.Team
-		}{}
-		DecodeJSON(t, resp, &data)
-		assert.True(t, data.Ok)
-		if assert.Len(t, data.Data, 1) {
-			assert.EqualValues(t, "Empty", data.Data[0].Name)
-		}
-	})
+	// case-insensitive search for teams that have no members
+	req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/orgs/%s/teams/search?q=%s", orgName, "empty")).
+		AddTokenAuth(token)
+	resp := MakeRequest(t, req, http.StatusOK)
+	data := struct {
+		Ok   bool
+		Data []*api.Team
+	}{}
+	DecodeJSON(t, resp, &data)
+	assert.True(t, data.Ok)
+	if assert.Len(t, data.Data, 1) {
+		assert.EqualValues(t, "Empty", data.Data[0].Name)
+	}
 }
diff --git a/tests/integration/last_updated_time_test.go b/tests/integration/last_updated_time_test.go
index 54c0eeb629..1d9240a31f 100644
--- a/tests/integration/last_updated_time_test.go
+++ b/tests/integration/last_updated_time_test.go
@@ -2,60 +2,59 @@ package integration
 
 import (
 	"net/http"
-	"net/url"
 	"path"
 	"strings"
 	"testing"
 
+	"code.gitea.io/gitea/tests"
+
 	"github.com/PuerkitoBio/goquery"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestRepoLastUpdatedTime(t *testing.T) {
-	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		user := "user2"
-		session := loginUser(t, user)
+	defer tests.PrepareTestEnv(t)()
+	user := "user2"
+	session := loginUser(t, user)
 
-		req := NewRequest(t, "GET", "/explore/repos?q=repo1")
-		resp := session.MakeRequest(t, req, http.StatusOK)
-		doc := NewHTMLParser(t, resp.Body)
-		node := doc.doc.Find(".flex-item-body").First()
-		{
-			buf := ""
-			findTextNonNested(t, node, &buf)
-			assert.Equal(t, "Updated", strings.TrimSpace(buf))
-		}
+	req := NewRequest(t, "GET", "/explore/repos?q=repo1")
+	resp := session.MakeRequest(t, req, http.StatusOK)
+	doc := NewHTMLParser(t, resp.Body)
+	node := doc.doc.Find(".flex-item-body").First()
+	{
+		buf := ""
+		findTextNonNested(t, node, &buf)
+		assert.Equal(t, "Updated", strings.TrimSpace(buf))
+	}
 
-		// Relative time should be present as a descendent
-		{
-			relativeTime := node.Find("relative-time").Text()
-			assert.True(t, strings.HasPrefix(relativeTime, "19")) // ~1970, might underflow with timezone
-		}
-	})
+	// Relative time should be present as a descendent
+	{
+		relativeTime := node.Find("relative-time").Text()
+		assert.True(t, strings.HasPrefix(relativeTime, "19")) // ~1970, might underflow with timezone
+	}
 }
 
 func TestBranchLastUpdatedTime(t *testing.T) {
-	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		user := "user2"
-		repo := "repo1"
-		session := loginUser(t, user)
+	defer tests.PrepareTestEnv(t)()
+	user := "user2"
+	repo := "repo1"
+	session := loginUser(t, user)
 
-		req := NewRequest(t, "GET", path.Join(user, repo, "branches"))
-		resp := session.MakeRequest(t, req, http.StatusOK)
-		doc := NewHTMLParser(t, resp.Body)
-		node := doc.doc.Find("p:has(span.commit-message)")
+	req := NewRequest(t, "GET", path.Join(user, repo, "branches"))
+	resp := session.MakeRequest(t, req, http.StatusOK)
+	doc := NewHTMLParser(t, resp.Body)
+	node := doc.doc.Find("p:has(span.commit-message)")
 
-		{
-			buf := ""
-			findTextNonNested(t, node, &buf)
-			assert.True(t, strings.Contains(buf, "Updated"))
-		}
+	{
+		buf := ""
+		findTextNonNested(t, node, &buf)
+		assert.True(t, strings.Contains(buf, "Updated"))
+	}
 
-		{
-			relativeTime := node.Find("relative-time").Text()
-			assert.True(t, strings.HasPrefix(relativeTime, "2017"))
-		}
-	})
+	{
+		relativeTime := node.Find("relative-time").Text()
+		assert.True(t, strings.HasPrefix(relativeTime, "2017"))
+	}
 }
 
 // Find all text that are direct descendents
diff --git a/tests/integration/pull_commit_test.go b/tests/integration/pull_commit_test.go
index 477f01725d..5ef6d6ceca 100644
--- a/tests/integration/pull_commit_test.go
+++ b/tests/integration/pull_commit_test.go
@@ -5,30 +5,29 @@ package integration
 
 import (
 	"net/http"
-	"net/url"
 	"testing"
 
 	pull_service "code.gitea.io/gitea/services/pull"
+	"code.gitea.io/gitea/tests"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestListPullCommits(t *testing.T) {
-	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		session := loginUser(t, "user5")
-		req := NewRequest(t, "GET", "/user2/repo1/pulls/3/commits/list")
-		resp := session.MakeRequest(t, req, http.StatusOK)
+	defer tests.PrepareTestEnv(t)()
+	session := loginUser(t, "user5")
+	req := NewRequest(t, "GET", "/user2/repo1/pulls/3/commits/list")
+	resp := session.MakeRequest(t, req, http.StatusOK)
 
-		var pullCommitList struct {
-			Commits             []pull_service.CommitInfo `json:"commits"`
-			LastReviewCommitSha string                    `json:"last_review_commit_sha"`
-		}
-		DecodeJSON(t, resp, &pullCommitList)
+	var pullCommitList struct {
+		Commits             []pull_service.CommitInfo `json:"commits"`
+		LastReviewCommitSha string                    `json:"last_review_commit_sha"`
+	}
+	DecodeJSON(t, resp, &pullCommitList)
 
-		if assert.Len(t, pullCommitList.Commits, 2) {
-			assert.Equal(t, "5f22f7d0d95d614d25a5b68592adb345a4b5c7fd", pullCommitList.Commits[0].ID)
-			assert.Equal(t, "4a357436d925b5c974181ff12a994538ddc5a269", pullCommitList.Commits[1].ID)
-		}
-		assert.Equal(t, "4a357436d925b5c974181ff12a994538ddc5a269", pullCommitList.LastReviewCommitSha)
-	})
+	if assert.Len(t, pullCommitList.Commits, 2) {
+		assert.Equal(t, "5f22f7d0d95d614d25a5b68592adb345a4b5c7fd", pullCommitList.Commits[0].ID)
+		assert.Equal(t, "4a357436d925b5c974181ff12a994538ddc5a269", pullCommitList.Commits[1].ID)
+	}
+	assert.Equal(t, "4a357436d925b5c974181ff12a994538ddc5a269", pullCommitList.LastReviewCommitSha)
 }
diff --git a/tests/integration/pull_review_test.go b/tests/integration/pull_review_test.go
index fc3e9be4a0..b3380cc6b8 100644
--- a/tests/integration/pull_review_test.go
+++ b/tests/integration/pull_review_test.go
@@ -18,7 +18,6 @@ import (
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unittest"
 	user_model "code.gitea.io/gitea/models/user"
-	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/test"
 	issue_service "code.gitea.io/gitea/services/issue"
@@ -283,32 +282,18 @@ func TestPullView_CodeOwner(t *testing.T) {
 	onGiteaRun(t, func(t *testing.T, u *url.URL) {
 		user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 
-		// Create the repo.
-		repo, err := repo_service.CreateRepositoryDirectly(db.DefaultContext, user2, user2, repo_service.CreateRepoOptions{
-			Name:             "test_codeowner",
-			Readme:           "Default",
-			AutoInit:         true,
-			ObjectFormatName: git.Sha1ObjectFormat.Name(),
-			DefaultBranch:    "master",
-		})
-		require.NoError(t, err)
-
-		// add CODEOWNERS to default branch
-		_, err = files_service.ChangeRepoFiles(db.DefaultContext, repo, user2, &files_service.ChangeRepoFilesOptions{
-			OldBranch: repo.DefaultBranch,
-			Files: []*files_service.ChangeRepoFile{
-				{
-					Operation:     "create",
-					TreePath:      "CODEOWNERS",
-					ContentReader: strings.NewReader("README.md @user5\n"),
-				},
+		repo, _, f := tests.CreateDeclarativeRepo(t, user2, "test_codeowner", nil, nil, []*files_service.ChangeRepoFile{
+			{
+				Operation:     "create",
+				TreePath:      "CODEOWNERS",
+				ContentReader: strings.NewReader("README.md @user5\n"),
 			},
 		})
-		require.NoError(t, err)
+		defer f()
 
 		t.Run("First Pull Request", func(t *testing.T) {
 			// create a new branch to prepare for pull request
-			_, err = files_service.ChangeRepoFiles(db.DefaultContext, repo, user2, &files_service.ChangeRepoFilesOptions{
+			_, err := files_service.ChangeRepoFiles(db.DefaultContext, repo, user2, &files_service.ChangeRepoFilesOptions{
 				NewBranch: "codeowner-basebranch",
 				Files: []*files_service.ChangeRepoFile{
 					{
@@ -328,7 +313,7 @@ func TestPullView_CodeOwner(t *testing.T) {
 			unittest.AssertExistsIf(t, true, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 5})
 			require.NoError(t, pr.LoadIssue(db.DefaultContext))
 
-			err := issue_service.ChangeTitle(db.DefaultContext, pr.Issue, user2, "[WIP] Test Pull Request")
+			err = issue_service.ChangeTitle(db.DefaultContext, pr.Issue, user2, "[WIP] Test Pull Request")
 			require.NoError(t, err)
 			prUpdated1 := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID})
 			require.NoError(t, prUpdated1.LoadIssue(db.DefaultContext))
@@ -342,7 +327,7 @@ func TestPullView_CodeOwner(t *testing.T) {
 		})
 
 		// change the default branch CODEOWNERS file to change README.md's codeowner
-		_, err = files_service.ChangeRepoFiles(db.DefaultContext, repo, user2, &files_service.ChangeRepoFilesOptions{
+		_, err := files_service.ChangeRepoFiles(db.DefaultContext, repo, user2, &files_service.ChangeRepoFilesOptions{
 			Files: []*files_service.ChangeRepoFile{
 				{
 					Operation:     "update",
diff --git a/tests/integration/rename_branch_test.go b/tests/integration/rename_branch_test.go
index a96cbf5623..20d4c9b48f 100644
--- a/tests/integration/rename_branch_test.go
+++ b/tests/integration/rename_branch_test.go
@@ -22,8 +22,6 @@ func TestRenameBranch(t *testing.T) {
 }
 
 func testRenameBranch(t *testing.T, u *url.URL) {
-	defer tests.PrepareTestEnv(t)()
-
 	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
 	unittest.AssertExistsAndLoadBean(t, &git_model.Branch{RepoID: repo.ID, Name: "master"})
 
diff --git a/tests/integration/repo_collaborator_test.go b/tests/integration/repo_collaborator_test.go
index beeb950f5a..292cd5862b 100644
--- a/tests/integration/repo_collaborator_test.go
+++ b/tests/integration/repo_collaborator_test.go
@@ -5,33 +5,33 @@ package integration
 
 import (
 	"net/http"
-	"net/url"
 	"strings"
 	"testing"
 
+	"code.gitea.io/gitea/tests"
+
 	"github.com/stretchr/testify/assert"
 )
 
 // TestRepoCollaborators is a test for contents of Collaborators tab in the repo settings
 // It only covers a few elements and can be extended as needed
 func TestRepoCollaborators(t *testing.T) {
-	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		session := loginUser(t, "user2")
+	defer tests.PrepareTestEnv(t)()
+	session := loginUser(t, "user2")
 
-		// Visit Collaborators tab of repo settings
-		response := session.MakeRequest(t, NewRequest(t, "GET", "/user2/repo1/settings/collaboration"), http.StatusOK)
-		page := NewHTMLParser(t, response.Body).Find(".repo-setting-content")
+	// Visit Collaborators tab of repo settings
+	response := session.MakeRequest(t, NewRequest(t, "GET", "/user2/repo1/settings/collaboration"), http.StatusOK)
+	page := NewHTMLParser(t, response.Body).Find(".repo-setting-content")
 
-		// Veirfy header
-		assert.EqualValues(t, "Collaborators", strings.TrimSpace(page.Find("h4").Text()))
+	// Veirfy header
+	assert.EqualValues(t, "Collaborators", strings.TrimSpace(page.Find("h4").Text()))
 
-		// Veirfy button text
-		page = page.Find("#repo-collab-form")
-		assert.EqualValues(t, "Add collaborator", strings.TrimSpace(page.Find("button.primary").Text()))
+	// Veirfy button text
+	page = page.Find("#repo-collab-form")
+	assert.EqualValues(t, "Add collaborator", strings.TrimSpace(page.Find("button.primary").Text()))
 
-		// Veirfy placeholder
-		placeholder, exists := page.Find("#search-user-box input").Attr("placeholder")
-		assert.True(t, exists)
-		assert.EqualValues(t, "Search users...", placeholder)
-	})
+	// Veirfy placeholder
+	placeholder, exists := page.Find("#search-user-box input").Attr("placeholder")
+	assert.True(t, exists)
+	assert.EqualValues(t, "Search users...", placeholder)
 }
diff --git a/tests/integration/repo_migration_ui_test.go b/tests/integration/repo_migration_ui_test.go
index 40688d4a60..594b09b490 100644
--- a/tests/integration/repo_migration_ui_test.go
+++ b/tests/integration/repo_migration_ui_test.go
@@ -5,26 +5,26 @@ package integration
 
 import (
 	"net/http"
-	"net/url"
 	"testing"
 
+	"code.gitea.io/gitea/tests"
+
 	"github.com/PuerkitoBio/goquery"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestRepoMigrationUI(t *testing.T) {
-	onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
-		sessionUser1 := loginUser(t, "user1")
-		// Nothing is tested in plain Git migration form right now
-		testRepoMigrationFormGitHub(t, sessionUser1)
-		testRepoMigrationFormGitea(t, sessionUser1)
-		testRepoMigrationFormGitLab(t, sessionUser1)
-		testRepoMigrationFormGogs(t, sessionUser1)
-		testRepoMigrationFormOneDev(t, sessionUser1)
-		testRepoMigrationFormGitBucket(t, sessionUser1)
-		testRepoMigrationFormCodebase(t, sessionUser1)
-		testRepoMigrationFormForgejo(t, sessionUser1)
-	})
+	defer tests.PrepareTestEnv(t)()
+	sessionUser1 := loginUser(t, "user1")
+	// Nothing is tested in plain Git migration form right now
+	testRepoMigrationFormGitHub(t, sessionUser1)
+	testRepoMigrationFormGitea(t, sessionUser1)
+	testRepoMigrationFormGitLab(t, sessionUser1)
+	testRepoMigrationFormGogs(t, sessionUser1)
+	testRepoMigrationFormOneDev(t, sessionUser1)
+	testRepoMigrationFormGitBucket(t, sessionUser1)
+	testRepoMigrationFormCodebase(t, sessionUser1)
+	testRepoMigrationFormForgejo(t, sessionUser1)
 }
 
 func testRepoMigrationFormGitHub(t *testing.T, session *TestSession) {
diff --git a/tests/integration/repo_tag_test.go b/tests/integration/repo_tag_test.go
index 808d2e17e6..06b6c30383 100644
--- a/tests/integration/repo_tag_test.go
+++ b/tests/integration/repo_tag_test.go
@@ -11,8 +11,6 @@ import (
 	"testing"
 
 	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/models/db"
-	git_model "code.gitea.io/gitea/models/git"
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unittest"
 	user_model "code.gitea.io/gitea/models/user"
@@ -31,20 +29,6 @@ func TestTagViewWithoutRelease(t *testing.T) {
 	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
 	owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
 
-	defer func() {
-		releases, err := db.Find[repo_model.Release](db.DefaultContext, repo_model.FindReleasesOptions{
-			IncludeTags: true,
-			TagNames:    []string{"no-release"},
-			RepoID:      repo.ID,
-		})
-		require.NoError(t, err)
-
-		for _, release := range releases {
-			_, err = db.DeleteByID[repo_model.Release](db.DefaultContext, release.ID)
-			require.NoError(t, err)
-		}
-	}()
-
 	err := release.CreateNewTag(git.DefaultContext, owner, repo, "master", "no-release", "release-less tag")
 	require.NoError(t, err)
 
@@ -70,27 +54,27 @@ func TestTagViewWithoutRelease(t *testing.T) {
 }
 
 func TestCreateNewTagProtected(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+		owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
 
-	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
-	owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
+		t.Run("Code", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
 
-	t.Run("Code", func(t *testing.T) {
-		defer tests.PrintCurrentTest(t)()
+			err := release.CreateNewTag(git.DefaultContext, owner, repo, "master", "t-first", "first tag")
+			require.NoError(t, err)
 
-		err := release.CreateNewTag(git.DefaultContext, owner, repo, "master", "t-first", "first tag")
-		require.NoError(t, err)
+			err = release.CreateNewTag(git.DefaultContext, owner, repo, "master", "v-2", "second tag")
+			require.Error(t, err)
+			assert.True(t, models.IsErrProtectedTagName(err))
 
-		err = release.CreateNewTag(git.DefaultContext, owner, repo, "master", "v-2", "second tag")
-		require.Error(t, err)
-		assert.True(t, models.IsErrProtectedTagName(err))
+			err = release.CreateNewTag(git.DefaultContext, owner, repo, "master", "v-1.1", "third tag")
+			require.NoError(t, err)
+		})
 
-		err = release.CreateNewTag(git.DefaultContext, owner, repo, "master", "v-1.1", "third tag")
-		require.NoError(t, err)
-	})
+		t.Run("Git", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
 
-	t.Run("Git", func(t *testing.T) {
-		onGiteaRun(t, func(t *testing.T, u *url.URL) {
 			httpContext := NewAPITestContext(t, owner.Name, repo.Name)
 
 			dstPath := t.TempDir()
@@ -107,10 +91,10 @@ func TestCreateNewTagProtected(t *testing.T) {
 			require.Error(t, err)
 			assert.Contains(t, err.Error(), "Tag v-2 is protected")
 		})
-	})
 
-	t.Run("GitTagForce", func(t *testing.T) {
-		onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		t.Run("GitTagForce", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
 			httpContext := NewAPITestContext(t, owner.Name, repo.Name)
 
 			dstPath := t.TempDir()
@@ -120,13 +104,7 @@ func TestCreateNewTagProtected(t *testing.T) {
 
 			doGitClone(dstPath, u)(t)
 
-			_, _, err := git.NewCommand(git.DefaultContext, "tag", "v-1.1", "-m", "force update", "--force").RunStdString(&git.RunOpts{Dir: dstPath})
-			require.NoError(t, err)
-
-			_, _, err = git.NewCommand(git.DefaultContext, "push", "--tags").RunStdString(&git.RunOpts{Dir: dstPath})
-			require.NoError(t, err)
-
-			_, _, err = git.NewCommand(git.DefaultContext, "tag", "v-1.1", "-m", "force update v2", "--force").RunStdString(&git.RunOpts{Dir: dstPath})
+			_, _, err := git.NewCommand(git.DefaultContext, "tag", "v-1.1", "-m", "force update v2", "--force").RunStdString(&git.RunOpts{Dir: dstPath})
 			require.NoError(t, err)
 
 			_, _, err = git.NewCommand(git.DefaultContext, "push", "--tags").RunStdString(&git.RunOpts{Dir: dstPath})
@@ -142,27 +120,6 @@ func TestCreateNewTagProtected(t *testing.T) {
 			assert.Contains(t, tagsTab.Text(), "force update v2")
 		})
 	})
-
-	// Cleanup
-	releases, err := db.Find[repo_model.Release](db.DefaultContext, repo_model.FindReleasesOptions{
-		IncludeTags: true,
-		TagNames:    []string{"v-1", "v-1.1"},
-		RepoID:      repo.ID,
-	})
-	require.NoError(t, err)
-
-	for _, release := range releases {
-		_, err = db.DeleteByID[repo_model.Release](db.DefaultContext, release.ID)
-		require.NoError(t, err)
-	}
-
-	protectedTags, err := git_model.GetProtectedTags(db.DefaultContext, repo.ID)
-	require.NoError(t, err)
-
-	for _, protectedTag := range protectedTags {
-		err = git_model.DeleteProtectedTag(db.DefaultContext, protectedTag)
-		require.NoError(t, err)
-	}
 }
 
 func TestSyncRepoTags(t *testing.T) {
@@ -200,18 +157,5 @@ func TestSyncRepoTags(t *testing.T) {
 			require.NoError(t, repo_module.SyncRepoTags(git.DefaultContext, repo.ID))
 			testTag(t)
 		})
-
-		// Cleanup
-		releases, err := db.Find[repo_model.Release](db.DefaultContext, repo_model.FindReleasesOptions{
-			IncludeTags: true,
-			TagNames:    []string{"v2"},
-			RepoID:      repo.ID,
-		})
-		require.NoError(t, err)
-
-		for _, release := range releases {
-			_, err = db.DeleteByID[repo_model.Release](db.DefaultContext, release.ID)
-			require.NoError(t, err)
-		}
 	})
 }
diff --git a/tests/integration/repo_view_test.go b/tests/integration/repo_view_test.go
index 7c280e2491..46e75063bc 100644
--- a/tests/integration/repo_view_test.go
+++ b/tests/integration/repo_view_test.go
@@ -62,8 +62,9 @@ func createRepoAndGetContext(t *testing.T, files []string, deleteMdReadme bool)
 }
 
 func TestRepoView_FindReadme(t *testing.T) {
-	t.Run("PrioOneLocalizedMdReadme", func(t *testing.T) {
-		onGiteaRun(t, func(t *testing.T, u *url.URL) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		t.Run("PrioOneLocalizedMdReadme", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
 			ctx, f := createRepoAndGetContext(t, []string{"README.en.md", "README.en.org", "README.org", "README.txt", "README.tex"}, false)
 			defer f()
 
@@ -73,9 +74,8 @@ func TestRepoView_FindReadme(t *testing.T) {
 
 			assert.Equal(t, "README.en.md", file.Name())
 		})
-	})
-	t.Run("PrioTwoMdReadme", func(t *testing.T) {
-		onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		t.Run("PrioTwoMdReadme", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
 			ctx, f := createRepoAndGetContext(t, []string{"README.en.org", "README.org", "README.txt", "README.tex"}, false)
 			defer f()
 
@@ -85,9 +85,8 @@ func TestRepoView_FindReadme(t *testing.T) {
 
 			assert.Equal(t, "README.md", file.Name())
 		})
-	})
-	t.Run("PrioThreeLocalizedOrgReadme", func(t *testing.T) {
-		onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		t.Run("PrioThreeLocalizedOrgReadme", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
 			ctx, f := createRepoAndGetContext(t, []string{"README.en.org", "README.org", "README.txt", "README.tex"}, true)
 			defer f()
 
@@ -97,9 +96,8 @@ func TestRepoView_FindReadme(t *testing.T) {
 
 			assert.Equal(t, "README.en.org", file.Name())
 		})
-	})
-	t.Run("PrioFourOrgReadme", func(t *testing.T) {
-		onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		t.Run("PrioFourOrgReadme", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
 			ctx, f := createRepoAndGetContext(t, []string{"README.org", "README.txt", "README.tex"}, true)
 			defer f()
 
@@ -109,9 +107,8 @@ func TestRepoView_FindReadme(t *testing.T) {
 
 			assert.Equal(t, "README.org", file.Name())
 		})
-	})
-	t.Run("PrioFiveTxtReadme", func(t *testing.T) {
-		onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		t.Run("PrioFiveTxtReadme", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
 			ctx, f := createRepoAndGetContext(t, []string{"README.txt", "README", "README.tex"}, true)
 			defer f()
 
@@ -121,9 +118,8 @@ func TestRepoView_FindReadme(t *testing.T) {
 
 			assert.Equal(t, "README.txt", file.Name())
 		})
-	})
-	t.Run("PrioSixWithoutExtensionReadme", func(t *testing.T) {
-		onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		t.Run("PrioSixWithoutExtensionReadme", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
 			ctx, f := createRepoAndGetContext(t, []string{"README", "README.tex"}, true)
 			defer f()
 
@@ -133,9 +129,8 @@ func TestRepoView_FindReadme(t *testing.T) {
 
 			assert.Equal(t, "README", file.Name())
 		})
-	})
-	t.Run("PrioSevenAnyReadme", func(t *testing.T) {
-		onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		t.Run("PrioSevenAnyReadme", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
 			ctx, f := createRepoAndGetContext(t, []string{"README.tex"}, true)
 			defer f()
 
@@ -145,9 +140,8 @@ func TestRepoView_FindReadme(t *testing.T) {
 
 			assert.Equal(t, "README.tex", file.Name())
 		})
-	})
-	t.Run("DoNotPickReadmeIfNonPresent", func(t *testing.T) {
-		onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		t.Run("DoNotPickReadmeIfNonPresent", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
 			ctx, f := createRepoAndGetContext(t, []string{}, true)
 			defer f()
 
diff --git a/tests/integration/repofiles_change_test.go b/tests/integration/repofiles_change_test.go
index 9790b36183..1896971046 100644
--- a/tests/integration/repofiles_change_test.go
+++ b/tests/integration/repofiles_change_test.go
@@ -18,6 +18,7 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
 	files_service "code.gitea.io/gitea/services/repository/files"
+	"code.gitea.io/gitea/tests"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -63,8 +64,8 @@ func getDeleteRepoFilesOptions(repo *repo_model.Repository) *files_service.Chang
 		Files: []*files_service.ChangeRepoFile{
 			{
 				Operation: "delete",
-				TreePath:  "README.md",
-				SHA:       "4b4851ad51df6a7d9f25c979345979eaeb5b349f",
+				TreePath:  "README_new.md",
+				SHA:       "dbf8d00e022e05b7e5cf7e535de857de57925647",
 			},
 		},
 		LastCommitID: "",
@@ -244,184 +245,142 @@ func getExpectedFileResponseForRepofilesUpdate(commitID, filename, lastCommitSHA
 	}
 }
 
-func TestChangeRepoFilesForCreate(t *testing.T) {
-	// setup
+func TestChangeRepoFiles(t *testing.T) {
 	onGiteaRun(t, func(t *testing.T, u *url.URL) {
 		doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 		repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
-		opts := getCreateRepoFilesOptions(repo)
 
-		// test
-		filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
-
-		// asserts
+		gitRepo, err := gitrepo.OpenRepository(git.DefaultContext, repo)
 		require.NoError(t, err)
-		gitRepo, _ := gitrepo.OpenRepository(git.DefaultContext, repo)
 		defer gitRepo.Close()
 
-		commitID, _ := gitRepo.GetBranchCommitID(opts.NewBranch)
-		lastCommit, _ := gitRepo.GetCommitByPath("new/file.txt")
-		expectedFileResponse := getExpectedFileResponseForRepofilesCreate(commitID, lastCommit.ID.String())
-		assert.NotNil(t, expectedFileResponse)
-		if expectedFileResponse != nil {
+		t.Run("Create", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+			opts := getCreateRepoFilesOptions(repo)
+			filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
+			require.NoError(t, err)
+
+			commitID, err := gitRepo.GetBranchCommitID(opts.NewBranch)
+			require.NoError(t, err)
+			lastCommit, err := gitRepo.GetCommitByPath("new/file.txt")
+			require.NoError(t, err)
+			expectedFileResponse := getExpectedFileResponseForRepofilesCreate(commitID, lastCommit.ID.String())
 			assert.EqualValues(t, expectedFileResponse.Content, filesResponse.Files[0])
 			assert.EqualValues(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA)
 			assert.EqualValues(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL)
 			assert.EqualValues(t, expectedFileResponse.Commit.Author.Email, filesResponse.Commit.Author.Email)
 			assert.EqualValues(t, expectedFileResponse.Commit.Author.Name, filesResponse.Commit.Author.Name)
-		}
-	})
-}
+		})
 
-func TestChangeRepoFilesForUpdate(t *testing.T) {
-	// setup
-	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-		repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
-		opts := getUpdateRepoFilesOptions(repo)
+		t.Run("Update", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+			opts := getUpdateRepoFilesOptions(repo)
+			filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
+			require.NoError(t, err)
 
-		// test
-		filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
+			commit, err := gitRepo.GetBranchCommit(opts.NewBranch)
+			require.NoError(t, err)
+			lastCommit, err := commit.GetCommitByPath(opts.Files[0].TreePath)
+			require.NoError(t, err)
+			expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String())
+			assert.EqualValues(t, expectedFileResponse.Content, filesResponse.Files[0])
+			assert.EqualValues(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA)
+			assert.EqualValues(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL)
+			assert.EqualValues(t, expectedFileResponse.Commit.Author.Email, filesResponse.Commit.Author.Email)
+			assert.EqualValues(t, expectedFileResponse.Commit.Author.Name, filesResponse.Commit.Author.Name)
+		})
 
-		// asserts
-		require.NoError(t, err)
-		gitRepo, _ := gitrepo.OpenRepository(git.DefaultContext, repo)
-		defer gitRepo.Close()
+		t.Run("Update and move", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+			opts := getUpdateRepoFilesOptions(repo)
+			opts.Files[0].SHA = "dbf8d00e022e05b7e5cf7e535de857de57925647"
+			opts.Files[0].FromTreePath = "README.md"
+			opts.Files[0].TreePath = "README_new.md" // new file name, README_new.md
+			filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
+			require.NoError(t, err)
 
-		commit, _ := gitRepo.GetBranchCommit(opts.NewBranch)
-		lastCommit, _ := commit.GetCommitByPath(opts.Files[0].TreePath)
-		expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String())
-		assert.EqualValues(t, expectedFileResponse.Content, filesResponse.Files[0])
-		assert.EqualValues(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA)
-		assert.EqualValues(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL)
-		assert.EqualValues(t, expectedFileResponse.Commit.Author.Email, filesResponse.Commit.Author.Email)
-		assert.EqualValues(t, expectedFileResponse.Commit.Author.Name, filesResponse.Commit.Author.Name)
-	})
-}
+			commit, err := gitRepo.GetBranchCommit(opts.NewBranch)
+			require.NoError(t, err)
+			lastCommit, err := commit.GetCommitByPath(opts.Files[0].TreePath)
+			require.NoError(t, err)
+			expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String())
 
-func TestChangeRepoFilesForUpdateWithFileMove(t *testing.T) {
-	// setup
-	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-		repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
-		opts := getUpdateRepoFilesOptions(repo)
-		opts.Files[0].FromTreePath = "README.md"
-		opts.Files[0].TreePath = "README_new.md" // new file name, README_new.md
+			// assert that the old file no longer exists in the last commit of the branch
+			fromEntry, err := commit.GetTreeEntryByPath(opts.Files[0].FromTreePath)
+			switch err.(type) {
+			case git.ErrNotExist:
+				// correct, continue
+			default:
+				t.Fatalf("expected git.ErrNotExist, got:%v", err)
+			}
+			toEntry, err := commit.GetTreeEntryByPath(opts.Files[0].TreePath)
+			require.NoError(t, err)
+			assert.Nil(t, fromEntry)  // Should no longer exist here
+			assert.NotNil(t, toEntry) // Should exist here
+			// assert SHA has remained the same but paths use the new file name
+			assert.EqualValues(t, expectedFileResponse.Content.SHA, filesResponse.Files[0].SHA)
+			assert.EqualValues(t, expectedFileResponse.Content.Name, filesResponse.Files[0].Name)
+			assert.EqualValues(t, expectedFileResponse.Content.Path, filesResponse.Files[0].Path)
+			assert.EqualValues(t, expectedFileResponse.Content.URL, filesResponse.Files[0].URL)
+			assert.EqualValues(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA)
+			assert.EqualValues(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL)
+		})
 
-		// test
-		filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
+		t.Run("Change without branch names", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+			opts := getUpdateRepoFilesOptions(repo)
+			opts.OldBranch = ""
+			opts.NewBranch = ""
+			opts.Files[0].TreePath = "README_new.md"
+			opts.Files[0].SHA = "dbf8d00e022e05b7e5cf7e535de857de57925647"
 
-		// asserts
-		require.NoError(t, err)
-		gitRepo, _ := gitrepo.OpenRepository(git.DefaultContext, repo)
-		defer gitRepo.Close()
+			filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
+			require.NoError(t, err)
 
-		commit, _ := gitRepo.GetBranchCommit(opts.NewBranch)
-		lastCommit, _ := commit.GetCommitByPath(opts.Files[0].TreePath)
-		expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String())
-		// assert that the old file no longer exists in the last commit of the branch
-		fromEntry, err := commit.GetTreeEntryByPath(opts.Files[0].FromTreePath)
-		switch err.(type) {
-		case git.ErrNotExist:
-			// correct, continue
-		default:
-			t.Fatalf("expected git.ErrNotExist, got:%v", err)
-		}
-		toEntry, err := commit.GetTreeEntryByPath(opts.Files[0].TreePath)
-		require.NoError(t, err)
-		assert.Nil(t, fromEntry)  // Should no longer exist here
-		assert.NotNil(t, toEntry) // Should exist here
-		// assert SHA has remained the same but paths use the new file name
-		assert.EqualValues(t, expectedFileResponse.Content.SHA, filesResponse.Files[0].SHA)
-		assert.EqualValues(t, expectedFileResponse.Content.Name, filesResponse.Files[0].Name)
-		assert.EqualValues(t, expectedFileResponse.Content.Path, filesResponse.Files[0].Path)
-		assert.EqualValues(t, expectedFileResponse.Content.URL, filesResponse.Files[0].URL)
-		assert.EqualValues(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA)
-		assert.EqualValues(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL)
-	})
-}
+			commit, _ := gitRepo.GetBranchCommit(repo.DefaultBranch)
+			lastCommit, _ := commit.GetCommitByPath(opts.Files[0].TreePath)
+			expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String())
+			assert.EqualValues(t, expectedFileResponse.Content, filesResponse.Files[0])
+		})
 
-// Test opts with branch names removed, should get same results as above test
-func TestChangeRepoFilesWithoutBranchNames(t *testing.T) {
-	// setup
-	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-		repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
-		opts := getUpdateRepoFilesOptions(repo)
-		opts.OldBranch = ""
-		opts.NewBranch = ""
+		t.Run("Delete files", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+			opts := getDeleteRepoFilesOptions(repo)
 
-		// test
-		filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
+			filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
+			require.NoError(t, err)
+			expectedFileResponse := getExpectedFileResponseForRepofilesDelete()
+			assert.NotNil(t, filesResponse)
+			assert.Nil(t, filesResponse.Files[0])
+			assert.EqualValues(t, expectedFileResponse.Commit.Message, filesResponse.Commit.Message)
+			assert.EqualValues(t, expectedFileResponse.Commit.Author.Identity, filesResponse.Commit.Author.Identity)
+			assert.EqualValues(t, expectedFileResponse.Commit.Committer.Identity, filesResponse.Commit.Committer.Identity)
+			assert.EqualValues(t, expectedFileResponse.Verification, filesResponse.Verification)
 
-		// asserts
-		require.NoError(t, err)
-		gitRepo, _ := gitrepo.OpenRepository(git.DefaultContext, repo)
-		defer gitRepo.Close()
+			filesResponse, err = files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
+			assert.Nil(t, filesResponse)
+			expectedError := "repository file does not exist [path: " + opts.Files[0].TreePath + "]"
+			assert.EqualError(t, err, expectedError)
+		})
 
-		commit, _ := gitRepo.GetBranchCommit(repo.DefaultBranch)
-		lastCommit, _ := commit.GetCommitByPath(opts.Files[0].TreePath)
-		expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String())
-		assert.EqualValues(t, expectedFileResponse.Content, filesResponse.Files[0])
-	})
-}
+		t.Run("Delete without branch name", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+			opts := getDeleteRepoFilesOptions(repo)
+			opts.OldBranch = ""
+			opts.NewBranch = ""
+			opts.Files[0].SHA = "103ff9234cefeee5ec5361d22b49fbb04d385885"
+			opts.Files[0].TreePath = "new/file.txt"
 
-func TestChangeRepoFilesForDelete(t *testing.T) {
-	onGiteaRun(t, testDeleteRepoFiles)
-}
-
-func testDeleteRepoFiles(t *testing.T, u *url.URL) {
-	// setup
-	unittest.PrepareTestEnv(t)
-	doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
-	opts := getDeleteRepoFilesOptions(repo)
-
-	t.Run("Delete README.md file", func(t *testing.T) {
-		filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
-		require.NoError(t, err)
-		expectedFileResponse := getExpectedFileResponseForRepofilesDelete()
-		assert.NotNil(t, filesResponse)
-		assert.Nil(t, filesResponse.Files[0])
-		assert.EqualValues(t, expectedFileResponse.Commit.Message, filesResponse.Commit.Message)
-		assert.EqualValues(t, expectedFileResponse.Commit.Author.Identity, filesResponse.Commit.Author.Identity)
-		assert.EqualValues(t, expectedFileResponse.Commit.Committer.Identity, filesResponse.Commit.Committer.Identity)
-		assert.EqualValues(t, expectedFileResponse.Verification, filesResponse.Verification)
-	})
-
-	t.Run("Verify README.md has been deleted", func(t *testing.T) {
-		filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
-		assert.Nil(t, filesResponse)
-		expectedError := "repository file does not exist [path: " + opts.Files[0].TreePath + "]"
-		assert.EqualError(t, err, expectedError)
-	})
-}
-
-// Test opts with branch names removed, same results
-func TestChangeRepoFilesForDeleteWithoutBranchNames(t *testing.T) {
-	onGiteaRun(t, testDeleteRepoFilesWithoutBranchNames)
-}
-
-func testDeleteRepoFilesWithoutBranchNames(t *testing.T, u *url.URL) {
-	// setup
-	unittest.PrepareTestEnv(t)
-	doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
-
-	opts := getDeleteRepoFilesOptions(repo)
-	opts.OldBranch = ""
-	opts.NewBranch = ""
-
-	t.Run("Delete README.md without Branch Name", func(t *testing.T) {
-		filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
-		require.NoError(t, err)
-		expectedFileResponse := getExpectedFileResponseForRepofilesDelete()
-		assert.NotNil(t, filesResponse)
-		assert.Nil(t, filesResponse.Files[0])
-		assert.EqualValues(t, expectedFileResponse.Commit.Message, filesResponse.Commit.Message)
-		assert.EqualValues(t, expectedFileResponse.Commit.Author.Identity, filesResponse.Commit.Author.Identity)
-		assert.EqualValues(t, expectedFileResponse.Commit.Committer.Identity, filesResponse.Commit.Committer.Identity)
-		assert.EqualValues(t, expectedFileResponse.Verification, filesResponse.Verification)
+			filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
+			require.NoError(t, err)
+			expectedFileResponse := getExpectedFileResponseForRepofilesDelete()
+			assert.NotNil(t, filesResponse)
+			assert.Nil(t, filesResponse.Files[0])
+			assert.EqualValues(t, expectedFileResponse.Commit.Message, filesResponse.Commit.Message)
+			assert.EqualValues(t, expectedFileResponse.Commit.Author.Identity, filesResponse.Commit.Author.Identity)
+			assert.EqualValues(t, expectedFileResponse.Commit.Committer.Identity, filesResponse.Commit.Committer.Identity)
+			assert.EqualValues(t, expectedFileResponse.Verification, filesResponse.Verification)
+		})
 	})
 }
 
diff --git a/tests/integration/user_avatar_test.go b/tests/integration/user_avatar_test.go
index a5805d0eda..a7c0264aaa 100644
--- a/tests/integration/user_avatar_test.go
+++ b/tests/integration/user_avatar_test.go
@@ -10,85 +10,78 @@ import (
 	"io"
 	"mime/multipart"
 	"net/http"
-	"net/url"
 	"testing"
 
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/unittest"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/avatar"
+	"code.gitea.io/gitea/tests"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestUserAvatar(t *testing.T) {
-	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the repo3, is an org
+	defer tests.PrepareTestEnv(t)()
+	user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the repo3, is an org
 
-		seed := user2.Email
-		if len(seed) == 0 {
-			seed = user2.Name
-		}
+	seed := user2.Email
+	if len(seed) == 0 {
+		seed = user2.Name
+	}
 
-		img, err := avatar.RandomImage([]byte(seed))
-		if err != nil {
-			require.NoError(t, err)
-			return
-		}
+	img, err := avatar.RandomImage([]byte(seed))
+	if err != nil {
+		require.NoError(t, err)
+		return
+	}
 
-		session := loginUser(t, "user2")
-		csrf := GetCSRF(t, session, "/user/settings")
+	session := loginUser(t, "user2")
+	csrf := GetCSRF(t, session, "/user/settings")
 
-		imgData := &bytes.Buffer{}
+	imgData := &bytes.Buffer{}
 
-		body := &bytes.Buffer{}
+	body := &bytes.Buffer{}
 
-		// Setup multi-part
-		writer := multipart.NewWriter(body)
-		writer.WriteField("source", "local")
-		part, err := writer.CreateFormFile("avatar", "avatar-for-testuseravatar.png")
-		if err != nil {
-			require.NoError(t, err)
-			return
-		}
+	// Setup multi-part
+	writer := multipart.NewWriter(body)
+	writer.WriteField("source", "local")
+	part, err := writer.CreateFormFile("avatar", "avatar-for-testuseravatar.png")
+	if err != nil {
+		require.NoError(t, err)
+		return
+	}
 
-		if err := png.Encode(imgData, img); err != nil {
-			require.NoError(t, err)
-			return
-		}
+	if err := png.Encode(imgData, img); err != nil {
+		require.NoError(t, err)
+		return
+	}
 
-		if _, err := io.Copy(part, imgData); err != nil {
-			require.NoError(t, err)
-			return
-		}
+	if _, err := io.Copy(part, imgData); err != nil {
+		require.NoError(t, err)
+		return
+	}
 
-		if err := writer.Close(); err != nil {
-			require.NoError(t, err)
-			return
-		}
+	if err := writer.Close(); err != nil {
+		require.NoError(t, err)
+		return
+	}
 
-		req := NewRequestWithBody(t, "POST", "/user/settings/avatar", body)
-		req.Header.Add("X-Csrf-Token", csrf)
-		req.Header.Add("Content-Type", writer.FormDataContentType())
+	req := NewRequestWithBody(t, "POST", "/user/settings/avatar", body)
+	req.Header.Add("X-Csrf-Token", csrf)
+	req.Header.Add("Content-Type", writer.FormDataContentType())
 
-		session.MakeRequest(t, req, http.StatusSeeOther)
+	session.MakeRequest(t, req, http.StatusSeeOther)
 
-		user2 = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the repo3, is an org
+	user2 = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the repo3, is an org
 
-		req = NewRequest(t, "GET", user2.AvatarLinkWithSize(db.DefaultContext, 0))
-		_ = session.MakeRequest(t, req, http.StatusOK)
+	req = NewRequest(t, "GET", user2.AvatarLinkWithSize(db.DefaultContext, 0))
+	_ = session.MakeRequest(t, req, http.StatusOK)
 
-		testGetAvatarRedirect(t, user2)
+	req = NewRequestf(t, "GET", "/%s.png", user2.Name)
+	resp := MakeRequest(t, req, http.StatusSeeOther)
+	assert.EqualValues(t, fmt.Sprintf("/avatars/%s", user2.Avatar), resp.Header().Get("location"))
 
-		// Can't test if the response matches because the image is re-generated on upload but checking that this at least doesn't give a 404 should be enough.
-	})
-}
-
-func testGetAvatarRedirect(t *testing.T, user *user_model.User) {
-	t.Run(fmt.Sprintf("getAvatarRedirect_%s", user.Name), func(t *testing.T) {
-		req := NewRequestf(t, "GET", "/%s.png", user.Name)
-		resp := MakeRequest(t, req, http.StatusSeeOther)
-		assert.EqualValues(t, fmt.Sprintf("/avatars/%s", user.Avatar), resp.Header().Get("location"))
-	})
+	// Can't test if the response matches because the image is re-generated on upload but checking that this at least doesn't give a 404 should be enough.
 }
diff --git a/tests/integration/user_profile_activity_test.go b/tests/integration/user_profile_activity_test.go
index 8f3042678a..77d188903e 100644
--- a/tests/integration/user_profile_activity_test.go
+++ b/tests/integration/user_profile_activity_test.go
@@ -5,11 +5,11 @@ package integration
 
 import (
 	"net/http"
-	"net/url"
 	"strconv"
 	"testing"
 
 	"code.gitea.io/gitea/modules/structs"
+	"code.gitea.io/gitea/tests"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -23,70 +23,69 @@ import (
 // - Profile visibility
 // - Public activity visibility
 func TestUserProfileActivity(t *testing.T) {
-	onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
-		// This test needs multiple users with different access statuses to check for all possible states
-		userAdmin := loginUser(t, "user1")
-		userRegular := loginUser(t, "user2")
-		// Activity availability should be the same for guest and another non-admin user, so this is not tested separately
-		userGuest := emptyTestSession(t)
+	defer tests.PrepareTestEnv(t)()
+	// This test needs multiple users with different access statuses to check for all possible states
+	userAdmin := loginUser(t, "user1")
+	userRegular := loginUser(t, "user2")
+	// Activity availability should be the same for guest and another non-admin user, so this is not tested separately
+	userGuest := emptyTestSession(t)
 
-		// = Public profile, public activity =
+	// = Public profile, public activity =
 
-		// Set activity visibility of user2 to public. This is the default, but won't hurt to set it before testing.
-		testChangeUserActivityVisibility(t, userRegular, "off")
+	// Set activity visibility of user2 to public. This is the default, but won't hurt to set it before testing.
+	testChangeUserActivityVisibility(t, userRegular, "off")
 
-		// Verify availability of RSS button and activity tab
-		testUser2ActivityButtonsAvailability(t, userAdmin, true)
-		testUser2ActivityButtonsAvailability(t, userRegular, true)
-		testUser2ActivityButtonsAvailability(t, userGuest, true)
+	// Verify availability of RSS button and activity tab
+	testUser2ActivityButtonsAvailability(t, userAdmin, true)
+	testUser2ActivityButtonsAvailability(t, userRegular, true)
+	testUser2ActivityButtonsAvailability(t, userGuest, true)
 
-		// Verify the hint for all types of users: admin, self, guest
-		testUser2ActivityVisibility(t, userAdmin, "This activity is visible to everyone, but as an administrator you can also see interactions in private spaces.", true)
-		hintLink := testUser2ActivityVisibility(t, userRegular, "Your activity is visible to everyone, except for interactions in private spaces. Configure.", true)
-		testUser2ActivityVisibility(t, userGuest, "", true)
+	// Verify the hint for all types of users: admin, self, guest
+	testUser2ActivityVisibility(t, userAdmin, "This activity is visible to everyone, but as an administrator you can also see interactions in private spaces.", true)
+	hintLink := testUser2ActivityVisibility(t, userRegular, "Your activity is visible to everyone, except for interactions in private spaces. Configure.", true)
+	testUser2ActivityVisibility(t, userGuest, "", true)
 
-		// When viewing own profile, the user is offered to configure activity visibility. Verify that the link is correct and works, also check that it links back to the activity tab.
-		linkCorrect := assert.EqualValues(t, "/user/settings#keep-activity-private", hintLink)
-		if linkCorrect {
-			page := NewHTMLParser(t, userRegular.MakeRequest(t, NewRequest(t, "GET", hintLink), http.StatusOK).Body)
-			activityLink, exists := page.Find(".field:has(.checkbox#keep-activity-private) .help a").Attr("href")
-			assert.True(t, exists)
-			assert.EqualValues(t, "/user2?tab=activity", activityLink)
-		}
+	// When viewing own profile, the user is offered to configure activity visibility. Verify that the link is correct and works, also check that it links back to the activity tab.
+	linkCorrect := assert.EqualValues(t, "/user/settings#keep-activity-private", hintLink)
+	if linkCorrect {
+		page := NewHTMLParser(t, userRegular.MakeRequest(t, NewRequest(t, "GET", hintLink), http.StatusOK).Body)
+		activityLink, exists := page.Find(".field:has(.checkbox#keep-activity-private) .help a").Attr("href")
+		assert.True(t, exists)
+		assert.EqualValues(t, "/user2?tab=activity", activityLink)
+	}
 
-		// = Private profile, but public activity =
+	// = Private profile, but public activity =
 
-		// Set profile visibility of user2 to private
-		testChangeUserProfileVisibility(t, userRegular, structs.VisibleTypePrivate)
+	// Set profile visibility of user2 to private
+	testChangeUserProfileVisibility(t, userRegular, structs.VisibleTypePrivate)
 
-		// When profile activity is configured as public, but the profile is private, tell the user about this and link to visibility settings.
-		hintLink = testUser2ActivityVisibility(t, userRegular, "Your activity is only visible to you and the instance administrators because your profile is private. Configure.", true)
-		assert.EqualValues(t, "/user/settings#visibility-setting", hintLink)
+	// When profile activity is configured as public, but the profile is private, tell the user about this and link to visibility settings.
+	hintLink = testUser2ActivityVisibility(t, userRegular, "Your activity is only visible to you and the instance administrators because your profile is private. Configure.", true)
+	assert.EqualValues(t, "/user/settings#visibility-setting", hintLink)
 
-		// When the profile is private, tell the admin about this.
-		testUser2ActivityVisibility(t, userAdmin, "This activity is visible to you because you're an administrator, but the user wants it to remain private.", true)
+	// When the profile is private, tell the admin about this.
+	testUser2ActivityVisibility(t, userAdmin, "This activity is visible to you because you're an administrator, but the user wants it to remain private.", true)
 
-		// Set profile visibility of user2 back to public
-		testChangeUserProfileVisibility(t, userRegular, structs.VisibleTypePublic)
+	// Set profile visibility of user2 back to public
+	testChangeUserProfileVisibility(t, userRegular, structs.VisibleTypePublic)
 
-		// = Private acitivty =
+	// = Private acitivty =
 
-		// Set activity visibility of user2 to private
-		testChangeUserActivityVisibility(t, userRegular, "on")
+	// Set activity visibility of user2 to private
+	testChangeUserActivityVisibility(t, userRegular, "on")
 
-		// Verify availability of RSS button and activity tab
-		testUser2ActivityButtonsAvailability(t, userAdmin, true)
-		testUser2ActivityButtonsAvailability(t, userRegular, true)
-		testUser2ActivityButtonsAvailability(t, userGuest, false)
+	// Verify availability of RSS button and activity tab
+	testUser2ActivityButtonsAvailability(t, userAdmin, true)
+	testUser2ActivityButtonsAvailability(t, userRegular, true)
+	testUser2ActivityButtonsAvailability(t, userGuest, false)
 
-		// Verify the hint for all types of users: admin, self, guest
-		testUser2ActivityVisibility(t, userAdmin, "This activity is visible to you because you're an administrator, but the user wants it to remain private.", true)
-		hintLink = testUser2ActivityVisibility(t, userRegular, "Your activity is only visible to you and the instance administrators. Configure.", true)
-		testUser2ActivityVisibility(t, userGuest, "This user has disabled the public visibility of the activity.", false)
+	// Verify the hint for all types of users: admin, self, guest
+	testUser2ActivityVisibility(t, userAdmin, "This activity is visible to you because you're an administrator, but the user wants it to remain private.", true)
+	hintLink = testUser2ActivityVisibility(t, userRegular, "Your activity is only visible to you and the instance administrators. Configure.", true)
+	testUser2ActivityVisibility(t, userGuest, "This user has disabled the public visibility of the activity.", false)
 
-		// Verify that Configure link is correct
-		assert.EqualValues(t, "/user/settings#keep-activity-private", hintLink)
-	})
+	// Verify that Configure link is correct
+	assert.EqualValues(t, "/user/settings#keep-activity-private", hintLink)
 }
 
 // testChangeUserActivityVisibility allows to easily change visibility of public activity for a user
diff --git a/tests/integration/user_profile_follows_test.go b/tests/integration/user_profile_follows_test.go
index bad0944d88..24b74268e6 100644
--- a/tests/integration/user_profile_follows_test.go
+++ b/tests/integration/user_profile_follows_test.go
@@ -6,10 +6,11 @@ package integration
 import (
 	"fmt"
 	"net/http"
-	"net/url"
 	"strings"
 	"testing"
 
+	"code.gitea.io/gitea/tests"
+
 	"github.com/stretchr/testify/assert"
 )
 
@@ -19,92 +20,92 @@ import (
 // - Followers and Following lists have correct amounts of items
 // - %d followers and %following counters are always present and always have correct numbers and use correct plurals
 func TestUserProfileFollows(t *testing.T) {
-	onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
-		// This test needs 3 users to check for all possible states
-		// The accounts of user3 and user4 are not functioning
-		user1 := loginUser(t, "user1")
-		user2 := loginUser(t, "user2")
-		user5 := loginUser(t, "user5")
+	defer tests.PrepareTestEnv(t)()
 
-		followersLink := "#profile-avatar-card a[href='/user1?tab=followers']"
-		followingLink := "#profile-avatar-card a[href='/user1?tab=following']"
-		listHeader := ".user-cards h2"
-		listItems := ".user-cards .list"
+	// This test needs 3 users to check for all possible states
+	// The accounts of user3 and user4 are not functioning
+	user1 := loginUser(t, "user1")
+	user2 := loginUser(t, "user2")
+	user5 := loginUser(t, "user5")
 
-		// = No follows =
+	followersLink := "#profile-avatar-card a[href='/user1?tab=followers']"
+	followingLink := "#profile-avatar-card a[href='/user1?tab=following']"
+	listHeader := ".user-cards h2"
+	listItems := ".user-cards .list"
 
-		var followCount int
+	// = No follows =
 
-		// Request the profile of user1, the Followers tab
-		response := user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=followers"), http.StatusOK)
-		page := NewHTMLParser(t, response.Body)
+	var followCount int
 
-		// Verify that user1 has no followers
-		testSelectorEquals(t, page, followersLink, "0 followers")
-		testSelectorEquals(t, page, listHeader, "Followers")
-		testListCount(t, page, listItems, followCount)
+	// Request the profile of user1, the Followers tab
+	response := user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=followers"), http.StatusOK)
+	page := NewHTMLParser(t, response.Body)
 
-		// Request the profile of user1, the Following tab
-		response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=following"), http.StatusOK)
-		page = NewHTMLParser(t, response.Body)
+	// Verify that user1 has no followers
+	testSelectorEquals(t, page, followersLink, "0 followers")
+	testSelectorEquals(t, page, listHeader, "Followers")
+	testListCount(t, page, listItems, followCount)
 
-		// Verify that user1 does not follow anyone
-		testSelectorEquals(t, page, followingLink, "0 following")
-		testSelectorEquals(t, page, listHeader, "Following")
-		testListCount(t, page, listItems, followCount)
+	// Request the profile of user1, the Following tab
+	response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=following"), http.StatusOK)
+	page = NewHTMLParser(t, response.Body)
 
-		// Make user1 and user2 follow each other
-		testUserFollowUser(t, user1, "user2")
-		testUserFollowUser(t, user2, "user1")
+	// Verify that user1 does not follow anyone
+	testSelectorEquals(t, page, followingLink, "0 following")
+	testSelectorEquals(t, page, listHeader, "Following")
+	testListCount(t, page, listItems, followCount)
 
-		// = 1 follow each =
+	// Make user1 and user2 follow each other
+	testUserFollowUser(t, user1, "user2")
+	testUserFollowUser(t, user2, "user1")
 
-		followCount++
+	// = 1 follow each =
 
-		// Request the profile of user1, the Followers tab
-		response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=followers"), http.StatusOK)
-		page = NewHTMLParser(t, response.Body)
+	followCount++
 
-		// Verify it is now followed by 1 user
-		testSelectorEquals(t, page, followersLink, "1 follower")
-		testSelectorEquals(t, page, listHeader, "Follower")
-		testListCount(t, page, listItems, followCount)
+	// Request the profile of user1, the Followers tab
+	response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=followers"), http.StatusOK)
+	page = NewHTMLParser(t, response.Body)
 
-		// Request the profile of user1, the Following tab
-		response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=following"), http.StatusOK)
-		page = NewHTMLParser(t, response.Body)
+	// Verify it is now followed by 1 user
+	testSelectorEquals(t, page, followersLink, "1 follower")
+	testSelectorEquals(t, page, listHeader, "Follower")
+	testListCount(t, page, listItems, followCount)
 
-		// Verify it now follows follows 1 user
-		testSelectorEquals(t, page, followingLink, "1 following")
-		testSelectorEquals(t, page, listHeader, "Following")
-		testListCount(t, page, listItems, followCount)
+	// Request the profile of user1, the Following tab
+	response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=following"), http.StatusOK)
+	page = NewHTMLParser(t, response.Body)
 
-		// Make user1 and user3 follow each other
-		testUserFollowUser(t, user1, "user5")
-		testUserFollowUser(t, user5, "user1")
+	// Verify it now follows follows 1 user
+	testSelectorEquals(t, page, followingLink, "1 following")
+	testSelectorEquals(t, page, listHeader, "Following")
+	testListCount(t, page, listItems, followCount)
 
-		// = 2 follows =
+	// Make user1 and user3 follow each other
+	testUserFollowUser(t, user1, "user5")
+	testUserFollowUser(t, user5, "user1")
 
-		followCount++
+	// = 2 follows =
 
-		// Request the profile of user1, the Followers tab
-		response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=followers"), http.StatusOK)
-		page = NewHTMLParser(t, response.Body)
+	followCount++
 
-		// Verify it is now followed by 2 users
-		testSelectorEquals(t, page, followersLink, "2 followers")
-		testSelectorEquals(t, page, listHeader, "Followers")
-		testListCount(t, page, listItems, followCount)
+	// Request the profile of user1, the Followers tab
+	response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=followers"), http.StatusOK)
+	page = NewHTMLParser(t, response.Body)
 
-		// Request the profile of user1, the Following tab
-		response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=following"), http.StatusOK)
-		page = NewHTMLParser(t, response.Body)
+	// Verify it is now followed by 2 users
+	testSelectorEquals(t, page, followersLink, "2 followers")
+	testSelectorEquals(t, page, listHeader, "Followers")
+	testListCount(t, page, listItems, followCount)
 
-		// Verify it now follows follows 2 users
-		testSelectorEquals(t, page, followingLink, "2 following")
-		testSelectorEquals(t, page, listHeader, "Following")
-		testListCount(t, page, listItems, followCount)
-	})
+	// Request the profile of user1, the Following tab
+	response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=following"), http.StatusOK)
+	page = NewHTMLParser(t, response.Body)
+
+	// Verify it now follows follows 2 users
+	testSelectorEquals(t, page, followingLink, "2 following")
+	testSelectorEquals(t, page, listHeader, "Following")
+	testListCount(t, page, listItems, followCount)
 }
 
 // testUserFollowUser simply follows a user `following` by session of user `follower`

From 7e1aa8a5cd6a4f2eda4cc5c86dc06a80762f9950 Mon Sep 17 00:00:00 2001
From: wxiaoguang 
Date: Mon, 4 Nov 2024 19:30:00 +0800
Subject: [PATCH 358/443] [PORT] Refactor DateUtils and merge TimeSince
 (gitea#32409)

Follow #32383 and #32402

---
Conflict resolution: Magic, painful.

(cherry picked from commit b068dbd40ee3b4dc7d18cdcf168f0c24cea234c0)
---
 modules/templates/helper.go                   |  15 +--
 modules/templates/util_date.go                | 111 ++++++++++++++++--
 modules/templates/util_date_test.go           |  23 +++-
 modules/timeutil/datetime.go                  |  60 ----------
 modules/timeutil/since.go                     |  41 +------
 routers/web/repo/blame.go                     |   3 +-
 routers/web/repo/issue_content_history.go     |   5 +-
 services/context/context.go                   |   1 -
 templates/admin/auth/list.tmpl                |   4 +-
 templates/admin/cron.tmpl                     |   4 +-
 templates/admin/notice.tmpl                   |   2 +-
 templates/admin/org/list.tmpl                 |   2 +-
 templates/admin/packages/list.tmpl            |   2 +-
 templates/admin/repo/list.tmpl                |   4 +-
 templates/admin/stacktrace-row.tmpl           |   2 +-
 templates/admin/user/list.tmpl                |   4 +-
 templates/devtest/gitea-ui.tmpl               |  14 +--
 templates/explore/repo_list.tmpl              |   2 +-
 templates/explore/user_list.tmpl              |   2 +-
 .../package/shared/cleanup_rules/preview.tmpl |   2 +-
 templates/package/shared/list.tmpl            |   2 +-
 templates/package/shared/versionlist.tmpl     |   2 +-
 templates/package/view.tmpl                   |   6 +-
 templates/repo/actions/runs_list.tmpl         |   2 +-
 templates/repo/branch/list.tmpl               |   6 +-
 .../code/recently_pushed_new_branches.tmpl    |   2 +-
 templates/repo/commit_page.tmpl               |   4 +-
 templates/repo/commits_list.tmpl              |   4 +-
 templates/repo/diff/comments.tmpl             |   2 +-
 templates/repo/diff/compare.tmpl              |   2 +-
 templates/repo/empty.tmpl                     |   2 +-
 templates/repo/graph/commits.tmpl             |   2 +-
 templates/repo/header.tmpl                    |   2 +-
 templates/repo/home.tmpl                      |   2 +-
 templates/repo/issue/card.tmpl                |   2 +-
 templates/repo/issue/milestone_issues.tmpl    |   4 +-
 templates/repo/issue/milestones.tmpl          |   6 +-
 templates/repo/issue/view_content.tmpl        |   2 +-
 .../repo/issue/view_content/comments.tmpl     |  12 +-
 .../repo/issue/view_content/conversation.tmpl |   2 +-
 templates/repo/issue/view_content/pull.tmpl   |   2 +-
 .../view_content/sidebar/due_deadline.tmpl    |   2 +-
 templates/repo/issue/view_title.tmpl          |   4 +-
 templates/repo/pulse.tmpl                     |  14 +--
 templates/repo/release/list.tmpl              |   2 +-
 templates/repo/settings/deploy_keys.tmpl      |   2 +-
 templates/repo/settings/lfs.tmpl              |   2 +-
 templates/repo/settings/lfs_file_find.tmpl    |   2 +-
 templates/repo/settings/lfs_locks.tmpl        |   2 +-
 templates/repo/settings/options.tmpl          |   4 +-
 templates/repo/settings/webhook/history.tmpl  |   2 +-
 templates/repo/tag/list.tmpl                  |   2 +-
 templates/repo/user_cards.tmpl                |   2 +-
 templates/repo/view_file.tmpl                 |   2 +-
 templates/repo/view_list.tmpl                 |   4 +-
 templates/repo/wiki/pages.tmpl                |   2 +-
 templates/repo/wiki/revision.tmpl             |   2 +-
 templates/repo/wiki/view.tmpl                 |   2 +-
 templates/shared/actions/runner_edit.tmpl     |   4 +-
 templates/shared/actions/runner_list.tmpl     |   2 +-
 templates/shared/issuelist.tmpl               |   4 +-
 templates/shared/searchbottom.tmpl            |   2 +-
 templates/shared/secrets/add_list.tmpl        |   2 +-
 templates/shared/user/profile_big_avatar.tmpl |   2 +-
 templates/shared/variables/variable_list.tmpl |   2 +-
 templates/user/dashboard/feeds.tmpl           |   2 +-
 templates/user/dashboard/milestones.tmpl      |   6 +-
 .../user/notification/notification_div.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         |   2 +-
 .../user/settings/security/webauthn.tmpl      |   2 +-
 74 files changed, 241 insertions(+), 228 deletions(-)
 delete mode 100644 modules/timeutil/datetime.go

diff --git a/modules/templates/helper.go b/modules/templates/helper.go
index a1f3f1aa2d..55de85646c 100644
--- a/modules/templates/helper.go
+++ b/modules/templates/helper.go
@@ -20,7 +20,6 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/svg"
 	"code.gitea.io/gitea/modules/templates/eval"
-	"code.gitea.io/gitea/modules/timeutil"
 	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/services/gitdiff"
 )
@@ -65,16 +64,18 @@ func NewFuncMap() template.FuncMap {
 
 		// -----------------------------------------------------------------
 		// time / number / format
-		"FileSize":      FileSizePanic,
-		"CountFmt":      base.FormatNumberSI,
-		"TimeSince":     timeutil.TimeSince,
-		"TimeSinceUnix": timeutil.TimeSinceUnix,
-		"DateTime":      dateTimeLegacy, // for backward compatibility only, do not use it anymore
-		"Sec2Time":      util.SecToTime,
+		"FileSize": FileSizePanic,
+		"CountFmt": base.FormatNumberSI,
+		"Sec2Time": util.SecToTime,
 		"LoadTimes": func(startTime time.Time) string {
 			return fmt.Sprint(time.Since(startTime).Nanoseconds()/1e6) + "ms"
 		},
 
+		// for backward compatibility only, do not use them anymore
+		"TimeSince":     timeSinceLegacy,
+		"TimeSinceUnix": timeSinceLegacy,
+		"DateTime":      dateTimeLegacy,
+
 		// -----------------------------------------------------------------
 		// setting
 		"AppName": func() string {
diff --git a/modules/templates/util_date.go b/modules/templates/util_date.go
index 10f7cdb508..f521b39b79 100644
--- a/modules/templates/util_date.go
+++ b/modules/templates/util_date.go
@@ -4,35 +4,40 @@
 package templates
 
 import (
-	"context"
+	"fmt"
+	"html"
 	"html/template"
+	"strings"
 	"time"
 
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/timeutil"
+	"code.gitea.io/gitea/modules/translation"
 )
 
-type DateUtils struct {
-	ctx context.Context
-}
+type DateUtils struct{}
 
-func NewDateUtils(ctx context.Context) *DateUtils {
-	return &DateUtils{ctx}
+func NewDateUtils() *DateUtils {
+	return (*DateUtils)(nil) // the util is stateless, and we do not need to create an instance
 }
 
 // AbsoluteShort renders in "Jan 01, 2006" format
 func (du *DateUtils) AbsoluteShort(time any) template.HTML {
-	return timeutil.DateTime("short", time)
+	return dateTimeFormat("short", time)
 }
 
 // AbsoluteLong renders in "January 01, 2006" format
 func (du *DateUtils) AbsoluteLong(time any) template.HTML {
-	return timeutil.DateTime("long", time)
+	return dateTimeFormat("long", time)
 }
 
 // FullTime renders in "Jan 01, 2006 20:33:44" format
 func (du *DateUtils) FullTime(time any) template.HTML {
-	return timeutil.DateTime("full", time)
+	return dateTimeFormat("full", time)
+}
+
+func (du *DateUtils) TimeSince(time any) template.HTML {
+	return TimeSince(time)
 }
 
 // ParseLegacy parses the datetime in legacy format, eg: "2016-01-02" in server's timezone.
@@ -56,5 +61,91 @@ func dateTimeLegacy(format string, datetime any, _ ...string) template.HTML {
 	if s, ok := datetime.(string); ok {
 		datetime = parseLegacy(s)
 	}
-	return timeutil.DateTime(format, datetime)
+	return dateTimeFormat(format, datetime)
+}
+
+func timeSinceLegacy(time any, _ translation.Locale) template.HTML {
+	if !setting.IsProd || setting.IsInTesting {
+		panic("timeSinceLegacy is for backward compatibility only, do not use it in new code")
+	}
+	return TimeSince(time)
+}
+
+func anyToTime(any any) (t time.Time, isZero bool) {
+	switch v := any.(type) {
+	case nil:
+		// it is zero
+	case *time.Time:
+		if v != nil {
+			t = *v
+		}
+	case time.Time:
+		t = v
+	case timeutil.TimeStamp:
+		t = v.AsTime()
+	case timeutil.TimeStampNano:
+		t = v.AsTime()
+	case int:
+		t = timeutil.TimeStamp(v).AsTime()
+	case int64:
+		t = timeutil.TimeStamp(v).AsTime()
+	default:
+		panic(fmt.Sprintf("Unsupported time type %T", any))
+	}
+	return t, t.IsZero() || t.Unix() == 0
+}
+
+func dateTimeFormat(format string, datetime any) template.HTML {
+	t, isZero := anyToTime(datetime)
+	if isZero {
+		return "-"
+	}
+	var textEscaped string
+	datetimeEscaped := html.EscapeString(t.Format(time.RFC3339))
+	if format == "full" {
+		textEscaped = html.EscapeString(t.Format("2006-01-02 15:04:05 -07:00"))
+	} else {
+		textEscaped = html.EscapeString(t.Format("2006-01-02"))
+	}
+
+	attrs := []string{`weekday=""`, `year="numeric"`}
+	switch format {
+	case "short", "long": // date only
+		attrs = append(attrs, `month="`+format+`"`, `day="numeric"`)
+		return template.HTML(fmt.Sprintf(`%s`, strings.Join(attrs, " "), datetimeEscaped, textEscaped))
+	case "full": // full date including time
+		attrs = append(attrs, `format="datetime"`, `month="short"`, `day="numeric"`, `hour="numeric"`, `minute="numeric"`, `second="numeric"`, `data-tooltip-content`, `data-tooltip-interactive="true"`)
+		return template.HTML(fmt.Sprintf(`%s`, strings.Join(attrs, " "), datetimeEscaped, textEscaped))
+	default:
+		panic(fmt.Sprintf("Unsupported format %s", format))
+	}
+}
+
+func timeSinceTo(then any, now time.Time) template.HTML {
+	thenTime, isZero := anyToTime(then)
+	if isZero {
+		return "-"
+	}
+
+	friendlyText := thenTime.Format("2006-01-02 15:04:05 -07:00")
+
+	// document: https://github.com/github/relative-time-element
+	attrs := `tense="past"`
+	isFuture := now.Before(thenTime)
+	if isFuture {
+		attrs = `tense="future"`
+	}
+
+	// declare data-tooltip-content attribute to switch from "title" tooltip to "tippy" tooltip
+	htm := fmt.Sprintf(`%s`,
+		attrs, thenTime.Format(time.RFC3339), friendlyText)
+	return template.HTML(htm)
+}
+
+// TimeSince renders relative time HTML given a time
+func TimeSince(then any) template.HTML {
+	if setting.UI.PreferredTimestampTense == "absolute" {
+		return dateTimeFormat("full", then)
+	}
+	return timeSinceTo(then, time.Now())
 }
diff --git a/modules/templates/util_date_test.go b/modules/templates/util_date_test.go
index e3dec5c8db..2f5c79f762 100644
--- a/modules/templates/util_date_test.go
+++ b/modules/templates/util_date_test.go
@@ -22,7 +22,7 @@ func TestDateTime(t *testing.T) {
 	defer test.MockVariableValue(&setting.DefaultUILocation, testTz)()
 	defer test.MockVariableValue(&setting.IsInTesting, false)()
 
-	du := NewDateUtils(nil)
+	du := NewDateUtils()
 
 	refTimeStr := "2018-01-01T00:00:00Z"
 	refDateStr := "2018-01-01"
@@ -59,3 +59,24 @@ func TestDateTime(t *testing.T) {
 	actual = du.FullTime(refTimeStamp)
 	assert.EqualValues(t, `2017-12-31 19:00:00 -05:00`, actual)
 }
+
+func TestTimeSince(t *testing.T) {
+	testTz, _ := time.LoadLocation("America/New_York")
+	defer test.MockVariableValue(&setting.DefaultUILocation, testTz)()
+	defer test.MockVariableValue(&setting.IsInTesting, false)()
+
+	du := NewDateUtils()
+	assert.EqualValues(t, "-", du.TimeSince(nil))
+
+	refTimeStr := "2018-01-01T00:00:00Z"
+	refTime, _ := time.Parse(time.RFC3339, refTimeStr)
+
+	actual := du.TimeSince(refTime)
+	assert.EqualValues(t, `2018-01-01 00:00:00 +00:00`, actual)
+
+	actual = timeSinceTo(&refTime, time.Time{})
+	assert.EqualValues(t, `2018-01-01 00:00:00 +00:00`, actual)
+
+	actual = timeSinceLegacy(timeutil.TimeStampNano(refTime.UnixNano()), nil)
+	assert.EqualValues(t, `2017-12-31 19:00:00 -05:00`, actual)
+}
diff --git a/modules/timeutil/datetime.go b/modules/timeutil/datetime.go
deleted file mode 100644
index 664e0320b0..0000000000
--- a/modules/timeutil/datetime.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2023 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package timeutil
-
-import (
-	"fmt"
-	"html"
-	"html/template"
-	"strings"
-	"time"
-)
-
-// DateTime renders an absolute time HTML element by datetime.
-func DateTime(format string, datetime any) template.HTML {
-	if p, ok := datetime.(*time.Time); ok {
-		datetime = *p
-	}
-	if p, ok := datetime.(*TimeStamp); ok {
-		datetime = *p
-	}
-	switch v := datetime.(type) {
-	case TimeStamp:
-		datetime = v.AsTime()
-	case int:
-		datetime = TimeStamp(v).AsTime()
-	case int64:
-		datetime = TimeStamp(v).AsTime()
-	}
-
-	var datetimeEscaped, textEscaped string
-	switch v := datetime.(type) {
-	case nil:
-		return "-"
-	case time.Time:
-		if v.IsZero() || v.Unix() == 0 {
-			return "-"
-		}
-		datetimeEscaped = html.EscapeString(v.Format(time.RFC3339))
-		if format == "full" {
-			textEscaped = html.EscapeString(v.Format("2006-01-02 15:04:05 -07:00"))
-		} else {
-			textEscaped = html.EscapeString(v.Format("2006-01-02"))
-		}
-	default:
-		panic(fmt.Sprintf("Unsupported time type %T", datetime))
-	}
-
-	attrs := []string{`weekday=""`, `year="numeric"`}
-	switch format {
-	case "short", "long": // date only
-		attrs = append(attrs, `month="`+format+`"`, `day="numeric"`)
-		return template.HTML(fmt.Sprintf(`%s`, strings.Join(attrs, " "), datetimeEscaped, textEscaped))
-	case "full": // full date including time
-		attrs = append(attrs, `format="datetime"`, `month="short"`, `day="numeric"`, `hour="numeric"`, `minute="numeric"`, `second="numeric"`, `data-tooltip-content`, `data-tooltip-interactive="true"`)
-		return template.HTML(fmt.Sprintf(`%s`, strings.Join(attrs, " "), datetimeEscaped, textEscaped))
-	default:
-		panic(fmt.Sprintf("Unsupported format %s", format))
-	}
-}
diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go
index dba42c793a..2c89ae38d5 100644
--- a/modules/timeutil/since.go
+++ b/modules/timeutil/since.go
@@ -4,12 +4,9 @@
 package timeutil
 
 import (
-	"fmt"
-	"html/template"
 	"strings"
 	"time"
 
-	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/translation"
 )
 
@@ -81,16 +78,11 @@ func computeTimeDiffFloor(diff int64, lang translation.Locale) (int64, string) {
 	return diff, diffStr
 }
 
-// MinutesToFriendly returns a user friendly string with number of minutes
+// MinutesToFriendly returns a user-friendly string with number of minutes
 // converted to hours and minutes.
 func MinutesToFriendly(minutes int, lang translation.Locale) string {
 	duration := time.Duration(minutes) * time.Minute
-	return TimeSincePro(time.Now().Add(-duration), lang)
-}
-
-// TimeSincePro calculates the time interval and generate full user-friendly string.
-func TimeSincePro(then time.Time, lang translation.Locale) string {
-	return timeSincePro(then, time.Now(), lang)
+	return timeSincePro(time.Now().Add(-duration), time.Now(), lang)
 }
 
 func timeSincePro(then, now time.Time, lang translation.Locale) string {
@@ -114,32 +106,3 @@ func timeSincePro(then, now time.Time, lang translation.Locale) string {
 	}
 	return strings.TrimPrefix(timeStr, ", ")
 }
-
-func timeSinceUnix(then, now time.Time, _ translation.Locale) template.HTML {
-	friendlyText := then.Format("2006-01-02 15:04:05 -07:00")
-
-	// document: https://github.com/github/relative-time-element
-	attrs := `tense="past"`
-	isFuture := now.Before(then)
-	if isFuture {
-		attrs = `tense="future"`
-	}
-
-	// declare data-tooltip-content attribute to switch from "title" tooltip to "tippy" tooltip
-	htm := fmt.Sprintf(`%s`,
-		attrs, then.Format(time.RFC3339), friendlyText)
-	return template.HTML(htm)
-}
-
-// TimeSince renders relative time HTML given a time.Time
-func TimeSince(then time.Time, lang translation.Locale) template.HTML {
-	if setting.UI.PreferredTimestampTense == "absolute" {
-		return DateTime("full", then)
-	}
-	return timeSinceUnix(then, time.Now(), lang)
-}
-
-// TimeSinceUnix renders relative time HTML given a TimeStamp
-func TimeSinceUnix(then TimeStamp, lang translation.Locale) template.HTML {
-	return TimeSince(then.AsLocalTime(), lang)
-}
diff --git a/routers/web/repo/blame.go b/routers/web/repo/blame.go
index eea3d4dc00..4f962d4c19 100644
--- a/routers/web/repo/blame.go
+++ b/routers/web/repo/blame.go
@@ -17,7 +17,6 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/templates"
-	"code.gitea.io/gitea/modules/timeutil"
 	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/services/context"
 	files_service "code.gitea.io/gitea/services/repository/files"
@@ -254,7 +253,7 @@ func renderBlame(ctx *context.Context, blameParts []*git.BlamePart, commitNames
 				commitCnt++
 
 				// User avatar image
-				commitSince := timeutil.TimeSinceUnix(timeutil.TimeStamp(commit.Author.When.Unix()), ctx.Locale)
+				commitSince := templates.TimeSince(commit.Author.When)
 
 				var avatar string
 				if commit.User != nil {
diff --git a/routers/web/repo/issue_content_history.go b/routers/web/repo/issue_content_history.go
index 16b250abda..4ce76b2bb9 100644
--- a/routers/web/repo/issue_content_history.go
+++ b/routers/web/repo/issue_content_history.go
@@ -14,7 +14,6 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/templates"
-	"code.gitea.io/gitea/modules/timeutil"
 	"code.gitea.io/gitea/services/context"
 
 	"github.com/sergi/go-diff/diffmatchpatch"
@@ -73,10 +72,10 @@ func GetContentHistoryList(ctx *context.Context) {
 		class := avatars.DefaultAvatarClass + " tw-mr-2"
 		name := html.EscapeString(username)
 		avatarHTML := string(templates.AvatarHTML(src, 28, class, username))
-		timeSinceText := string(timeutil.TimeSinceUnix(item.EditedUnix, ctx.Locale))
+		timeSinceHTML := string(templates.TimeSince(item.EditedUnix))
 
 		results = append(results, map[string]any{
-			"name":  avatarHTML + "" + name + " " + actionText + " " + timeSinceText,
+			"name":  avatarHTML + "" + name + " " + actionText + " " + timeSinceHTML,
 			"value": item.HistoryID,
 		})
 	}
diff --git a/services/context/context.go b/services/context/context.go
index 65796c3ee7..91e7b1849d 100644
--- a/services/context/context.go
+++ b/services/context/context.go
@@ -102,7 +102,6 @@ func NewTemplateContextForWeb(ctx *Context) TemplateContext {
 	tmplCtx := NewTemplateContext(ctx)
 	tmplCtx["Locale"] = ctx.Base.Locale
 	tmplCtx["AvatarUtils"] = templates.NewAvatarUtils(ctx)
-	tmplCtx["DateUtils"] = templates.NewDateUtils(ctx)
 	return tmplCtx
 }
 
diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl
index 5b5affad8a..c162b7b74d 100644
--- a/templates/admin/auth/list.tmpl
+++ b/templates/admin/auth/list.tmpl
@@ -26,8 +26,8 @@
 							{{.Name}}
 							{{.TypeName}}
 							{{if .IsActive}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
-							{{ctx.DateUtils.AbsoluteShort .UpdatedUnix}}
-							{{ctx.DateUtils.AbsoluteShort .CreatedUnix}}
+							{{DateUtils.AbsoluteShort .UpdatedUnix}}
+							{{DateUtils.AbsoluteShort .CreatedUnix}}
 							{{svg "octicon-pencil"}}
 						
 					{{end}}
diff --git a/templates/admin/cron.tmpl b/templates/admin/cron.tmpl
index 64ae7858ba..ee37f6ca75 100644
--- a/templates/admin/cron.tmpl
+++ b/templates/admin/cron.tmpl
@@ -23,8 +23,8 @@
 							
 							{{ctx.Locale.Tr (printf "admin.dashboard.%s" .Name)}}
 							{{.Spec}}
-							{{ctx.DateUtils.FullTime .Next}}
-							{{if gt .Prev.Year 1}}{{ctx.DateUtils.FullTime .Prev}}{{else}}-{{end}}
+							{{DateUtils.FullTime .Next}}
+							{{if gt .Prev.Year 1}}{{DateUtils.FullTime .Prev}}{{else}}-{{end}}
 							{{.ExecTimes}}
 							{{if eq .Status ""}}—{{else if eq .Status "finished"}}{{svg "octicon-check" 16}}{{else}}{{svg "octicon-x" 16}}{{end}}
 						
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index 2db0384f6d..04a0b64432 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -21,7 +21,7 @@
 						{{.ID}}
 						{{ctx.Locale.Tr .TrStr}}
 						{{.Description}}
-						{{ctx.DateUtils.AbsoluteShort .CreatedUnix}}
+						{{DateUtils.AbsoluteShort .CreatedUnix}}
 						{{svg "octicon-note" 16}}
 					
 				{{end}}
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index 6a6dc14609..d0805c85bc 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -63,7 +63,7 @@
 							{{.NumTeams}}
 							{{.NumMembers}}
 							{{.NumRepos}}
-							{{ctx.DateUtils.AbsoluteShort .CreatedUnix}}
+							{{DateUtils.AbsoluteShort .CreatedUnix}}
 							{{svg "octicon-pencil"}}
 						
 					{{end}}
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index 9cc08772b7..aa38731d4f 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -71,7 +71,7 @@
 							{{end}}
 							
 							{{ctx.Locale.TrSize .CalculateBlobSize}}
-							{{ctx.DateUtils.AbsoluteShort .Version.CreatedUnix}}
+							{{DateUtils.AbsoluteShort .Version.CreatedUnix}}
 							{{svg "octicon-trash"}}
 						
 					{{end}}
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 992933154d..c4924c3fac 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -82,8 +82,8 @@
 							{{.NumIssues}}
 							{{ctx.Locale.TrSize .GitSize}}
 							{{ctx.Locale.TrSize .LFSSize}}
-							{{ctx.DateUtils.AbsoluteShort .UpdatedUnix}}
-							{{ctx.DateUtils.AbsoluteShort .CreatedUnix}}
+							{{DateUtils.AbsoluteShort .UpdatedUnix}}
+							{{DateUtils.AbsoluteShort .CreatedUnix}}
 							{{svg "octicon-trash"}}
 						
 					{{end}}
diff --git a/templates/admin/stacktrace-row.tmpl b/templates/admin/stacktrace-row.tmpl
index 694bf56d96..97c361ff90 100644
--- a/templates/admin/stacktrace-row.tmpl
+++ b/templates/admin/stacktrace-row.tmpl
@@ -13,7 +13,7 @@
 		

 		

 			
{{.Process.Description}}

-			
{{if ne .Process.Type "none"}}{{TimeSince .Process.Start ctx.Locale}}{{end}}

+			
{{if ne .Process.Type "none"}}{{DateUtils.TimeSince .Process.Start}}{{end}}

 		

 		

 			{{if or (eq .Process.Type "request") (eq .Process.Type "normal")}}
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index 42879d7917..9b3447f44a 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -96,9 +96,9 @@
 							{{if .IsActive}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
 							{{if .IsRestricted}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
 							{{if index $.UsersTwoFaStatus .ID}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
-							{{ctx.DateUtils.AbsoluteShort .CreatedUnix}}
+							{{DateUtils.AbsoluteShort .CreatedUnix}}
 							{{if .LastLoginUnix}}
-								{{ctx.DateUtils.AbsoluteShort .LastLoginUnix}}
+								{{DateUtils.AbsoluteShort .LastLoginUnix}}
 							{{else}}
 								{{ctx.Locale.Tr "admin.users.never_login"}}
 							{{end}}
diff --git a/templates/devtest/gitea-ui.tmpl b/templates/devtest/gitea-ui.tmpl
index 8c5db4d887..5490f71784 100644
--- a/templates/devtest/gitea-ui.tmpl
+++ b/templates/devtest/gitea-ui.tmpl
@@ -167,13 +167,13 @@
 
 	

 		
TimeSince

-		
Now: {{TimeSince .TimeNow ctx.Locale}}

-		
5s past: {{TimeSince .TimePast5s ctx.Locale}}

-		
5s future: {{TimeSince .TimeFuture5s ctx.Locale}}

-		
2m past: {{TimeSince .TimePast2m ctx.Locale}}

-		
2m future: {{TimeSince .TimeFuture2m ctx.Locale}}

-		
1y past: {{TimeSince .TimePast1y ctx.Locale}}

-		
1y future: {{TimeSince .TimeFuture1y ctx.Locale}}

+		
Now: {{DateUtils.TimeSince .TimeNow}}

+		
5s past: {{DateUtils.TimeSince .TimePast5s}}

+		
5s future: {{DateUtils.TimeSince .TimeFuture5s}}

+		
2m past: {{DateUtils.TimeSince .TimePast2m}}

+		
2m future: {{DateUtils.TimeSince .TimeFuture2m}}

+		
1y past: {{DateUtils.TimeSince .TimePast1y}}

+		
1y future: {{DateUtils.TimeSince .TimeFuture1y}}

 	

 
 	

diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl
index 59bc6c8a95..f11f2e94ef 100644
--- a/templates/explore/repo_list.tmpl
+++ b/templates/explore/repo_list.tmpl
@@ -62,7 +62,7 @@
 					{{end}}
 					

 				{{end}}
-				
{{ctx.Locale.Tr "org.repo_updated" (TimeSinceUnix .UpdatedUnix ctx.Locale)}}

+				
{{ctx.Locale.Tr "org.repo_updated" (DateUtils.TimeSince .UpdatedUnix)}}

 			

 		

 	{{else}}
diff --git a/templates/explore/user_list.tmpl b/templates/explore/user_list.tmpl
index ff46f13c17..4128a489aa 100644
--- a/templates/explore/user_list.tmpl
+++ b/templates/explore/user_list.tmpl
@@ -21,7 +21,7 @@
 							{{.Email}}
 						
 					{{end}}
-					{{svg "octicon-calendar"}}{{ctx.Locale.Tr "user.joined_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}}
+					{{svg "octicon-calendar"}}{{ctx.Locale.Tr "user.joined_on" (DateUtils.AbsoluteShort .CreatedUnix)}}
 				

 			

 		

diff --git a/templates/package/shared/cleanup_rules/preview.tmpl b/templates/package/shared/cleanup_rules/preview.tmpl
index ced1e5c11b..da034fec7a 100644
--- a/templates/package/shared/cleanup_rules/preview.tmpl
+++ b/templates/package/shared/cleanup_rules/preview.tmpl
@@ -22,7 +22,7 @@
 					{{.Version.Version}}
 					{{.Creator.Name}}
 					{{ctx.Locale.TrSize .CalculateBlobSize}}
-					{{ctx.DateUtils.AbsoluteShort .Version.CreatedUnix}}
+					{{DateUtils.AbsoluteShort .Version.CreatedUnix}}
 				
 			{{else}}
 				
diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl
index 36f8bc1522..19b41d0bc8 100644
--- a/templates/package/shared/list.tmpl
+++ b/templates/package/shared/list.tmpl
@@ -24,7 +24,7 @@
 					{{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}}
 				

 				

-					{{$timeStr := TimeSinceUnix .Version.CreatedUnix ctx.Locale}}
+					{{$timeStr := DateUtils.TimeSince .Version.CreatedUnix}}
 					{{$hasRepositoryAccess := false}}
 					{{if .Repository}}
 						{{$hasRepositoryAccess = index $.RepositoryAccessMap .Repository.ID}}
diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl
index e5c568e059..7a1059e262 100644
--- a/templates/package/shared/versionlist.tmpl
+++ b/templates/package/shared/versionlist.tmpl
@@ -25,7 +25,7 @@
 			

 				{{.Version.LowerVersion}}
 				

-					{{ctx.Locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix ctx.Locale) .Creator.HomeLink .Creator.GetDisplayName}}
+					{{ctx.Locale.Tr "packages.published_by" (DateUtils.TimeSince .Version.CreatedUnix) .Creator.HomeLink .Creator.GetDisplayName}}
 				

 			

 		

diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl
index 59e4e53f12..170f38388d 100644
--- a/templates/package/view.tmpl
+++ b/templates/package/view.tmpl
@@ -8,7 +8,7 @@
 				
{{.PackageDescriptor.Package.Name}} ({{.PackageDescriptor.Version.Version}})

 			

 			

-				{{$timeStr := TimeSinceUnix .PackageDescriptor.Version.CreatedUnix ctx.Locale}}
+				{{$timeStr := DateUtils.TimeSince .PackageDescriptor.Version.CreatedUnix}}
 				{{if .HasRepositoryAccess}}
 					{{ctx.Locale.Tr "packages.published_by_in" $timeStr .PackageDescriptor.Creator.HomeLink .PackageDescriptor.Creator.GetDisplayName .PackageDescriptor.Repository.Link .PackageDescriptor.Repository.FullName}}
 				{{else}}
@@ -48,7 +48,7 @@
 					{{if .HasRepositoryAccess}}
 					
{{svg "octicon-repo" 16 "tw-mr-2"}} {{.PackageDescriptor.Repository.FullName}}

 					{{end}}
-					
{{svg "octicon-calendar" 16 "tw-mr-2"}} {{TimeSinceUnix .PackageDescriptor.Version.CreatedUnix ctx.Locale}}

+					
{{svg "octicon-calendar" 16 "tw-mr-2"}} {{DateUtils.TimeSince .PackageDescriptor.Version.CreatedUnix}}

 					
{{svg "octicon-download" 16 "tw-mr-2"}} {{.PackageDescriptor.Version.DownloadCount}}

 					{{template "package/metadata/alpine" .}}
 					{{template "package/metadata/arch" .}}
@@ -94,7 +94,7 @@
 				{{range .LatestVersions}}
 					

 						{{.Version}}
-						{{ctx.DateUtils.AbsoluteShort .CreatedUnix}}
+						{{DateUtils.AbsoluteShort .CreatedUnix}}
 					

 				{{end}}
 				

diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl
index 7bab492d7b..ef764fa357 100644
--- a/templates/repo/actions/runs_list.tmpl
+++ b/templates/repo/actions/runs_list.tmpl
@@ -33,7 +33,7 @@
 					{{.PrettyRef}}
 				{{end}}
 				

-					
{{svg "octicon-calendar" 16}}{{TimeSinceUnix .Updated ctx.Locale}}

+					
{{svg "octicon-calendar" 16}}{{DateUtils.TimeSince .Updated}}

 					
{{svg "octicon-stopwatch" 16}}{{.Duration}}

 				

 			

diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index f5bffb097e..c60017ba87 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -27,7 +27,7 @@
 									
 									{{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}} · {{RenderCommitMessage $.Context .DefaultBranchBranch.DBBranch.CommitMessage (.Repository.ComposeMetas ctx)}} · {{ctx.Locale.Tr "org.repo_updated" (TimeSince .DefaultBranchBranch.DBBranch.CommitTime.AsTime ctx.Locale)}} {{if .DefaultBranchBranch.DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}

+								
{{svg "octicon-git-commit" 16 "tw-mr-1"}}{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DefaultBranchBranch.DBBranch.CommitMessage (.Repository.ComposeMetas ctx)}} · {{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}}

 							
 							
 								{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
@@ -92,7 +92,7 @@
 									{{.DBBranch.Name}}
 									
 								

-								
{{ctx.Locale.Tr "repo.branch.deleted_by" .DBBranch.DeletedBy.Name}} {{TimeSinceUnix .DBBranch.DeletedUnix ctx.Locale}}

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

 							{{else}}
 								

 									{{.DBBranch.Name}}
@@ -102,7 +102,7 @@
 									
 									{{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}} · {{RenderCommitMessage $.Context .DBBranch.CommitMessage ($.Repository.ComposeMetas ctx)}} · {{ctx.Locale.Tr "org.repo_updated" (TimeSince .DBBranch.CommitTime.AsTime ctx.Locale)}} {{if .DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}}  {{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}

+								
{{svg "octicon-git-commit" 16 "tw-mr-1"}}{{ShortSha .DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DBBranch.CommitMessage ($.Repository.ComposeMetas ctx)}} · {{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}}

 							{{end}}
 							
 							
diff --git a/templates/repo/code/recently_pushed_new_branches.tmpl b/templates/repo/code/recently_pushed_new_branches.tmpl
index d996acc5b2..dd663762db 100644
--- a/templates/repo/code/recently_pushed_new_branches.tmpl
+++ b/templates/repo/code/recently_pushed_new_branches.tmpl
@@ -1,7 +1,7 @@
 {{range .RecentlyPushedNewBranches}}
 	

 		

-			{{$timeSince := TimeSince .CommitTime.AsTime ctx.Locale}}
+			{{$timeSince := DateUtils.TimeSince .CommitTime}}
 			{{$repo := .GetRepo $.Context}}
 			{{$name := .Name}}
 			{{if ne $repo.ID $.Repository.ID}}
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
index 96ce8cf747..a25b450dbe 100644
--- a/templates/repo/commit_page.tmpl
+++ b/templates/repo/commit_page.tmpl
@@ -152,7 +152,7 @@
 						{{ctx.AvatarUtils.AvatarByEmail .Commit.Author.Email .Commit.Author.Email 28 "tw-mr-2"}}
 						{{.Commit.Author.Name}}
 					{{end}}
-					{{TimeSince .Commit.Author.When ctx.Locale}}
+					{{DateUtils.TimeSince .Commit.Author.When}}
 					{{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}}
 						•
 						{{ctx.Locale.Tr "repo.diff.committed_by"}}
@@ -274,7 +274,7 @@
 				{{else}}
 					{{.NoteCommit.Author.Name}}
 				{{end}}
-				{{TimeSince .NoteCommit.Author.When ctx.Locale}}
+				{{DateUtils.TimeSince .NoteCommit.Author.When}}
 			

 			

 				
{{.NoteRendered | SanitizeHTML}}

diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl
index c8c695e332..b23de20583 100644
--- a/templates/repo/commits_list.tmpl
+++ b/templates/repo/commits_list.tmpl
@@ -74,9 +74,9 @@
 							{{end}}
 						
 						{{if .Committer}}
-							{{TimeSince .Committer.When ctx.Locale}}
+							{{DateUtils.TimeSince .Committer.When}}
 						{{else}}
-							{{TimeSince .Author.When ctx.Locale}}
+							{{DateUtils.TimeSince .Author.When}}
 						{{end}}
 						
 							
diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl
index e2597af0e3..b36f20269e 100644
--- a/templates/repo/diff/comments.tmpl
+++ b/templates/repo/diff/comments.tmpl
@@ -1,6 +1,6 @@
 {{range .comments}}
 
-{{$createdStr:= TimeSinceUnix .CreatedUnix ctx.Locale}}
+{{$createdStr:= DateUtils.TimeSince .CreatedUnix}}
 

 	{{if .OriginalAuthor}}
 		{{ctx.AvatarUtils.Avatar nil}}
diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl
index 26c6b77971..612d08ec4f 100644
--- a/templates/repo/diff/compare.tmpl
+++ b/templates/repo/diff/compare.tmpl
@@ -212,7 +212,7 @@
 					{{if .Repository.ArchivedUnix.IsZero}}
 						{{ctx.Locale.Tr "repo.archive.title"}}
 					{{else}}
-						{{ctx.Locale.Tr "repo.archive.title_date" (ctx.DateUtils.AbsoluteLong .Repository.ArchivedUnix)}}
+						{{ctx.Locale.Tr "repo.archive.title_date" (DateUtils.AbsoluteLong .Repository.ArchivedUnix)}}
 					{{end}}
 				

 			{{end}}
diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl
index d7f05223af..d3a81bc51d 100644
--- a/templates/repo/empty.tmpl
+++ b/templates/repo/empty.tmpl
@@ -10,7 +10,7 @@
 						{{if .Repository.ArchivedUnix.IsZero}}
 							{{ctx.Locale.Tr "repo.archive.title"}}
 						{{else}}
-							{{ctx.Locale.Tr "repo.archive.title_date" (ctx.DateUtils.AbsoluteLong .Repository.ArchivedUnix)}}
+							{{ctx.Locale.Tr "repo.archive.title_date" (DateUtils.AbsoluteLong .Repository.ArchivedUnix)}}
 						{{end}}
 					

 				{{end}}
diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl
index 2ec4166308..f0ff0d2970 100644
--- a/templates/repo/graph/commits.tmpl
+++ b/templates/repo/graph/commits.tmpl
@@ -71,7 +71,7 @@
 							{{$userName}}
 						{{end}}
 					
-					{{ctx.DateUtils.FullTime $commit.Date}}
+					{{DateUtils.FullTime $commit.Date}}
 				{{end}}
 			
 		{{end}}
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index 777453e4b1..2215c27886 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -74,7 +74,7 @@
 			

 				{{ctx.Locale.Tr "repo.mirror_from"}}
 				{{$.PullMirror.RemoteAddress}}
-				{{if $.PullMirror.UpdatedUnix}}{{ctx.Locale.Tr "repo.mirror_sync"}} {{TimeSinceUnix $.PullMirror.UpdatedUnix ctx.Locale}}{{end}}
+				{{if $.PullMirror.UpdatedUnix}}{{ctx.Locale.Tr "repo.mirror_sync"}} {{DateUtils.TimeSince $.PullMirror.UpdatedUnix}}{{end}}
 			

 		{{end}}
 		{{if .IsFork}}
{{ctx.Locale.Tr "repo.forked_from"}} {{.BaseRepo.FullName}}
{{end}}
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index d16e616a81..5fa31f15c2 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -53,7 +53,7 @@
 				{{if .Repository.ArchivedUnix.IsZero}}
 					{{ctx.Locale.Tr "repo.archive.title"}}
 				{{else}}
-					{{ctx.Locale.Tr "repo.archive.title_date" (ctx.DateUtils.AbsoluteLong .Repository.ArchivedUnix)}}
+					{{ctx.Locale.Tr "repo.archive.title_date" (DateUtils.AbsoluteLong .Repository.ArchivedUnix)}}
 				{{end}}
 			

 		{{end}}
diff --git a/templates/repo/issue/card.tmpl b/templates/repo/issue/card.tmpl
index 0b255d6705..c29c14a54b 100644
--- a/templates/repo/issue/card.tmpl
+++ b/templates/repo/issue/card.tmpl
@@ -24,7 +24,7 @@
 		

 			
 				{{if not $.Page.Repository}}{{.Repo.FullName}}{{end}}#{{.Index}}
-				{{$timeStr := TimeSinceUnix .GetLastEventTimestamp ctx.Locale}}
+				{{$timeStr := DateUtils.TimeSince .GetLastEventTimestamp}}
 				{{if .OriginalAuthor}}
 					{{ctx.Locale.Tr .GetLastEventLabelFake $timeStr .OriginalAuthor}}
 				{{else if gt .Poster.ID 0}}
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl
index bfd64a3205..8b8b194f46 100644
--- a/templates/repo/issue/milestone_issues.tmpl
+++ b/templates/repo/issue/milestone_issues.tmpl
@@ -30,7 +30,7 @@
 			
 			

 				

-					{{$closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix ctx.Locale}}
+					{{$closedDate:= DateUtils.TimeSince .Milestone.ClosedDateUnix}}
 					{{if .IsClosed}}
 						{{svg "octicon-clock"}} {{ctx.Locale.Tr "repo.milestones.closed" $closedDate}}
 					{{else}}
@@ -38,7 +38,7 @@
 						{{if .Milestone.DeadlineString}}
 							
 								{{svg "octicon-calendar"}}
-								{{ctx.DateUtils.AbsoluteShort (.Milestone.DeadlineString|ctx.DateUtils.ParseLegacy)}}
+								{{DateUtils.AbsoluteShort (.Milestone.DeadlineString|DateUtils.ParseLegacy)}}
 							
 						{{else}}
 							{{svg "octicon-calendar"}}
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
index 978f81598e..fab483c79d 100644
--- a/templates/repo/issue/milestones.tmpl
+++ b/templates/repo/issue/milestones.tmpl
@@ -49,19 +49,19 @@
 							{{if .UpdatedUnix}}
 								

 									{{svg "octicon-clock"}}
-									{{ctx.Locale.Tr "repo.milestones.update_ago" (TimeSinceUnix .UpdatedUnix ctx.Locale)}}
+									{{ctx.Locale.Tr "repo.milestones.update_ago" (DateUtils.TimeSince .UpdatedUnix)}}
 								

 							{{end}}
 							

 								{{if .IsClosed}}
-									{{$closedDate:= TimeSinceUnix .ClosedDateUnix ctx.Locale}}
+									{{$closedDate:= DateUtils.TimeSince .ClosedDateUnix}}
 									{{svg "octicon-clock" 14}}
 									{{ctx.Locale.Tr "repo.milestones.closed" $closedDate}}
 								{{else}}
 									{{if .DeadlineString}}
 										
 											{{svg "octicon-calendar" 14}}
-											{{ctx.DateUtils.AbsoluteShort (.DeadlineString|ctx.DateUtils.ParseLegacy)}}
+											{{DateUtils.AbsoluteShort (.DeadlineString|DateUtils.ParseLegacy)}}
 										
 									{{else}}
 										{{svg "octicon-calendar" 14}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 947a480df1..bd52198264 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -6,7 +6,7 @@
 	
 	
 
-	{{$createdStr:= TimeSinceUnix .Issue.CreatedUnix ctx.Locale}}
+	{{$createdStr:= DateUtils.TimeSince .Issue.CreatedUnix}}
 	

 		

 			

diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index 828191e5e1..c8eabb9345 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -1,7 +1,7 @@
 {{template "base/alert"}}
 {{range .Issue.Comments}}
 	{{if call $.ShouldShowCommentType .Type}}
-		{{$createdStr:= TimeSinceUnix .CreatedUnix ctx.Locale}}
+		{{$createdStr:= DateUtils.TimeSince .CreatedUnix}}
 
 		
 	

 		

@@ -135,7 +135,7 @@
 					{{.TagName}}
 					{{.Title | RenderEmoji $.Context | RenderCodeBlock}}
 				{{end}}
-				{{TimeSinceUnix .CreatedUnix ctx.Locale}}
+				{{DateUtils.TimeSince .CreatedUnix}}
 			

 		{{end}}
 	

@@ -154,7 +154,7 @@
 			

 				{{ctx.Locale.Tr "repo.activity.merged_prs_label"}}
 				#{{.Index}} {{RenderRefIssueTitle $.Context .Issue.Title}}
-				{{TimeSinceUnix .MergedUnix ctx.Locale}}
+				{{DateUtils.TimeSince .MergedUnix}}
 			

 		{{end}}
 	

@@ -173,7 +173,7 @@
 			

 				{{ctx.Locale.Tr "repo.activity.opened_prs_label"}}
 				#{{.Index}} {{RenderRefIssueTitle $.Context .Issue.Title}}
-				{{TimeSinceUnix .Issue.CreatedUnix ctx.Locale}}
+				{{DateUtils.TimeSince .Issue.CreatedUnix}}
 			

 		{{end}}
 	

@@ -192,7 +192,7 @@
 			

 				{{ctx.Locale.Tr "repo.activity.closed_issue_label"}}
 				#{{.Index}} {{RenderRefIssueTitle $.Context .Title}}
-				{{TimeSinceUnix .ClosedUnix ctx.Locale}}
+				{{DateUtils.TimeSince .ClosedUnix}}
 			

 		{{end}}
 	

@@ -211,7 +211,7 @@
 			

 				{{ctx.Locale.Tr "repo.activity.new_issue_label"}}
 				#{{.Index}} {{RenderRefIssueTitle $.Context .Title}}
-				{{TimeSinceUnix .CreatedUnix ctx.Locale}}
+				{{DateUtils.TimeSince .CreatedUnix}}
 			

 		{{end}}
 	

@@ -232,7 +232,7 @@
 				{{else}}
 				{{RenderRefIssueTitle $.Context .Title}}
 				{{end}}
-				{{TimeSinceUnix .UpdatedUnix ctx.Locale}}
+				{{DateUtils.TimeSince .UpdatedUnix}}
 			

 		{{end}}
 	

diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
index 4c7f13dda7..a760e0730e 100644
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -51,7 +51,7 @@
 								{{ctx.Locale.Tr "repo.released_this"}}
 							
 							{{if $release.CreatedUnix}}
-								{{TimeSinceUnix $release.CreatedUnix ctx.Locale}}
+								{{DateUtils.TimeSince $release.CreatedUnix}}
 							{{end}}
 							{{if and (not $release.IsDraft) ($.Permission.CanRead $.UnitTypeCode)}}
 								| {{ctx.Locale.Tr "repo.release.ahead.commits" $release.NumCommitsBehind}} {{ctx.Locale.Tr "repo.release.ahead.target" $release.TargetBehind}}
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 9c7e1f38cd..91ef1df623 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -55,7 +55,7 @@
 									{{.Fingerprint}}
 								

 								

-									
{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}} —  {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} {{ctx.DateUtils.AbsoluteShort .UpdatedUnix}}{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}} - {{ctx.Locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{ctx.Locale.Tr "settings.can_write_info"}} {{end}}

+									
{{ctx.Locale.Tr "settings.added_on" (DateUtils.AbsoluteShort .CreatedUnix)}} —  {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} {{DateUtils.AbsoluteShort .UpdatedUnix}}{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}} - {{ctx.Locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{ctx.Locale.Tr "settings.can_write_info"}} {{end}}

 								

 							

 							

diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index 6d7aac229d..069fdecb33 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -17,7 +17,7 @@
 							
 						
 						{{ctx.Locale.TrSize .Size}}
-						{{TimeSince .CreatedUnix.AsTime ctx.Locale}}
+						{{DateUtils.TimeSince .CreatedUnix}}
 						
 							{{ctx.Locale.Tr "repo.settings.lfs_findcommits"}}
 							

 						
-							{{TimeSince .Delivered.AsTime ctx.Locale}}
+							{{DateUtils.TimeSince .Delivered}}
 						
 					

 					

diff --git a/templates/repo/tag/list.tmpl b/templates/repo/tag/list.tmpl
index 82f3dc04a9..8aa4a806c8 100644
--- a/templates/repo/tag/list.tmpl
+++ b/templates/repo/tag/list.tmpl
@@ -27,7 +27,7 @@
 								

 									{{if $.Permission.CanRead $.UnitTypeCode}}
 										{{if .CreatedUnix}}
-											{{svg "octicon-clock" 16 "tw-mr-1"}}{{TimeSinceUnix .CreatedUnix ctx.Locale}}
+											{{svg "octicon-clock" 16 "tw-mr-1"}}{{DateUtils.TimeSince .CreatedUnix}}
 										{{end}}
 
 										{{svg "octicon-git-commit" 16 "tw-mr-1"}}{{ShortSha .Sha1}}
diff --git a/templates/repo/user_cards.tmpl b/templates/repo/user_cards.tmpl
index abf70a9607..fbd4ef0cee 100644
--- a/templates/repo/user_cards.tmpl
+++ b/templates/repo/user_cards.tmpl
@@ -20,7 +20,7 @@
 						{{else if .Location}}
 							{{svg "octicon-location"}} {{.Location}}
 						{{else}}
-							{{svg "octicon-calendar"}} {{ctx.Locale.Tr "user.joined_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}}
+							{{svg "octicon-calendar"}} {{ctx.Locale.Tr "user.joined_on" (DateUtils.AbsoluteShort .CreatedUnix)}}
 						{{end}}
 					

 				

diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl
index d127c2ef24..b2443e82c4 100644
--- a/templates/repo/view_file.tmpl
+++ b/templates/repo/view_file.tmpl
@@ -18,7 +18,7 @@
 			{{if .LatestCommit}}
 				{{if .LatestCommit.Committer}}
 					

-						{{TimeSince .LatestCommit.Committer.When ctx.Locale}}
+						{{DateUtils.TimeSince .LatestCommit.Committer.When}}
 					

 				{{end}}
 			{{end}}
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
index b750e9129e..6d6af58c48 100644
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -8,7 +8,7 @@
 					

 				

 			
-			{{if .LatestCommit}}{{if .LatestCommit.Committer}}{{TimeSince .LatestCommit.Committer.When ctx.Locale}}{{end}}{{end}}
+			{{if .LatestCommit}}{{if .LatestCommit.Committer}}{{DateUtils.TimeSince .LatestCommit.Committer.When}}{{end}}{{end}}
 		
 	
 	
@@ -62,7 +62,7 @@
 						{{end}}
 					
 				
-				{{if $commit}}{{TimeSince $commit.Committer.When ctx.Locale}}{{end}}
+				{{if $commit}}{{DateUtils.TimeSince $commit.Committer.When}}{{end}}
 			
 		{{end}}
 	
diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl
index 42c36a9f46..43ab0f9a14 100644
--- a/templates/repo/wiki/pages.tmpl
+++ b/templates/repo/wiki/pages.tmpl
@@ -19,7 +19,7 @@
 							{{.Name}}
 							{{svg "octicon-chevron-right"}}
 						
-						{{$timeSince := TimeSinceUnix .UpdatedUnix ctx.Locale}}
+						{{$timeSince := DateUtils.TimeSince .UpdatedUnix}}
 						{{ctx.Locale.Tr "repo.wiki.last_updated" $timeSince}}
 					
 				{{end}}
diff --git a/templates/repo/wiki/revision.tmpl b/templates/repo/wiki/revision.tmpl
index 7fca703843..045cc41d81 100644
--- a/templates/repo/wiki/revision.tmpl
+++ b/templates/repo/wiki/revision.tmpl
@@ -9,7 +9,7 @@
 					{{.revision}} {{svg "octicon-home"}}
 					{{$title}}
 					

-						{{$timeSince := TimeSince .Author.When ctx.Locale}}
+						{{$timeSince := DateUtils.TimeSince .Author.When}}
 						{{ctx.Locale.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince}}
 					

 				

diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 40af307524..9f77976f35 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -48,7 +48,7 @@
 					{{.CommitCount}} {{svg "octicon-history"}}
 					{{$title}}
 					

-						{{$timeSince := TimeSince .Author.When ctx.Locale}}
+						{{$timeSince := DateUtils.TimeSince .Author.When}}
 						{{ctx.Locale.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince}}
 					

 				

diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl
index d60f10b71f..54250f830b 100644
--- a/templates/shared/actions/runner_edit.tmpl
+++ b/templates/shared/actions/runner_edit.tmpl
@@ -13,7 +13,7 @@
 				

 				

 					
-					{{if .Runner.LastOnline}}{{TimeSinceUnix .Runner.LastOnline ctx.Locale}}{{else}}{{ctx.Locale.Tr "never"}}{{end}}
+					{{if .Runner.LastOnline}}{{DateUtils.TimeSince .Runner.LastOnline}}{{else}}{{ctx.Locale.Tr "never"}}{{end}}
 				

 				

 					
@@ -70,7 +70,7 @@
 						{{ShortSha .CommitSHA}}
 					
 					{{if .IsStopped}}
-						{{TimeSinceUnix .Stopped ctx.Locale}}
+						{{DateUtils.TimeSince .Stopped}}
 						{{else}}-{{end}}
 				
 				{{end}}
diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl
index abbf2204a8..5bc61f4f64 100644
--- a/templates/shared/actions/runner_list.tmpl
+++ b/templates/shared/actions/runner_list.tmpl
@@ -73,7 +73,7 @@
 						
 							{{range .AgentLabels}}{{.}}{{end}}
 						
-						{{if .LastOnline}}{{TimeSinceUnix .LastOnline ctx.Locale}}{{else}}{{ctx.Locale.Tr "never"}}{{end}}
+						{{if .LastOnline}}{{DateUtils.TimeSince .LastOnline}}{{else}}{{ctx.Locale.Tr "never"}}{{end}}
 						
 							{{if .Editable $.RunnerOwnerID $.RunnerRepoID}}
 							{{svg "octicon-pencil"}}
diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl
index 941a444612..7ce7cd6795 100644
--- a/templates/shared/issuelist.tmpl
+++ b/templates/shared/issuelist.tmpl
@@ -60,7 +60,7 @@
 							#{{.Index}}
 						{{end}}
 					
-					{{$timeStr := TimeSinceUnix .GetLastEventTimestamp ctx.Locale}}
+					{{$timeStr := DateUtils.TimeSince .GetLastEventTimestamp}}
 					{{if .OriginalAuthor}}
 						{{ctx.Locale.Tr .GetLastEventLabelFake $timeStr .OriginalAuthor}}
 					{{else if gt .Poster.ID 0}}
@@ -117,7 +117,7 @@
 						
 							
 								{{svg "octicon-calendar" 14}}
-								{{ctx.DateUtils.AbsoluteShort .DeadlineUnix}}
+								{{DateUtils.AbsoluteShort .DeadlineUnix}}
 							
 						
 					{{end}}
diff --git a/templates/shared/searchbottom.tmpl b/templates/shared/searchbottom.tmpl
index bee0397259..4e0bd9570b 100644
--- a/templates/shared/searchbottom.tmpl
+++ b/templates/shared/searchbottom.tmpl
@@ -7,7 +7,7 @@
 		

 		

 			{{if not .result.UpdatedUnix.IsZero}}
-					{{ctx.Locale.Tr "explore.code_last_indexed_at" (TimeSinceUnix .result.UpdatedUnix ctx.Locale)}}
+					{{ctx.Locale.Tr "explore.code_last_indexed_at" (DateUtils.TimeSince .result.UpdatedUnix)}}
 			{{end}}
 		

 

diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl
index 011635a20d..59596d1013 100644
--- a/templates/shared/secrets/add_list.tmpl
+++ b/templates/shared/secrets/add_list.tmpl
@@ -28,7 +28,7 @@
 			

 			

 				
-					{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}}
+					{{ctx.Locale.Tr "settings.added_on" (DateUtils.AbsoluteShort .CreatedUnix)}}
 				
 				

 			

 				
-					{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}}
+					{{ctx.Locale.Tr "settings.added_on" (DateUtils.AbsoluteShort .CreatedUnix)}}